Reviewed and landed by ggaren.

        * platform/gdk/TransferJobManager.cpp
        Fixed broken dowload logic
        * platform/gdk/ScrollViewGdk.cpp
        Add comment that scrollbarSize is a temporary variable
        * Projects/gdk/webcore-gdk.bkl
        Defined NDEBUG build executable is miscompiled otherwise
        * WebCoreSources.bkl
        added icon/SiteIcon.cpp editing/IndentOutdentCommand.cpp
        html/HTMLViewSourceDocument.cpp

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c245e3d81140c90977d5bd9dd90e2abb1f8f6245..a8b6e6295dfce638b0fd0cc830cce7e628825a3f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2006-07-02  Mike Emmel  <mike.emmel@gmail.com>
+
+        Reviewed and landed by ggaren.
+
+        * platform/gdk/TransferJobManager.cpp
+        Fixed broken dowload logic
+        * platform/gdk/ScrollViewGdk.cpp 
+        Add comment that scrollbarSize is a temporary variable
+        * Projects/gdk/webcore-gdk.bkl
+        Defined NDEBUG build executable is miscompiled otherwise
+        * WebCoreSources.bkl
+        added icon/SiteIcon.cpp editing/IndentOutdentCommand.cpp 
+        html/HTMLViewSourceDocument.cpp
+
 2006-07-02  Shawn Stricker  <kb1ibt@gmail.com>
 
         Reviewed by Timothy Hatcher.  Build fix for Linux.

diff --git a/WebCore/Projects/gdk/webcore-gdk.bkl b/WebCore/Projects/gdk/webcore-gdk.bkl
index 41c1621691d4df63c0111876a8fc753b765b2a7a..855a618702febc5f51d4c84a02b040bdf3e98920 100644 (file)
--- a/WebCore/Projects/gdk/webcore-gdk.bkl
+++ b/WebCore/Projects/gdk/webcore-gdk.bkl
@@ -58,6 +58,8 @@
                <include>platform/cairo</include>
            <include>$(SRCDIR)/kcanvas/device/cairo</include>
        <define>XPATH_SUPPORT</define>
+        <!-- gdk build broken with without NDEBUG defined -->
+       <define>NDEBUG</define>
  
         <sources>              
           platform/cairo/GraphicsContextCairo.cpp

diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl
index a62c6f9500fb39b05e5da0768ce85d03ee4f6e58..2509291e138b2128520737ac0695bfe25a074c8b 100644 (file)
--- a/WebCore/WebCoreSources.bkl
+++ b/WebCore/WebCoreSources.bkl
@@ -541,6 +541,7 @@
                icon/IconDatabase.cpp
                icon/SQLDatabase.cpp
                icon/SQLStatement.cpp
+               icon/SiteIcon.cpp
        </set>
 
        <set append="1" var="WEBCORE_SOURCES_BRIDGE">
@@ -566,6 +567,7 @@
                editing/FormatBlockCommand.cpp
                editing/htmlediting.cpp
                editing/HTMLInterchange.cpp
+               editing/IndentOutdentCommand.cpp
                editing/InsertIntoTextNodeCommand.cpp
                editing/InsertLineBreakCommand.cpp
                editing/InsertListCommand.cpp
@@ -599,7 +601,7 @@
 
        </set>
        <set append="1" var="WEBCORE_SOURCES_HTML">
-               
+
                html/CanvasGradient.cpp
                html/CanvasPattern.cpp
                html/CanvasRenderingContext2D.cpp
@@ -676,6 +678,7 @@
                html/HTMLTitleElement.cpp
                html/HTMLTokenizer.cpp
                html/HTMLUListElement.cpp
+           html/HTMLViewSourceDocument.cpp     
 
        </set>
        <set append="1" var="WEBCORE_SOURCES_BINDINGS">

diff --git a/WebCore/platform/gdk/ScrollViewGdk.cpp b/WebCore/platform/gdk/ScrollViewGdk.cpp
index c6099b42624c40b895c4c385f8e074abc03e676b..452f8fe29df884266828ed544dfd9be8fef8754b 100644 (file)
--- a/WebCore/platform/gdk/ScrollViewGdk.cpp
+++ b/WebCore/platform/gdk/ScrollViewGdk.cpp
@@ -42,6 +42,7 @@ using namespace std;
 
 namespace WebCore {
 
+//hack to simulate scroll bars
 const int scrollbarSize = 10;
 
 class ScrollView::ScrollViewPrivate

diff --git a/WebCore/platform/gdk/TransferJobManager.cpp b/WebCore/platform/gdk/TransferJobManager.cpp
index 216f526ccf097714b6821d622a7a6b384ccfe9cd..bf6ee6c01212ff52917dc1f9b895b51e6e672c61 100644 (file)
--- a/WebCore/platform/gdk/TransferJobManager.cpp
+++ b/WebCore/platform/gdk/TransferJobManager.cpp
@@ -79,7 +79,6 @@ void TransferJobManager::downloadTimerCallback(Timer<TransferJobManager>* timer)
         m_downloadTimer.stop();
         return;
     }
-
     if (m_useSimple) {
         for (HashSet<TransferJob*>::iterator it = jobs->begin(); it != jobs->end(); ++it) {
             TransferJob* job = *it;
@@ -108,11 +107,13 @@ void TransferJobManager::downloadTimerCallback(Timer<TransferJobManager>* timer)
         switch (retval) {
             case -1:                        // select error
 #ifndef NDEBUG
-                printf("%s, select error(?)\n", __PRETTY_FUNCTION__);
+                printf("%s, select error(%d)\n", __PRETTY_FUNCTION__,retval);
 #endif
                 /* fallthrough*/
             case 0:                 // select timeout
-                printf("%s, select timout\n", __PRETTY_FUNCTION__);
+#ifndef NDEBUG
+                printf("%s, select timeout %d\n", __PRETTY_FUNCTION__,retval);
+#endif
                 /* fallthrough. this can be the first perform to be made */
             default:                        // 1+ descriptors have data
                 while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(curlMultiHandle, &nrunning))
@@ -154,10 +155,10 @@ void TransferJobManager::downloadTimerCallback(Timer<TransferJobManager>* timer)
                 }
             }
 
-            if (!jobs->isEmpty())
-                m_downloadTimer.startOneShot(pollTimeSeconds);
         }
     }
+    if (!jobs->isEmpty())
+        m_downloadTimer.startOneShot(pollTimeSeconds);
 }
 
 void TransferJobManager::remove(TransferJob* job)
@@ -204,11 +205,12 @@ void TransferJobManager::add(TransferJob* job)
         // timeout will occur and do curl_multi_perform
         if (ret && ret != CURLM_CALL_MULTI_PERFORM) {
             printf("Error %d starting job %s\n", ret, d->URL.url().ascii());
-            cancel(job);
+            job->setError(1);
+            startTimer =false;
         } else
             jobs->add(job);
     }
-    if (!jobs->isEmpty())
+    if (startTimer)
         m_downloadTimer.startOneShot(pollTimeSeconds);
 }