[Win][Clang][WebKitLegacy] error: 'static' is invalid in friend declarations
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Sep 2018 16:20:36 +0000 (16:20 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Sep 2018 16:20:36 +0000 (16:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=189539

Reviewed by Alex Christensen.

* 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.

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

Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp
Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h
Source/WebKitLegacy/win/WebNodeHighlight.cpp
Source/WebKitLegacy/win/WebNodeHighlight.h

index 5ed18a3..8d352ce 100644 (file)
@@ -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 Alex Christensen.
+
+        * 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
index 0c270da..08c683e 100644 (file)
@@ -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)
index a4b4a03..8342fe0 100644 (file)
@@ -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)
index 7847ed0..07a2f60 100644 (file)
@@ -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");
index 2f8269a..f9755bb 100644 (file)
@@ -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)