[WinCairo] Fix build with AllInOnes disabled

https://bugs.webkit.org/show_bug.cgi?id=174784
<rdar://problem/33488914>

Patch by Yoshiaki Jitsukawa <Yoshiaki.Jitsukawa@sony.com> on 2017-07-25
Reviewed by Alex Christensen.

* PlatformWin.cmake:
Add RenderThemeWin.cpp to WebCore_SOURCES

* rendering/RenderingAllInOne.cpp:
Remove #include "RenderThemeWin.cpp"

* testing/MemoryInfo.h:
Remove #include "JSDomWindow.h"

* bindings/js/JSDOMGlobalObject.cpp:
* bindings/js/JSDOMPromiseDeferred.cpp:
* bindings/js/JSDOMWrapper.cpp:
* bindings/js/JSImageDataCustom.cpp:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateCallWith):
* dom/ScriptExecutionContext.cpp:
* inspector/InspectorController.cpp:
* inspector/InspectorTimelineAgent.cpp:
* rendering/RenderMediaControls.cpp:
* rendering/RenderMediaControls.h:
* rendering/RenderThemeWin.cpp:

* bindings/scripts/test/JS/JSTestObj.cpp:
Update test results.

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2c0fd5a69bb073e5bab65aa4ff67bd2c20c82876..2af32742ffdcc33f4a13e4dbf515173b10dbfb66 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2017-07-25  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [WinCairo] Fix build with AllInOnes disabled
+        https://bugs.webkit.org/show_bug.cgi?id=174784
+        <rdar://problem/33488914>
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+        Add RenderThemeWin.cpp to WebCore_SOURCES
+
+        * rendering/RenderingAllInOne.cpp:
+        Remove #include "RenderThemeWin.cpp"
+
+        * testing/MemoryInfo.h:
+        Remove #include "JSDomWindow.h"
+
+        * bindings/js/JSDOMGlobalObject.cpp:
+        * bindings/js/JSDOMPromiseDeferred.cpp:
+        * bindings/js/JSDOMWrapper.cpp:
+        * bindings/js/JSImageDataCustom.cpp:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateCallWith):
+        * dom/ScriptExecutionContext.cpp:
+        * inspector/InspectorController.cpp:
+        * inspector/InspectorTimelineAgent.cpp:
+        * rendering/RenderMediaControls.cpp:
+        * rendering/RenderMediaControls.h:
+        * rendering/RenderThemeWin.cpp:
+
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        Update test results.
+
 2017-07-25  Konstantin Tokarev  <annulen@yandex.ru>
 
         Unreviewed, fix Mac CMake build after r219567

diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
index cc29e89f16c89d0149e4504f8d033927a8f21095..fbd3d5beb7d7bf3d0ec473175e9025bc62b53cd9 100644 (file)
--- a/Source/WebCore/PlatformWin.cmake
+++ b/Source/WebCore/PlatformWin.cmake
@@ -147,6 +147,8 @@ list(APPEND WebCore_SOURCES
     platform/win/WheelEventWin.cpp
     platform/win/WidgetWin.cpp
     platform/win/WindowMessageBroadcaster.cpp
+
+    rendering/RenderThemeWin.cpp
 )
 
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS

diff --git a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
index 24e0effc1564e95fd9bfff6b442f7e8d99d528da..e56c023ef13644513b6b99514877f3d5a73833a3 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
+++ b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "JSDOMGlobalObject.h"
 
+#include "DOMWindow.h"
 #include "Document.h"
 #include "JSDOMPromiseDeferred.h"
 #include "JSDOMWindow.h"

diff --git a/Source/WebCore/bindings/js/JSDOMPromiseDeferred.cpp b/Source/WebCore/bindings/js/JSDOMPromiseDeferred.cpp
index 8e49a7215a72734e9b0990f5cb6ba0cb79f860a8..5c8c33aa3a1516d164409b83f03b4895c43bf3f4 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMPromiseDeferred.cpp
+++ b/Source/WebCore/bindings/js/JSDOMPromiseDeferred.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "JSDOMPromiseDeferred.h"
 
+#include "DOMWindow.h"
 #include "JSDOMError.h"
 #include "JSDOMWindow.h"
 #include <builtins/BuiltinNames.h>

diff --git a/Source/WebCore/bindings/js/JSDOMWrapper.cpp b/Source/WebCore/bindings/js/JSDOMWrapper.cpp
index 21da86365dd5be2fcedcb61b94c72ce27b710023..95eb04f2461878581f44df0332dfb1bdcb5b4d75 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMWrapper.cpp
+++ b/Source/WebCore/bindings/js/JSDOMWrapper.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "JSDOMWrapper.h"
 
+#include "DOMWindow.h"
 #include "DOMWrapperWorld.h"
 #include "JSDOMWindow.h"
 #include "WebCoreJSClientData.h"

diff --git a/Source/WebCore/bindings/js/JSImageDataCustom.cpp b/Source/WebCore/bindings/js/JSImageDataCustom.cpp
index 518b5ef1380c9621f33d8b4927a43c68dd029c08..8daf4c102c4d4a40a8fa23e57fa48a021558c000 100644 (file)
--- a/Source/WebCore/bindings/js/JSImageDataCustom.cpp
+++ b/Source/WebCore/bindings/js/JSImageDataCustom.cpp
@@ -30,6 +30,7 @@
 #include "JSDOMWrapperCache.h"
 #include <heap/HeapInlines.h>
 #include <runtime/IdentifierInlines.h>
+#include <runtime/JSObjectInlines.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/WTFString.h>
 

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index f7d2fb3ffc31b820fb7aa0017f908286f61ed9c4..db2336968baaae7b18a4361ef3cb636c29563a50 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -5385,6 +5385,7 @@ sub GenerateCallWith
         push(@callWithArgs, "document");
     }
     if ($codeGenerator->ExtendedAttributeContains($callWith, "IncumbentDocument")) {
+        AddToImplIncludes("DOMWindow.h");
         AddToImplIncludes("JSDOMWindowBase.h");
         push(@$outputArray, $indent . "auto* incumbentDocument = incumbentDOMWindow($stateReference).document();\n");
         push(@$outputArray, $indent . "if (!incumbentDocument)\n");
@@ -5392,18 +5393,22 @@ sub GenerateCallWith
         push(@callWithArgs, "*incumbentDocument");
     }
     if ($codeGenerator->ExtendedAttributeContains($callWith, "ResponsibleDocument")) {
+        AddToImplIncludes("DOMWindow.h");
         AddToImplIncludes("JSDOMWindowBase.h");
         push(@callWithArgs, "responsibleDocument($stateReference)");
     }
     if ($codeGenerator->ExtendedAttributeContains($callWith, "ActiveWindow")) {
+        AddToImplIncludes("DOMWindow.h");
         AddToImplIncludes("JSDOMWindowBase.h");
         push(@callWithArgs, "activeDOMWindow($stateReference)");
     }
     if ($codeGenerator->ExtendedAttributeContains($callWith, "FirstWindow")) {
+        AddToImplIncludes("DOMWindow.h");
         AddToImplIncludes("JSDOMWindowBase.h");
         push(@callWithArgs, "firstDOMWindow($stateReference)");
     }
     if ($codeGenerator->ExtendedAttributeContains($callWith, "IncumbentWindow")) {
+        AddToImplIncludes("DOMWindow.h");
         AddToImplIncludes("JSDOMWindowBase.h");
         push(@callWithArgs, "incumbentDOMWindow($stateReference)");
     }

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
index cf069900f16a5c36d3003060c51bac53920a8d45..476ab7499307e95792e9e47e478131d7ad1a889f 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "JSTestObj.h"
 
+#include "DOMWindow.h"
 #include "Document.h"
 #include "EventNames.h"
 #include "Frame.h"

diff --git a/Source/WebCore/dom/ScriptExecutionContext.cpp b/Source/WebCore/dom/ScriptExecutionContext.cpp
index bc03111057f255e4def4d1e5fefe46bf4ba46613..064d5561df4c0614e67508d779901399e15b5105 100644 (file)
--- a/Source/WebCore/dom/ScriptExecutionContext.cpp
+++ b/Source/WebCore/dom/ScriptExecutionContext.cpp
@@ -31,6 +31,7 @@
 #include "CachedScript.h"
 #include "CommonVM.h"
 #include "DOMTimer.h"
+#include "DOMWindow.h"
 #include "DatabaseContext.h"
 #include "Document.h"
 #include "ErrorEvent.h"

diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index f7f332cfb6b49f401f795ee721c059ee5baf0a25..0d03aba0d070d5e63f9b2f9466dc67298b9870af 100644 (file)
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -34,6 +34,7 @@
 
 #include "CommandLineAPIHost.h"
 #include "CommonVM.h"
+#include "DOMWindow.h"
 #include "DOMWrapperWorld.h"
 #include "GraphicsContext.h"
 #include "InspectorApplicationCacheAgent.h"

diff --git a/Source/WebCore/inspector/InspectorTimelineAgent.cpp b/Source/WebCore/inspector/InspectorTimelineAgent.cpp
index e202d32c6457787790b673b813f7d7998321500c..1b52bfd18c8f44563a83526eb42c373f4218e8b8 100644 (file)
--- a/Source/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/Source/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -33,6 +33,7 @@
 #include "config.h"
 #include "InspectorTimelineAgent.h"
 
+#include "DOMWindow.h"
 #include "Event.h"
 #include "Frame.h"
 #include "InspectorMemoryAgent.h"

diff --git a/Source/WebCore/rendering/RenderMediaControls.cpp b/Source/WebCore/rendering/RenderMediaControls.cpp
index 248a2a56778b71eff71e5e32a436d24f7d820580..13cef162f5d4b7dc5dddf404792add450f805ab2 100644 (file)
--- a/Source/WebCore/rendering/RenderMediaControls.cpp
+++ b/Source/WebCore/rendering/RenderMediaControls.cpp
@@ -29,6 +29,7 @@
 
 #include "RenderMediaControls.h"
 
+#include "DOMWindow.h"
 #include "GraphicsContext.h"
 #include "HTMLMediaElement.h"
 #include "HTMLNames.h"

diff --git a/Source/WebCore/rendering/RenderMediaControls.h b/Source/WebCore/rendering/RenderMediaControls.h
index cf753ce43f42362e0f820ad1f5ce7b5d2c6ea3ee..f8f8ac90a76534bd592fe70a46dab93a5c769c53 100644 (file)
--- a/Source/WebCore/rendering/RenderMediaControls.h
+++ b/Source/WebCore/rendering/RenderMediaControls.h
@@ -27,6 +27,7 @@
 
 #if ENABLE(VIDEO)
 
+#include "MediaControlElementTypes.h"
 
 namespace WebCore {
 

diff --git a/Source/WebCore/rendering/RenderThemeWin.cpp b/Source/WebCore/rendering/RenderThemeWin.cpp
index cfbd9b311fa5c419bf8d9e3d47ccfff8a9212812..9168e65a26b47ebb02926e778703bc3bfd144fcd 100644 (file)
--- a/Source/WebCore/rendering/RenderThemeWin.cpp
+++ b/Source/WebCore/rendering/RenderThemeWin.cpp
@@ -24,6 +24,7 @@
 
 #include "CSSValueKeywords.h"
 #include "Element.h"
+#include "FileSystem.h"
 #include "FontMetrics.h"
 #include "Frame.h"
 #include "FrameSelection.h"

diff --git a/Source/WebCore/rendering/RenderingAllInOne.cpp b/Source/WebCore/rendering/RenderingAllInOne.cpp
index a797a7e0e47d8ed985d849ce7fdf6b17714a065a..e247069c63ad356bbfd27ccbad98d7f31a6d9345 100644 (file)
--- a/Source/WebCore/rendering/RenderingAllInOne.cpp
+++ b/Source/WebCore/rendering/RenderingAllInOne.cpp
@@ -129,9 +129,6 @@
 #include "RenderTextFragment.cpp"
 #include "RenderTextLineBoxes.cpp"
 #include "RenderTheme.cpp"
-#if PLATFORM(WIN)
-#include "RenderThemeWin.cpp"
-#endif
 #include "RenderTreeAsText.cpp"
 #include "RenderVTTCue.cpp"
 #include "RenderVideo.cpp"

diff --git a/Source/WebCore/testing/MemoryInfo.h b/Source/WebCore/testing/MemoryInfo.h
index 06084a83fb593e89d08d7282307761ee9944f1bc..dfc244276e026d8ab555a449d6a3d7fc3ab9c7ad 100644 (file)
--- a/Source/WebCore/testing/MemoryInfo.h
+++ b/Source/WebCore/testing/MemoryInfo.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "CommonVM.h"
-#include "JSDOMWindow.h"
 #include <wtf/RefCounted.h>
 
 namespace WebCore {