Attachment 349535 Details for Bug 189539 – Patch

[patch] Patch

bug-189539-20180912183309.patch (text/plain), 3.78 KB, created by Fujii Hironori on 2018-09-12 02:33:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-12 02:33:11 PDT

Size: 3.78 KB

patch

obsolete

>Subversion Revision: 235932
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 5ed18a314e81aaa85e927e57ffde9507a55744bb..614decb45b35a1ec347eee705da4e5b1266e2392 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-12  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][Clang][WebKitLegacy] error: 'static' is invalid in friend declarations
>+        https://bugs.webkit.org/show_bug.cgi?id=189539
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/WebInspectorClient.h: Removed 'static' of WebInspectorWndProc friend declaration.
>+        * WebCoreSupport/WebInspectorClient.cpp:
>+        (WebInspectorWndProc): Ditto.
>+        * WebNodeHighlight.cpp: Added OverlayWndProc declaration to be called before the definition.
>+        * WebNodeHighlight.h: Removed 'static` of OverlayWndProc friend declaration.
>+
> 2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Refactor WebCore::EditAction to be an 8-bit enum class
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp b/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp
>index 0c270dacc544d264df8edcdf4e46567b35c240bb..08c683ec3888034688d98a8fb5723330a65ba1f4 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp
>@@ -491,7 +491,7 @@ void WebInspectorFrontendClient::onWebViewWindowPosChanging(WPARAM, LPARAM lPara
>     SetWindowPos(m_frontendWebViewHwnd, 0, windowPos->x, windowPos->y + windowPos->cy, windowPos->cx, inspectorHeight, SWP_NOZORDER);
> }
> 
>-static LRESULT CALLBACK WebInspectorWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
>+LRESULT CALLBACK WebInspectorWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
> {
>     WebInspectorFrontendClient* client = reinterpret_cast<WebInspectorFrontendClient*>(::GetProp(hwnd, kWebInspectorPointerProp));
>     if (!client)
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h b/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h
>index a4b4a03af0d9f159ebfa772db4954638cf464cb1..8342fe03bb88b054ba388092cfbbe01eef71ab43 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h
>@@ -141,7 +141,7 @@ private:
>     WTF::String m_inspectedURL;
>     bool m_destroyingInspectorView;
> 
>-    static friend LRESULT CALLBACK WebInspectorWndProc(HWND, UINT, WPARAM, LPARAM);
>+    friend LRESULT CALLBACK WebInspectorWndProc(HWND, UINT, WPARAM, LPARAM);
> };
> 
> #endif // !defined(WebInspectorClient_h)
>diff --git a/Source/WebKitLegacy/win/WebNodeHighlight.cpp b/Source/WebKitLegacy/win/WebNodeHighlight.cpp
>index 7847ed085b6293c78af63c2ade2e5433b6c1e7c7..07a2f604f397a2a58b2d7751c44ea92194318730 100644
>--- a/Source/WebKitLegacy/win/WebNodeHighlight.cpp
>+++ b/Source/WebKitLegacy/win/WebNodeHighlight.cpp
>@@ -41,6 +41,7 @@
> 
> using namespace WebCore;
> 
>+LRESULT CALLBACK OverlayWndProc(HWND, UINT, WPARAM, LPARAM);
> static LPCTSTR kOverlayWindowClassName = TEXT("WebNodeHighlightWindowClass");
> static ATOM registerOverlayClass();
> static LPCTSTR kWebNodeHighlightPointerProp = TEXT("WebNodeHighlightPointer");
>diff --git a/Source/WebKitLegacy/win/WebNodeHighlight.h b/Source/WebKitLegacy/win/WebNodeHighlight.h
>index 2f8269a9c8521b8c6b37a3a74da918e58dddf572..f9755bb8daeaab39d3422ee8feb0f24c1b354fed 100644
>--- a/Source/WebKitLegacy/win/WebNodeHighlight.h
>+++ b/Source/WebKitLegacy/win/WebNodeHighlight.h
>@@ -66,7 +66,7 @@ private:
>     HWND m_observedWindow;
>     bool m_showsWhileWebViewIsVisible;
> 
>-    friend static LRESULT CALLBACK OverlayWndProc(HWND, UINT, WPARAM, LPARAM);
>+    friend LRESULT CALLBACK OverlayWndProc(HWND, UINT, WPARAM, LPARAM);
> };
> 
> #endif // !defined(WebNodeHighlight_h)

Actions: View | Formatted Diff | Diff

Attachments on bug 189539: 349528 | 349535 | 349538 | 349541