Title: [128038] trunk/Source/WebKit2
- Revision
- 128038
- Author
- [email protected]
- Date
- 2012-09-10 03:28:08 -0700 (Mon, 10 Sep 2012)
Log Message
[Qt] WK2 build fixes for MSVC
https://bugs.webkit.org/show_bug.cgi?id=96248
Patch by Simon Hausmann <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128037 => 128038)
--- trunk/Source/WebKit2/ChangeLog 2012-09-10 09:46:12 UTC (rev 128037)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-10 10:28:08 UTC (rev 128038)
@@ -1,3 +1,21 @@
+2012-09-10 Simon Hausmann <[email protected]>
+
+ [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 <[email protected]>
[Qt][WK2] QWebKitTest should retrieve the viewport state from the PageViewportController
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h (128037 => 128038)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h 2012-09-10 09:46:12 UTC (rev 128037)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h 2012-09-10 10:28:08 UTC (rev 128038)
@@ -25,8 +25,10 @@
#ifndef qrawwebview_p_p_h
#define qrawwebview_p_p_h
+#include "FindIndicator.h"
#include "PageClient.h"
#include "WebContextMenuProxy.h"
+#include "WebEditCommandProxy.h"
#include "WebPopupMenuProxy.h"
#include "qrawwebview_p.h"
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerClient.h (128037 => 128038)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerClient.h 2012-09-10 09:46:12 UTC (rev 128037)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerClient.h 2012-09-10 10:28:08 UTC (rev 128038)
@@ -28,13 +28,10 @@
#if ENABLE(INSPECTOR_SERVER)
+#include <WebCore/HTTPRequest.h>
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
-namespace WebCore {
-class HTTPRequest;
-}
-
namespace WebKit {
class WebSocketServerConnection;
Modified: trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h (128037 => 128038)
--- trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h 2012-09-10 09:46:12 UTC (rev 128037)
+++ trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h 2012-09-10 10:28:08 UTC (rev 128038)
@@ -21,6 +21,7 @@
#ifndef QtPageClient_h
#define QtPageClient_h
+#include "FindIndicator.h"
#include "PageClient.h"
class QQuickWebView;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
