[Win][WebKit] Fix forwarding headers for Windows build
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 May 2018 23:29:03 +0000 (23:29 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 May 2018 23:29:03 +0000 (23:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184412

Reviewed by Alex Christensen.

Source/WebCore:

No new tests. No change in behavior.

* PlatformWin.cmake:

Source/WebKit:

* PlatformWin.cmake:
* UIProcess/API/APIAttachment.h:
* UIProcess/API/APIContextMenuClient.h:
* UIProcess/API/C/WKProcessTerminationReason.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231387 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformWin.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformWin.cmake
Source/WebKit/UIProcess/API/APIAttachment.h
Source/WebKit/UIProcess/API/APIContextMenuClient.h
Source/WebKit/UIProcess/API/C/WKProcessTerminationReason.h
Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp

index 99990c7..f05708e 100644 (file)
@@ -1,3 +1,14 @@
+2018-05-04  Don Olmstead  <don.olmstead@sony.com>
+
+        [Win][WebKit] Fix forwarding headers for Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=184412
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No change in behavior.
+
+        * PlatformWin.cmake:
+
 2018-05-04  Zalan Bujtas  <zalan@apple.com>
 
         [Simple line layout] Add support for line layout box generation with multiple text renderers.
index 50b9331..2fea4e4 100644 (file)
@@ -129,6 +129,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     bindings
     bridge
     contentextensions
+    crypto
     css
     dom
     editing
@@ -141,6 +142,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     platform
     plugins
     rendering
+    replay
     storage
     style
     svg
index 32aceca..dff61eb 100644 (file)
@@ -1,3 +1,16 @@
+2018-05-04  Don Olmstead  <don.olmstead@sony.com>
+
+        [Win][WebKit] Fix forwarding headers for Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=184412
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+        * UIProcess/API/APIAttachment.h:
+        * UIProcess/API/APIContextMenuClient.h:
+        * UIProcess/API/C/WKProcessTerminationReason.h:
+        * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
+
 2018-05-04  Chris Dumez  <cdumez@apple.com>
 
         [iOS] Apps that are not visible may not get suspended if they trigger page loads while in the background
index 216e8fc..c745e7c 100644 (file)
@@ -189,16 +189,6 @@ set(SharedWebKitLibraries
 WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
 
 set(WebKit_FORWARDING_HEADERS_DIRECTORIES
-    Platform
-    Shared
-    UIProcess
-
-    NetworkProcess/Downloads
-
-    Platform/IPC
-
-    Shared/API
-
     Shared/API/c
 
     Shared/API/c/cf
@@ -209,8 +199,6 @@ set(WebKit_FORWARDING_HEADERS_DIRECTORIES
 
     UIProcess/API/C/win
 
-    WebProcess/WebPage
-
     WebProcess/InjectedBundle/API/c
 )
 
index 261d143..bf7a227 100644 (file)
@@ -26,8 +26,8 @@
 #pragma once
 
 #include "APIObject.h"
-#include <WebKit/WKBase.h>
-#include <WebKit/WebPageProxy.h>
+#include "WKBase.h"
+#include "WebPageProxy.h"
 #include <wtf/RefPtr.h>
 #include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
index 892c29f..af109c1 100644 (file)
 
 #if ENABLE(CONTEXT_MENUS)
 
+#include "WKBase.h"
 #include "WebContextMenuItem.h"
 #include "WebContextMenuListenerProxy.h"
 #include "WebHitTestResultData.h"
-#include <WebKit/WKBase.h>
 #include <wtf/CompletionHandler.h>
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
index 620e85a..63d108a 100644 (file)
@@ -23,7 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#pragma once
+#ifndef WKProcessTerminationReason_h
+#define WKProcessTerminationReason_h
 
 #include <stdint.h>
 
@@ -42,3 +43,5 @@ typedef uint32_t WKProcessTerminationReason;
 #ifdef __cplusplus
 }
 #endif
+
+#endif // WKProcessTerminationReason_h
index 3c07d2e..df9286f 100644 (file)
 #include "WKSharedAPICast.h"
 #include "WKStringPrivate.h"
 #include "WebPage.h"
+#include "WebPageOverlay.h"
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/PageOverlay.h>
 #include <WebCore/PlatformMouseEvent.h>
-#include <WebKit/WebPageOverlay.h>
 
 namespace API {