Title: [228616] releases/WebKitGTK/webkit-2.20/Source/_javascript_Core
Revision
228616
Author
carlo...@webkit.org
Date
2018-02-19 00:51:26 -0800 (Mon, 19 Feb 2018)

Log Message

Merge r228105 - _javascript_Core files should not be included relatively
https://bugs.webkit.org/show_bug.cgi?id=182452

Reviewed by Keith Miller.

* API/JSCallbackConstructor.h:
* CMakeLists.txt:
* disassembler/ARM64Disassembler.cpp:
* disassembler/ARMv7Disassembler.cpp:
* heap/LockDuringMarking.h:
* inspector/InjectedScriptBase.h:
* inspector/InjectedScriptHost.h:
* inspector/_javascript_CallFrame.h:
* inspector/ScriptArguments.h:
* inspector/ScriptDebugListener.h:
* inspector/ScriptDebugServer.h:
* inspector/agents/InspectorAgent.h:
* inspector/agents/InspectorConsoleAgent.h:
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/agents/InspectorHeapAgent.h:
* inspector/agents/InspectorRuntimeAgent.h:
* inspector/agents/InspectorScriptProfilerAgent.h:
* runtime/RegExp.h:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/API/JSCallbackConstructor.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/API/JSCallbackConstructor.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/API/JSCallbackConstructor.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -26,8 +26,8 @@
 #ifndef JSCallbackConstructor_h
 #define JSCallbackConstructor_h
 
+#include "JSDestructibleObject.h"
 #include "JSObjectRef.h"
-#include "runtime/JSDestructibleObject.h"
 
 namespace JSC {
 

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/CMakeLists.txt (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/CMakeLists.txt	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/CMakeLists.txt	2018-02-19 08:51:26 UTC (rev 228616)
@@ -25,8 +25,9 @@
     "${_javascript_CORE_DIR}/bytecompiler"
     "${_javascript_CORE_DIR}/dfg"
     "${_javascript_CORE_DIR}/disassembler"
+    "${_javascript_CORE_DIR}/disassembler/ARM64"
+    "${_javascript_CORE_DIR}/disassembler/ARMv7"
     "${_javascript_CORE_DIR}/disassembler/udis86"
-    "${_javascript_CORE_DIR}/disassembler/ARM64"
     "${_javascript_CORE_DIR}/domjit"
     "${_javascript_CORE_DIR}/ftl"
     "${_javascript_CORE_DIR}/heap"

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog	2018-02-19 08:51:26 UTC (rev 228616)
@@ -1,3 +1,29 @@
+2018-02-05  Don Olmstead  <don.olmst...@sony.com>
+
+        _javascript_Core files should not be included relatively
+        https://bugs.webkit.org/show_bug.cgi?id=182452
+
+        Reviewed by Keith Miller.
+
+        * API/JSCallbackConstructor.h:
+        * CMakeLists.txt:
+        * disassembler/ARM64Disassembler.cpp:
+        * disassembler/ARMv7Disassembler.cpp:
+        * heap/LockDuringMarking.h:
+        * inspector/InjectedScriptBase.h:
+        * inspector/InjectedScriptHost.h:
+        * inspector/_javascript_CallFrame.h:
+        * inspector/ScriptArguments.h:
+        * inspector/ScriptDebugListener.h:
+        * inspector/ScriptDebugServer.h:
+        * inspector/agents/InspectorAgent.h:
+        * inspector/agents/InspectorConsoleAgent.h:
+        * inspector/agents/InspectorDebuggerAgent.h:
+        * inspector/agents/InspectorHeapAgent.h:
+        * inspector/agents/InspectorRuntimeAgent.h:
+        * inspector/agents/InspectorScriptProfilerAgent.h:
+        * runtime/RegExp.h:
+
 2018-02-05  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, rolling out r228012.

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/disassembler/ARM64Disassembler.cpp (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/disassembler/ARM64Disassembler.cpp	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/disassembler/ARM64Disassembler.cpp	2018-02-19 08:51:26 UTC (rev 228616)
@@ -28,7 +28,7 @@
 
 #if USE(ARM64_DISASSEMBLER)
 
-#include "ARM64/A64DOpcode.h"
+#include "A64DOpcode.h"
 #include "MacroAssemblerCodeRef.h"
 
 namespace JSC {

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/disassembler/ARMv7Disassembler.cpp (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/disassembler/ARMv7Disassembler.cpp	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/disassembler/ARMv7Disassembler.cpp	2018-02-19 08:51:26 UTC (rev 228616)
@@ -28,7 +28,7 @@
 
 #if USE(ARMV7_DISASSEMBLER)
 
-#include "ARMv7/ARMv7DOpcode.h"
+#include "ARMv7DOpcode.h"
 #include "MacroAssemblerCodeRef.h"
 
 namespace JSC {

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/heap/LockDuringMarking.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/heap/LockDuringMarking.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/heap/LockDuringMarking.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <heap/Heap.h>
+#include "Heap.h"
 #include <wtf/Locker.h>
 
 namespace JSC {

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/InjectedScriptBase.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/InjectedScriptBase.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/InjectedScriptBase.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -33,7 +33,7 @@
 
 #include "InspectorEnvironment.h"
 #include "InspectorProtocolObjects.h"
-#include "bindings/ScriptObject.h"
+#include "ScriptObject.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/InjectedScriptHost.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/InjectedScriptHost.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/InjectedScriptHost.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "JSCJSValueInlines.h"
-#include "inspector/PerGlobalObjectWrapperWorld.h"
+#include "PerGlobalObjectWrapperWorld.h"
 #include <wtf/RefCounted.h>
 
 namespace Inspector {

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/_javascript_CallFrame.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/_javascript_CallFrame.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/_javascript_CallFrame.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -25,8 +25,8 @@
 
 #pragma once
 
+#include "DebuggerCallFrame.h"
 #include "JSCJSValueInlines.h"
-#include "debugger/DebuggerCallFrame.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/TextPosition.h>

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptArguments.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptArguments.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptArguments.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include <heap/Strong.h>
+#include "Strong.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptDebugListener.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptDebugListener.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptDebugListener.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -29,8 +29,8 @@
 
 #pragma once
 
-#include "debugger/Debugger.h"
-#include "parser/SourceProvider.h"
+#include "Debugger.h"
+#include "SourceProvider.h"
 #include <wtf/text/WTFString.h>
 
 namespace Inspector {

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptDebugServer.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptDebugServer.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/ScriptDebugServer.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -29,9 +29,9 @@
 
 #pragma once
 
+#include "Debugger.h"
 #include "ScriptBreakpoint.h"
 #include "ScriptDebugListener.h"
-#include "debugger/Debugger.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/text/WTFString.h>

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorAgent.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorAgent.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorAgent.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -29,9 +29,9 @@
 
 #pragma once
 
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
 

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorConsoleAgent.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -25,9 +25,9 @@
 
 #pragma once
 
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -29,13 +29,13 @@
 
 #pragma once
 
+#include "Debugger.h"
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "bindings/ScriptValue.h"
-#include "debugger/Debugger.h"
-#include "inspector/InspectorAgentBase.h"
-#include "inspector/ScriptBreakpoint.h"
-#include "inspector/ScriptDebugListener.h"
+#include "ScriptBreakpoint.h"
+#include "ScriptDebugListener.h"
+#include "ScriptValue.h"
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -25,10 +25,10 @@
 
 #pragma once
 
+#include "HeapObserver.h"
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "heap/HeapObserver.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
 

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -31,8 +31,8 @@
 
 #pragma once
 
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
 

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -26,9 +26,9 @@
 #pragma once
 
 #include "Debugger.h"
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Noncopyable.h>
 
 namespace JSC {

Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/runtime/RegExp.h (228615 => 228616)


--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/runtime/RegExp.h	2018-02-19 08:51:14 UTC (rev 228615)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/runtime/RegExp.h	2018-02-19 08:51:26 UTC (rev 228616)
@@ -25,12 +25,12 @@
 #include "MatchResult.h"
 #include "RegExpKey.h"
 #include "Structure.h"
-#include "yarr/Yarr.h"
+#include "Yarr.h"
 #include <wtf/Forward.h>
 #include <wtf/text/WTFString.h>
 
 #if ENABLE(YARR_JIT)
-#include "yarr/YarrJIT.h"
+#include "YarrJIT.h"
 #endif
 
 namespace JSC {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to