JavaScriptCore 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/JavaScriptCallFrame.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:

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

diff --git a/Source/JavaScriptCore/API/JSCallbackConstructor.h b/Source/JavaScriptCore/API/JSCallbackConstructor.h
index 95b3501..9ccc5dd 100644 (file)
--- a/Source/JavaScriptCore/API/JSCallbackConstructor.h
+++ b/Source/JavaScriptCore/API/JSCallbackConstructor.h
@@ -26,8 +26,8 @@
 #ifndef JSCallbackConstructor_h
 #define JSCallbackConstructor_h
 
+#include "JSDestructibleObject.h"
 #include "JSObjectRef.h"
-#include "runtime/JSDestructibleObject.h"
 
 namespace JSC {
 

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index f19b401..f155c4f 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -25,8 +25,9 @@ set(JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/bytecompiler"
     "${JAVASCRIPTCORE_DIR}/dfg"
     "${JAVASCRIPTCORE_DIR}/disassembler"
-    "${JAVASCRIPTCORE_DIR}/disassembler/udis86"
     "${JAVASCRIPTCORE_DIR}/disassembler/ARM64"
+    "${JAVASCRIPTCORE_DIR}/disassembler/ARMv7"
+    "${JAVASCRIPTCORE_DIR}/disassembler/udis86"
     "${JAVASCRIPTCORE_DIR}/domjit"
     "${JAVASCRIPTCORE_DIR}/ftl"
     "${JAVASCRIPTCORE_DIR}/heap"

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 711eba3..4944595 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,29 @@
+2018-02-05  Don Olmstead  <don.olmstead@sony.com>
+
+        JavaScriptCore 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/JavaScriptCallFrame.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-queue@webkit.org>
 
         Unreviewed, rolling out r228012.

diff --git a/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp b/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp
index ac52213..5251c9a 100644 (file)
--- a/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp
+++ b/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp
@@ -28,7 +28,7 @@
 
 #if USE(ARM64_DISASSEMBLER)
 
-#include "ARM64/A64DOpcode.h"
+#include "A64DOpcode.h"
 #include "MacroAssemblerCodeRef.h"
 
 namespace JSC {

diff --git a/Source/JavaScriptCore/disassembler/ARMv7Disassembler.cpp b/Source/JavaScriptCore/disassembler/ARMv7Disassembler.cpp
index bfb4895..d218f7b 100644 (file)
--- a/Source/JavaScriptCore/disassembler/ARMv7Disassembler.cpp
+++ b/Source/JavaScriptCore/disassembler/ARMv7Disassembler.cpp
@@ -28,7 +28,7 @@
 
 #if USE(ARMV7_DISASSEMBLER)
 
-#include "ARMv7/ARMv7DOpcode.h"
+#include "ARMv7DOpcode.h"
 #include "MacroAssemblerCodeRef.h"
 
 namespace JSC {

diff --git a/Source/JavaScriptCore/heap/LockDuringMarking.h b/Source/JavaScriptCore/heap/LockDuringMarking.h
index 71da8f0..a3eca5e 100644 (file)
--- a/Source/JavaScriptCore/heap/LockDuringMarking.h
+++ b/Source/JavaScriptCore/heap/LockDuringMarking.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <heap/Heap.h>
+#include "Heap.h"
 #include <wtf/Locker.h>
 
 namespace JSC {

diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.h b/Source/JavaScriptCore/inspector/InjectedScriptBase.h
index df1fbf2..3e7e7a3 100644 (file)
--- a/Source/JavaScriptCore/inspector/InjectedScriptBase.h
+++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.h
@@ -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>
 

diff --git a/Source/JavaScriptCore/inspector/InjectedScriptHost.h b/Source/JavaScriptCore/inspector/InjectedScriptHost.h
index 3256c25..2784036 100644 (file)
--- a/Source/JavaScriptCore/inspector/InjectedScriptHost.h
+++ b/Source/JavaScriptCore/inspector/InjectedScriptHost.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "JSCJSValueInlines.h"
-#include "inspector/PerGlobalObjectWrapperWorld.h"
+#include "PerGlobalObjectWrapperWorld.h"
 #include <wtf/RefCounted.h>
 
 namespace Inspector {

diff --git a/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h b/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h
index dfb28c6..1c41a07 100644 (file)
--- a/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h
+++ b/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h
@@ -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>

diff --git a/Source/JavaScriptCore/inspector/ScriptArguments.h b/Source/JavaScriptCore/inspector/ScriptArguments.h
index 50abd1b..15f91bb 100644 (file)
--- a/Source/JavaScriptCore/inspector/ScriptArguments.h
+++ b/Source/JavaScriptCore/inspector/ScriptArguments.h
@@ -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>

diff --git a/Source/JavaScriptCore/inspector/ScriptDebugListener.h b/Source/JavaScriptCore/inspector/ScriptDebugListener.h
index 5b0bb9f..7702a89 100644 (file)
--- a/Source/JavaScriptCore/inspector/ScriptDebugListener.h
+++ b/Source/JavaScriptCore/inspector/ScriptDebugListener.h
@@ -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 {

diff --git a/Source/JavaScriptCore/inspector/ScriptDebugServer.h b/Source/JavaScriptCore/inspector/ScriptDebugServer.h
index 33593da..6484bd6 100644 (file)
--- a/Source/JavaScriptCore/inspector/ScriptDebugServer.h
+++ b/Source/JavaScriptCore/inspector/ScriptDebugServer.h
@@ -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>

diff --git a/Source/JavaScriptCore/inspector/agents/InspectorAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
index 92c81c5..d2a6d5b 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
@@ -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>
 

diff --git a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
index 1881960..a1cf6a2 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
@@ -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>

diff --git a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
index bf0e9c6..bd7ca3b 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
@@ -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>

diff --git a/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h
index 0be46b0..dae3571 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h
@@ -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>
 

diff --git a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
index 4bd8ea4..2d5d291 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
@@ -31,8 +31,8 @@
 
 #pragma once
 
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
 

diff --git a/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h
index 89fce32..c9b8760 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h
@@ -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 {

diff --git a/Source/JavaScriptCore/runtime/RegExp.h b/Source/JavaScriptCore/runtime/RegExp.h
index 2ed9f9d..3191f49 100644 (file)
--- a/Source/JavaScriptCore/runtime/RegExp.h
+++ b/Source/JavaScriptCore/runtime/RegExp.h
@@ -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 {