[webkit-changes] [99141] trunk/Source/WebKit2

[commit-queue]

Title: [99141] trunk/Source/WebKit2

Revision

99141

Author

commit-qu...@webkit.org

Date

2011-11-02 23:33:00 -0700 (Wed, 02 Nov 2011)

Log Message

[Qt] [WK] Debug build broken
https://bugs.webkit.org/show_bug.cgi?id=71417

Add WKNumber.h for WKBooleanGetTypeID
Replace WKGetTypeId with WKGetTypeID
Add initialization for didDetectXSSForFrame member in WKBundlePageLoaderClient
instance.

Patch by Viatcheslav Ostapenko <ostapenko.viatches...@nokia.com> on 2011-11-02
Reviewed by Noam Rosenthal.

* WebProcess/qt/QtBuiltinBundle.cpp:
(WebKit::QtBuiltinBundle::handleSetNavigatorQtObjectEnabled):
* WebProcess/qt/QtBuiltinBundlePage.cpp:
(WebKit::QtBuiltinBundlePage::QtBuiltinBundlePage):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp
• trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (99140 => 99141)

--- trunk/Source/WebKit2/ChangeLog	2011-11-03 06:16:11 UTC (rev 99140)
+++ trunk/Source/WebKit2/ChangeLog	2011-11-03 06:33:00 UTC (rev 99141)
@@ -1,3 +1,20 @@
+2011-11-02  Viatcheslav Ostapenko  <ostapenko.viatches...@nokia.com>
+
+        [Qt] [WK] Debug build broken
+        https://bugs.webkit.org/show_bug.cgi?id=71417
+
+        Add WKNumber.h for WKBooleanGetTypeID
+        Replace WKGetTypeId with WKGetTypeID
+        Add initialization for didDetectXSSForFrame member in WKBundlePageLoaderClient
+        instance.
+
+        Reviewed by Noam Rosenthal.
+
+        * WebProcess/qt/QtBuiltinBundle.cpp:
+        (WebKit::QtBuiltinBundle::handleSetNavigatorQtObjectEnabled):
+        * WebProcess/qt/QtBuiltinBundlePage.cpp:
+        (WebKit::QtBuiltinBundlePage::QtBuiltinBundlePage):
+
 2011-11-02  Mark Hahnenberg  <mhahnenb...@apple.com>
 
         De-virtualize JSObject::getOwnPropertyNames

Modified: trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp (99140 => 99141)

--- trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp	2011-11-03 06:16:11 UTC (rev 99140)
+++ trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp	2011-11-03 06:33:00 UTC (rev 99141)
@@ -30,6 +30,7 @@
 #include "QtBuiltinBundlePage.h"
 #include "WKArray.h"
 #include "WKBundlePage.h"
+#include "WKNumber.h"
 #include "WKRetainPtr.h"
 #include "WKString.h"
 #include "WKStringQt.h"
@@ -131,7 +132,7 @@
 void QtBuiltinBundle::handleSetNavigatorQtObjectEnabled(WKTypeRef messageBody)
 {
     ASSERT(messageBody);
-    ASSERT(WKGetTypeId(messageBody) == WKArrayGetTypeID());
+    ASSERT(WKGetTypeID(messageBody) == WKArrayGetTypeID());
 
     WKArrayRef body = static_cast<WKArrayRef>(messageBody);
     ASSERT(WKArrayGetSize(body) == 2);

Modified: trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp (99140 => 99141)

--- trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp	2011-11-03 06:16:11 UTC (rev 99140)
+++ trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp	2011-11-03 06:33:00 UTC (rev 99141)
@@ -67,6 +67,7 @@
         0, // willPerformClientRedirectForFrame
         0, // didHandleOnloadEventsForFrame
         0, // didLayoutForFrame
+        0, // didDetectXSSForFrame
     };
     WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes