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

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d068f1c75e4dcb2ba44e7a78aaad51fb8beb8049
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 13:28:33 2010 +0000

    [Qt] Fix compilation with V8 and Qt.
    
    Reviewed by Andreas Kling.
    
    Use WebKit's page cache for ScriptCachedFrameData.
    
    * bindings/v8/ScriptCachedFrameData.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67322 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a7860cd..abbfb40 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Andreas Kling.
 
+        [Qt] Fix compilation with V8 and Qt.
+
+        Use WebKit's page cache for ScriptCachedFrameData.
+
+        * bindings/v8/ScriptCachedFrameData.h:
+
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Andreas Kling.
+
         Fix compiler warning.
 
         NPClass has 13 members, the last one (NPConstructFunctionPtr construct) wasn't
diff --git a/WebCore/bindings/v8/ScriptCachedFrameData.h b/WebCore/bindings/v8/ScriptCachedFrameData.h
index f700a48..1aa1f62 100644
--- a/WebCore/bindings/v8/ScriptCachedFrameData.h
+++ b/WebCore/bindings/v8/ScriptCachedFrameData.h
@@ -51,7 +51,7 @@ public:
 
 } // namespace WebCore
 
-#elif PLATFORM(ANDROID)
+#elif PLATFORM(ANDROID) || PLATFORM(QT)
 // FIXME: the right guard should be ENABLE(PAGE_CACHE). Replace with the right guard, once
 // https://bugs.webkit.org/show_bug.cgi?id=35061 is fixed.
 //

-- 
WebKit Debian packaging