Diff
Modified: trunk/Source/WebCore/ChangeLog (219868 => 219869)
--- trunk/Source/WebCore/ChangeLog 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/ChangeLog 2017-07-25 16:49:49 UTC (rev 219869)
@@ -1,3 +1,36 @@
+2017-07-25 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@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 <annu...@yandex.ru>
Unreviewed, fix Mac CMake build after r219567
Modified: trunk/Source/WebCore/PlatformWin.cmake (219868 => 219869)
--- trunk/Source/WebCore/PlatformWin.cmake 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/PlatformWin.cmake 2017-07-25 16:49:49 UTC (rev 219869)
@@ -147,6 +147,8 @@
platform/win/WheelEventWin.cpp
platform/win/WidgetWin.cpp
platform/win/WindowMessageBroadcaster.cpp
+
+ rendering/RenderThemeWin.cpp
)
list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (219868 => 219869)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -27,6 +27,7 @@
#include "config.h"
#include "JSDOMGlobalObject.h"
+#include "DOMWindow.h"
#include "Document.h"
#include "JSDOMPromiseDeferred.h"
#include "JSDOMWindow.h"
Modified: trunk/Source/WebCore/bindings/js/JSDOMPromiseDeferred.cpp (219868 => 219869)
--- trunk/Source/WebCore/bindings/js/JSDOMPromiseDeferred.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromiseDeferred.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -26,6 +26,7 @@
#include "config.h"
#include "JSDOMPromiseDeferred.h"
+#include "DOMWindow.h"
#include "JSDOMError.h"
#include "JSDOMWindow.h"
#include <builtins/BuiltinNames.h>
Modified: trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp (219868 => 219869)
--- trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -26,6 +26,7 @@
#include "config.h"
#include "JSDOMWrapper.h"
+#include "DOMWindow.h"
#include "DOMWrapperWorld.h"
#include "JSDOMWindow.h"
#include "WebCoreJSClientData.h"
Modified: trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp (219868 => 219869)
--- trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -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>
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (219868 => 219869)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2017-07-25 16:49:49 UTC (rev 219869)
@@ -5385,6 +5385,7 @@
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 @@
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)");
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (219868 => 219869)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -21,6 +21,7 @@
#include "config.h"
#include "JSTestObj.h"
+#include "DOMWindow.h"
#include "Document.h"
#include "EventNames.h"
#include "Frame.h"
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (219868 => 219869)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -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"
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (219868 => 219869)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -34,6 +34,7 @@
#include "CommandLineAPIHost.h"
#include "CommonVM.h"
+#include "DOMWindow.h"
#include "DOMWrapperWorld.h"
#include "GraphicsContext.h"
#include "InspectorApplicationCacheAgent.h"
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (219868 => 219869)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -33,6 +33,7 @@
#include "config.h"
#include "InspectorTimelineAgent.h"
+#include "DOMWindow.h"
#include "Event.h"
#include "Frame.h"
#include "InspectorMemoryAgent.h"
Modified: trunk/Source/WebCore/rendering/RenderMediaControls.cpp (219868 => 219869)
--- trunk/Source/WebCore/rendering/RenderMediaControls.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/rendering/RenderMediaControls.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -29,6 +29,7 @@
#include "RenderMediaControls.h"
+#include "DOMWindow.h"
#include "GraphicsContext.h"
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
Modified: trunk/Source/WebCore/rendering/RenderMediaControls.h (219868 => 219869)
--- trunk/Source/WebCore/rendering/RenderMediaControls.h 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/rendering/RenderMediaControls.h 2017-07-25 16:49:49 UTC (rev 219869)
@@ -27,6 +27,7 @@
#if ENABLE(VIDEO)
+#include "MediaControlElementTypes.h"
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (219868 => 219869)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -24,6 +24,7 @@
#include "CSSValueKeywords.h"
#include "Element.h"
+#include "FileSystem.h"
#include "FontMetrics.h"
#include "Frame.h"
#include "FrameSelection.h"
Modified: trunk/Source/WebCore/rendering/RenderingAllInOne.cpp (219868 => 219869)
--- trunk/Source/WebCore/rendering/RenderingAllInOne.cpp 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/rendering/RenderingAllInOne.cpp 2017-07-25 16:49:49 UTC (rev 219869)
@@ -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"
Modified: trunk/Source/WebCore/testing/MemoryInfo.h (219868 => 219869)
--- trunk/Source/WebCore/testing/MemoryInfo.h 2017-07-25 13:22:12 UTC (rev 219868)
+++ trunk/Source/WebCore/testing/MemoryInfo.h 2017-07-25 16:49:49 UTC (rev 219869)
@@ -31,7 +31,6 @@
#pragma once
#include "CommonVM.h"
-#include "JSDOMWindow.h"
#include <wtf/RefCounted.h>
namespace WebCore {
