Unreviewed MSVC build fix after r238039 (and r238046).
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Nov 2018 21:10:26 +0000 (21:10 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Nov 2018 21:10:26 +0000 (21:10 +0000)
Source/WebCore:

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

Source/WebKitLegacy/win:

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

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

Source/WebCore/ChangeLog
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebDocumentLoader.h
Source/WebKitLegacy/win/WebView.cpp

index d0f64f0..79dcdd5 100644 (file)
@@ -1,3 +1,10 @@
+2018-11-09  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed MSVC build fix after r238039 (and r238046).
+
+        * bindings/js/JSWorkerGlobalScopeBase.cpp:
+        * bindings/js/JSWorkerGlobalScopeBase.h:
+
 2018-11-09  Basuke Suzuki  <basuke.suzuki@sony.com>
 
         [Curl][WebKit] Implement Proxy configuration API.
index 50ff12a..380ad5b 100644 (file)
@@ -38,6 +38,7 @@
 #include "WorkerThread.h"
 #include <JavaScriptCore/JSCInlines.h>
 #include <JavaScriptCore/JSCJSValueInlines.h>
+#include <JavaScriptCore/JSProxy.h>
 #include <JavaScriptCore/Microtask.h>
 #include <wtf/Language.h>
 
index 4701ca3..937f2b0 100644 (file)
 
 #include "JSDOMGlobalObject.h"
 #include "JSDOMWrapper.h"
-#include <JavaScriptCore/JSProxy.h>
 
 #if ENABLE(SERVICE_WORKER)
 #include "ServiceWorkerGlobalScope.h"
 #endif
 
+namespace JSC {
+class JSProxy;
+}
+
 namespace WebCore {
 
 class JSDedicatedWorkerGlobalScope;
index 61ee6b3..0578815 100644 (file)
@@ -1,3 +1,11 @@
+2018-11-09  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed MSVC build fix after r238039 (and r238046).
+
+        * WebDocumentLoader.h:
+        * WebView.cpp:
+        (WebView::setShouldApplyMacFontAscentHack):
+
 2018-11-09  Antti Koivisto  <antti@apple.com>
 
         Use OptionSet for layout milestones
index 0e1d889..408d230 100644 (file)
 #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 @@ public:
     virtual void detachFromFrame();
 
 private:
-    WebDocumentLoader(const ResourceRequest&, const SubstituteData&);
+    WebDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
     WebDataSource* m_dataSource;
     WebDataSource* m_detachedDataSource; // not retained
 };
index 16e6bb6..88e529a 100644 (file)
@@ -6030,7 +6030,7 @@ HRESULT WebView::setProhibitsMainFrameScrolling(BOOL b)
 
 HRESULT WebView::setShouldApplyMacFontAscentHack(BOOL b)
 {
-    Font::setShouldApplyMacAscentHack(b);
+    WebCore::Font::setShouldApplyMacAscentHack(b);
     return S_OK;
 }