Changeset 228616 in webkit

Timestamp:

Feb 19, 2018 12:51:26 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228105 - 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:

Location:

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore

Files:

• API/JSCallbackConstructor.h (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• disassembler/ARM64Disassembler.cpp (modified) (1 diff)
• disassembler/ARMv7Disassembler.cpp (modified) (1 diff)
• heap/LockDuringMarking.h (modified) (1 diff)
• inspector/InjectedScriptBase.h (modified) (1 diff)
• inspector/InjectedScriptHost.h (modified) (1 diff)
• inspector/JavaScriptCallFrame.h (modified) (1 diff)
• inspector/ScriptArguments.h (modified) (1 diff)
• inspector/ScriptDebugListener.h (modified) (1 diff)
• inspector/ScriptDebugServer.h (modified) (1 diff)
• inspector/agents/InspectorAgent.h (modified) (1 diff)
• inspector/agents/InspectorConsoleAgent.h (modified) (1 diff)
• inspector/agents/InspectorDebuggerAgent.h (modified) (1 diff)
• inspector/agents/InspectorHeapAgent.h (modified) (1 diff)
• inspector/agents/InspectorRuntimeAgent.h (modified) (1 diff)
• inspector/agents/InspectorScriptProfilerAgent.h (modified) (1 diff)
• runtime/RegExp.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/API/JSCallbackConstructor.h

@@ -27 +27 @@
 #define JSCallbackConstructor_h
 
+#include "JSDestructibleObject.h"
 #include "JSObjectRef.h"
-#include "runtime/JSDestructibleObject.h"
 
 namespace JSC {

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/CMakeLists.txt

@@ -26 +26 @@
     "${JAVASCRIPTCORE_DIR}/dfg"
     "${JAVASCRIPTCORE_DIR}/disassembler"
+    "${JAVASCRIPTCORE_DIR}/disassembler/ARM64"
+    "${JAVASCRIPTCORE_DIR}/disassembler/ARMv7"
     "${JAVASCRIPTCORE_DIR}/disassembler/udis86"
-    "${JAVASCRIPTCORE_DIR}/disassembler/ARM64"
     "${JAVASCRIPTCORE_DIR}/domjit"
     "${JAVASCRIPTCORE_DIR}/ftl"

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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>
 

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp

@@ -29 +29 @@
 #if USE(ARM64_DISASSEMBLER)
 
-#include "ARM64/A64DOpcode.h"
+#include "A64DOpcode.h"
 #include "MacroAssemblerCodeRef.h"
 

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/disassembler/ARMv7Disassembler.cpp

@@ -29 +29 @@
 #if USE(ARMV7_DISASSEMBLER)
 
-#include "ARMv7/ARMv7DOpcode.h"
+#include "ARMv7DOpcode.h"
 #include "MacroAssemblerCodeRef.h"
 

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/heap/LockDuringMarking.h

@@ -26 +26 @@
 #pragma once
 
-#include <heap/Heap.h>
+#include "Heap.h"
 #include <wtf/Locker.h>
 

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/InjectedScriptBase.h

@@ -34 +34 @@
 #include "InspectorEnvironment.h"
 #include "InspectorProtocolObjects.h"
-#include "bindings/ScriptObject.h"
+#include "ScriptObject.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/InjectedScriptHost.h

@@ -27 +27 @@
 
 #include "JSCJSValueInlines.h"
-#include "inspector/PerGlobalObjectWrapperWorld.h"
+#include "PerGlobalObjectWrapperWorld.h"
 #include <wtf/RefCounted.h>
 

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h

@@ -26 +26 @@
 #pragma once
 
+#include "DebuggerCallFrame.h"
 #include "JSCJSValueInlines.h"
-#include "debugger/DebuggerCallFrame.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/ScriptArguments.h

@@ -32 +32 @@
 #pragma once
 
-#include <heap/Strong.h>
+#include "Strong.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/ScriptDebugListener.h

@@ -30 +30 @@
 #pragma once
 
-#include "debugger/Debugger.h"
-#include "parser/SourceProvider.h"
+#include "Debugger.h"
+#include "SourceProvider.h"
 #include <wtf/text/WTFString.h>
 

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/ScriptDebugServer.h

@@ -30 +30 @@
 #pragma once
 
+#include "Debugger.h"
 #include "ScriptBreakpoint.h"
 #include "ScriptDebugListener.h"
-#include "debugger/Debugger.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/agents/InspectorAgent.h

@@ -30 +30 @@
 #pragma once
 
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h

@@ -26 +26 @@
 #pragma once
 
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h

@@ -30 +30 @@
 #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>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h

@@ -26 +26 @@
 #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>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h

@@ -32 +32 @@
 #pragma once
 
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h

@@ -27 +27 @@
 
 #include "Debugger.h"
+#include "InspectorAgentBase.h"
 #include "InspectorBackendDispatchers.h"
 #include "InspectorFrontendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
 #include <wtf/Noncopyable.h>
 

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/runtime/RegExp.h

@@ -26 +26 @@
 #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