Changeset 93949 in webkit

Timestamp:

Aug 28, 2011, 12:14:17 PM (15 years ago)

Author:

kbalazs@webkit.org

Message:

[Qt][WK2] Unreviewed build fix.

• UIProcess/qt/QtWebPageProxy.cpp:

(QtWebPageProxy::init): Initialize the WKPageUIClient with memset
to avoid missing initializer warning. The missing initializer is the
result of using a version 0 WKPageUIClient while it has newer version (1).
We have nothing to do with the callbacks in the new version so I voted
for memset.

• WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp: Include ResourceError.h.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtWebPageProxy.cpp (modified) (1 diff)
• WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [Qt][WK2] Unreviewed build fix.
+
+        * UIProcess/qt/QtWebPageProxy.cpp:
+        (QtWebPageProxy::init): Initialize the WKPageUIClient with memset
+        to avoid missing initializer warning. The missing initializer is the
+        result of using a version 0 WKPageUIClient while it has newer version (1).
+        We have nothing to do with the callbacks in the new version so I voted
+        for memset.
+        * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp: Include ResourceError.h.
+
 2011-08-26  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp

@@ -150 +150 @@
     WKPageSetPageLoaderClient(pageRef(), &loadClient);
 
-    WKPageUIClient uiClient = {
-        0,      /* version */
-        m_viewInterface,   /* clientInfo */
-        0,  /* createNewPage */
-        0,  /* showPage */
-        0,  /* close */
-        0,  /* takeFocus */
-        0,  /* focus */
-        0,  /* unfocus */
-        0,  /* runJavaScriptAlert */
-        0,  /* runJavaScriptConfirm */
-        0,  /* runJavaScriptPrompt */
-        qt_wk_setStatusText,
-        0,  /* mouseDidMoveOverElement */
-        0,  /* missingPluginButtonClicked */
-        0,  /* didNotHandleKeyEvent */
-        0,  /* didNotHandleWheelEvent */
-        0,  /* toolbarsAreVisible */
-        0,  /* setToolbarsAreVisible */
-        0,  /* menuBarIsVisible */
-        0,  /* setMenuBarIsVisible */
-        0,  /* statusBarIsVisible */
-        0,  /* setStatusBarIsVisible */
-        0,  /* isResizable */
-        0,  /* setIsResizable */
-        0,  /* getWindowFrame */
-        0,  /* setWindowFrame */
-        0,  /* runBeforeUnloadConfirmPanel */
-        0,  /* didDraw */
-        0,  /* pageDidScroll */
-        0,  /* exceededDatabaseQuota */
-        0,  /* runOpenPanel */
-        0,  /* decidePolicyForGeolocationPermissionRequest */
-        0,  /* headerHeight */
-        0,  /* footerHeight */
-        0,  /* drawHeader */
-        0,  /* drawFooter */
-        0,  /* printFrame */
-        0,  /* runModal */
-        0,  /* didCompleteRubberBandForMainFrame */
-        0,  /* saveDataToFileInDownloadsFolder */
-        0,  /* shouldInterruptJavaScript */
-    };
+    WKPageUIClient uiClient;
+    memset(&uiClient, 0, sizeof(WKPageUIClient));
+    uiClient.version = 0;
+    uiClient.clientInfo = m_viewInterface;
+    uiClient.setStatusText = qt_wk_setStatusText;
     WKPageSetPageUIClient(toAPI(m_webPageProxy.get()), &uiClient);
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp

@@ -28 +28 @@
 #include "WebErrors.h"
 
+#include <WebCore/ResourceError.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
@@ -43 +44 @@
     WebKitErrorCannotShowURL =                                  101,
     WebKitErrorFrameLoadInterruptedByPolicyChange =             102,
-    WebKitErrorCannotUseRestrictedPort = 103,
+    WebKitErrorCannotUseRestrictedPort =                        103,
     WebKitErrorCannotFindPlugIn =                               200,
     WebKitErrorCannotLoadPlugIn =                               201,