Attachment 339601 Details for Bug 184412 – Patch

[patch] Patch

bug-184412.diff (text/plain), 4.73 KB, created by Don Olmstead on 2018-05-04 15:06:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-05-04 15:06:44 PDT

Size: 4.73 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9723cf4b8b6..3a99db60107 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -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 NOBODY (OOPS!).
>+
>+        No new tests. No change in behavior.
>+
>+        * PlatformWin.cmake:
>+
> 2018-05-04  Zalan Bujtas  <zalan@apple.com>
> 
>         Use the containing block to compute the pagination gap when the container is inline.
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index 50b9331df04..a9df3c2a696 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -130,6 +130,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     bridge
>     contentextensions
>     css
>+    crypto
>     dom
>     editing
>     fileapi
>@@ -141,6 +142,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     platform
>     plugins
>     rendering
>+    replay
>     storage
>     style
>     svg
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 32aceca8de4..cef4c476e4c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -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 NOBODY (OOPS!).
>+
>+        * 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
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index 216e8fcf0a5..c745e7c19f1 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -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
> )
> 
>diff --git a/Source/WebKit/UIProcess/API/APIAttachment.h b/Source/WebKit/UIProcess/API/APIAttachment.h
>index 261d1439521..bf7a2274296 100644
>--- a/Source/WebKit/UIProcess/API/APIAttachment.h
>+++ b/Source/WebKit/UIProcess/API/APIAttachment.h
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/API/APIContextMenuClient.h b/Source/WebKit/UIProcess/API/APIContextMenuClient.h
>index 892c29f6bb4..81a6e0f5b1b 100644
>--- a/Source/WebKit/UIProcess/API/APIContextMenuClient.h
>+++ b/Source/WebKit/UIProcess/API/APIContextMenuClient.h
>@@ -30,7 +30,7 @@
> #include "WebContextMenuItem.h"
> #include "WebContextMenuListenerProxy.h"
> #include "WebHitTestResultData.h"
>-#include <WebKit/WKBase.h>
>+#include "WKBase.h"
> #include <wtf/CompletionHandler.h>
> #include <wtf/Forward.h>
> #include <wtf/RefPtr.h>
>diff --git a/Source/WebKit/UIProcess/API/C/WKProcessTerminationReason.h b/Source/WebKit/UIProcess/API/C/WKProcessTerminationReason.h
>index 620e85a86f8..63d108abbe4 100644
>--- a/Source/WebKit/UIProcess/API/C/WKProcessTerminationReason.h
>+++ b/Source/WebKit/UIProcess/API/C/WKProcessTerminationReason.h
>@@ -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
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>index 3c07d2e0781..df9286f41c8 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>@@ -36,10 +36,10 @@
> #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 {
>

Actions: View | Formatted Diff | Diff

Attachments on bug 184412: 337486 | 339601 | 339602