Title: [238052] trunk/Source
Revision
238052
Author
ross.kirsl...@sony.com
Date
2018-11-09 13:10:26 -0800 (Fri, 09 Nov 2018)

Log Message

Unreviewed MSVC build fix after r238039 (and r238046).

Source/WebCore:

* bindings/js/JSWorkerGlobalScopeBase.cpp:
* bindings/js/JSWorkerGlobalScopeBase.h:

Source/WebKitLegacy/win:

* WebDocumentLoader.h:
* WebView.cpp:
(WebView::setShouldApplyMacFontAscentHack):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (238051 => 238052)


--- trunk/Source/WebCore/ChangeLog	2018-11-09 20:43:23 UTC (rev 238051)
+++ trunk/Source/WebCore/ChangeLog	2018-11-09 21:10:26 UTC (rev 238052)
@@ -1,3 +1,10 @@
+2018-11-09  Ross Kirsling  <ross.kirsl...@sony.com>
+
+        Unreviewed MSVC build fix after r238039 (and r238046).
+
+        * bindings/js/JSWorkerGlobalScopeBase.cpp:
+        * bindings/js/JSWorkerGlobalScopeBase.h:
+
 2018-11-09  Basuke Suzuki  <basuke.suz...@sony.com>
 
         [Curl][WebKit] Implement Proxy configuration API.

Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp (238051 => 238052)


--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp	2018-11-09 20:43:23 UTC (rev 238051)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp	2018-11-09 21:10:26 UTC (rev 238052)
@@ -38,6 +38,7 @@
 #include "WorkerThread.h"
 #include <_javascript_Core/JSCInlines.h>
 #include <_javascript_Core/JSCJSValueInlines.h>
+#include <_javascript_Core/JSProxy.h>
 #include <_javascript_Core/Microtask.h>
 #include <wtf/Language.h>
 

Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h (238051 => 238052)


--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h	2018-11-09 20:43:23 UTC (rev 238051)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h	2018-11-09 21:10:26 UTC (rev 238052)
@@ -28,12 +28,15 @@
 
 #include "JSDOMGlobalObject.h"
 #include "JSDOMWrapper.h"
-#include <_javascript_Core/JSProxy.h>
 
 #if ENABLE(SERVICE_WORKER)
 #include "ServiceWorkerGlobalScope.h"
 #endif
 
+namespace JSC {
+class JSProxy;
+}
+
 namespace WebCore {
 
 class JSDedicatedWorkerGlobalScope;

Modified: trunk/Source/WebKitLegacy/win/ChangeLog (238051 => 238052)


--- trunk/Source/WebKitLegacy/win/ChangeLog	2018-11-09 20:43:23 UTC (rev 238051)
+++ trunk/Source/WebKitLegacy/win/ChangeLog	2018-11-09 21:10:26 UTC (rev 238052)
@@ -1,3 +1,11 @@
+2018-11-09  Ross Kirsling  <ross.kirsl...@sony.com>
+
+        Unreviewed MSVC build fix after r238039 (and r238046).
+
+        * WebDocumentLoader.h:
+        * WebView.cpp:
+        (WebView::setShouldApplyMacFontAscentHack):
+
 2018-11-09  Antti Koivisto  <an...@apple.com>
 
         Use OptionSet for layout milestones

Modified: trunk/Source/WebKitLegacy/win/WebDocumentLoader.h (238051 => 238052)


--- trunk/Source/WebKitLegacy/win/WebDocumentLoader.h	2018-11-09 20:43:23 UTC (rev 238051)
+++ trunk/Source/WebKitLegacy/win/WebDocumentLoader.h	2018-11-09 21:10:26 UTC (rev 238052)
@@ -26,12 +26,10 @@
 #include "WebDataSource.h"
 #include <WebCore/DocumentLoader.h>
 
-using namespace WebCore;
-
-class WebDocumentLoader : public DocumentLoader
+class WebDocumentLoader : public WebCore::DocumentLoader
 {
 public:
-    static Ref<WebDocumentLoader> create(const ResourceRequest&, const SubstituteData&);
+    static Ref<WebDocumentLoader> create(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
 
     ~WebDocumentLoader();
 
@@ -43,7 +41,7 @@
     virtual void detachFromFrame();
 
 private:
-    WebDocumentLoader(const ResourceRequest&, const SubstituteData&);
+    WebDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
     WebDataSource* m_dataSource;
     WebDataSource* m_detachedDataSource; // not retained
 };

Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (238051 => 238052)


--- trunk/Source/WebKitLegacy/win/WebView.cpp	2018-11-09 20:43:23 UTC (rev 238051)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp	2018-11-09 21:10:26 UTC (rev 238052)
@@ -6030,7 +6030,7 @@
 
 HRESULT WebView::setShouldApplyMacFontAscentHack(BOOL b)
 {
-    Font::setShouldApplyMacAscentHack(b);
+    WebCore::Font::setShouldApplyMacAscentHack(b);
     return S_OK;
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to