Changeset 128038 in webkit

Timestamp:

Sep 10, 2012 3:28:08 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] WK2 build fixes for MSVC
​https://bugs.webkit.org/show_bug.cgi?id=96248

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-09-10
Reviewed by Tor Arne Vestbø.

MSVC is picky when it comes to the use of forward declaration and the use of
such forward declared types in templates. In these instances inline functions were
passed parameters in RefPtrs that were only forward declared, but at compile time
MSVC wants to know what type it is in order to completely instantiate RefPtr (which
needs to call the type destructor for example). Therefore this patch resolves a couple
of forward declarations with direct header file inclusions.

• UIProcess/API/qt/raw/qrawwebview_p_p.h:
• UIProcess/InspectorServer/WebSocketServerClient.h:
• UIProcess/qt/QtPageClient.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/raw/qrawwebview_p_p.h (modified) (1 diff)
• UIProcess/InspectorServer/WebSocketServerClient.h (modified) (1 diff)
• UIProcess/qt/QtPageClient.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] WK2 build fixes for MSVC
+        https://bugs.webkit.org/show_bug.cgi?id=96248
+
+        Reviewed by Tor Arne Vestbø.
+
+        MSVC is picky when it comes to the use of forward declaration and the use of
+        such forward declared types in templates. In these instances inline functions were
+        passed parameters in RefPtrs that were only forward declared, but at compile time
+        MSVC wants to know what type it is in order to completely instantiate RefPtr (which
+        needs to call the type destructor for example). Therefore this patch resolves a couple
+        of forward declarations with direct header file inclusions.
+
+        * UIProcess/API/qt/raw/qrawwebview_p_p.h:
+        * UIProcess/InspectorServer/WebSocketServerClient.h:
+        * UIProcess/qt/QtPageClient.h:
+
 2012-09-10  Andras Becsi  <andras.becsi@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h

@@ -26 +26 @@
 #define qrawwebview_p_p_h
 
+#include "FindIndicator.h"
 #include "PageClient.h"
 #include "WebContextMenuProxy.h"
+#include "WebEditCommandProxy.h"
 #include "WebPopupMenuProxy.h"
 #include "qrawwebview_p.h"

trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerClient.h

@@ -29 +29 @@
 #if ENABLE(INSPECTOR_SERVER)
 
+#include <WebCore/HTTPRequest.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
-
-namespace WebCore {
-class HTTPRequest;
-}
 
 namespace WebKit {

trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h

@@ -22 +22 @@
 #define QtPageClient_h
 
+#include "FindIndicator.h"
 #include "PageClient.h"