[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

dbates at webkit.org dbates at webkit.org
Wed Dec 22 11:27:19 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f598755cf90ecf58f383e126c289254e050db2bd
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 25 05:24:22 2010 +0000

    2010-07-24  Daniel Bates  <dbates at rim.com>
    
            Unreviewed, build fix when building with WML support.
    
            PageCache.cpp compile error when WML is enabled
            https://bugs.webkit.org/show_bug.cgi?id=40765
    
            Remove extraneous semicolon.
    
            Note, building with WML support enabled is broken
            even with this fix. See Bug #42943 for more details.
    
            * history/PageCache.cpp:
            (WebCore::PageCache::canCachePageContainingThisFrame):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 21aee3c..f275453 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-24  Daniel Bates  <dbates at rim.com>
+
+        Unreviewed, build fix when building with WML support.
+
+        PageCache.cpp compile error when WML is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=40765
+
+        Remove extraneous semicolon.
+
+        Note, building with WML support enabled is broken
+        even with this fix. See Bug #42943 for more details.
+
+        * history/PageCache.cpp:
+        (WebCore::PageCache::canCachePageContainingThisFrame):
+
 2010-07-24  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/history/PageCache.cpp b/WebCore/history/PageCache.cpp
index 7719187..228f7ea 100644
--- a/WebCore/history/PageCache.cpp
+++ b/WebCore/history/PageCache.cpp
@@ -269,7 +269,7 @@ bool PageCache::canCachePageContainingThisFrame(Frame* frame)
 #endif
 #if ENABLE(WML)
         && !frame->document()->containsWMLContent()
-        && !frame->document()->isWMLDocument();
+        && !frame->document()->isWMLDocument()
 #endif
         && frame->loader()->client()->canCachePage();
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list