Diff
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (235937 => 235938)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-09-12 16:10:59 UTC (rev 235937)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-09-12 16:20:36 UTC (rev 235938)
@@ -1,3 +1,16 @@
+2018-09-12 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
Refactor WebCore::EditAction to be an 8-bit enum class
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp (235937 => 235938)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp 2018-09-12 16:10:59 UTC (rev 235937)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp 2018-09-12 16:20:36 UTC (rev 235938)
@@ -491,7 +491,7 @@
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)
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h (235937 => 235938)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h 2018-09-12 16:10:59 UTC (rev 235937)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h 2018-09-12 16:20:36 UTC (rev 235938)
@@ -141,7 +141,7 @@
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)
Modified: trunk/Source/WebKitLegacy/win/WebNodeHighlight.cpp (235937 => 235938)
--- trunk/Source/WebKitLegacy/win/WebNodeHighlight.cpp 2018-09-12 16:10:59 UTC (rev 235937)
+++ trunk/Source/WebKitLegacy/win/WebNodeHighlight.cpp 2018-09-12 16:20:36 UTC (rev 235938)
@@ -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");
Modified: trunk/Source/WebKitLegacy/win/WebNodeHighlight.h (235937 => 235938)
--- trunk/Source/WebKitLegacy/win/WebNodeHighlight.h 2018-09-12 16:10:59 UTC (rev 235937)
+++ trunk/Source/WebKitLegacy/win/WebNodeHighlight.h 2018-09-12 16:20:36 UTC (rev 235938)
@@ -66,7 +66,7 @@
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)
