Skip to content

Commit ab1a4f3

Browse files
committed
Some includes in JSC seem to use an incorrect style
https://bugs.webkit.org/show_bug.cgi?id=123057 Reviewed by Geoffrey Garen. Changed pseudo-system includes to user ones. * API/JSContextRef.cpp: * API/JSStringRefCF.cpp: * API/JSValueRef.cpp: * API/OpaqueJSString.cpp: * jit/JIT.h: * parser/SyntaxChecker.h: * runtime/WeakGCMap.h: Canonical link: https://commits.webkit.org/141149@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157688 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent e202bbb commit ab1a4f3

8 files changed

Lines changed: 33 additions & 17 deletions

File tree

Source/JavaScriptCore/API/JSContextRef.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include "JSContextRefPrivate.h"
2929

3030
#include "APICast.h"
31+
#include "CallFrame.h"
3132
#include "CallFrameInlines.h"
3233
#include "InitializeThreading.h"
33-
#include <interpreter/CallFrame.h>
3434
#include "JSCallbackObject.h"
3535
#include "JSClassRef.h"
3636
#include "JSGlobalObject.h"

Source/JavaScriptCore/API/JSStringRefCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
#include "APICast.h"
3030
#include "InitializeThreading.h"
31+
#include "JSCJSValue.h"
3132
#include "JSStringRef.h"
3233
#include "OpaqueJSString.h"
33-
#include <runtime/JSCJSValue.h>
3434
#include <wtf/StdLibExtras.h>
3535

3636
JSStringRef JSStringCreateWithCFString(CFStringRef string)

Source/JavaScriptCore/API/JSValueRef.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,14 @@
2929
#include "APICast.h"
3030
#include "APIShims.h"
3131
#include "JSAPIWrapperObject.h"
32+
#include "JSCJSValue.h"
3233
#include "JSCallbackObject.h"
33-
34-
#include <runtime/JSCJSValue.h>
35-
#include <runtime/JSGlobalObject.h>
36-
#include <runtime/JSONObject.h>
37-
#include <runtime/JSString.h>
38-
#include <runtime/LiteralParser.h>
39-
#include <runtime/Operations.h>
40-
#include <runtime/Protect.h>
34+
#include "JSGlobalObject.h"
35+
#include "JSONObject.h"
36+
#include "JSString.h"
37+
#include "LiteralParser.h"
38+
#include "Operations.h"
39+
#include "Protect.h"
4140

4241
#include <wtf/Assertions.h>
4342
#include <wtf/text/StringHash.h>

Source/JavaScriptCore/API/OpaqueJSString.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include "config.h"
2727
#include "OpaqueJSString.h"
2828

29-
#include <interpreter/CallFrame.h>
30-
#include <runtime/JSGlobalObject.h>
31-
#include <runtime/Identifier.h>
29+
#include "CallFrame.h"
30+
#include "Identifier.h"
31+
#include "JSGlobalObject.h"
3232

3333
using namespace JSC;
3434

Source/JavaScriptCore/ChangeLog

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2013-10-19 Alexey Proskuryakov <ap@apple.com>
2+
3+
Some includes in JSC seem to use an incorrect style
4+
https://bugs.webkit.org/show_bug.cgi?id=123057
5+
6+
Reviewed by Geoffrey Garen.
7+
8+
Changed pseudo-system includes to user ones.
9+
10+
* API/JSContextRef.cpp:
11+
* API/JSStringRefCF.cpp:
12+
* API/JSValueRef.cpp:
13+
* API/OpaqueJSString.cpp:
14+
* jit/JIT.h:
15+
* parser/SyntaxChecker.h:
16+
* runtime/WeakGCMap.h:
17+
118
2013-10-19 Filip Pizlo <fpizlo@apple.com>
219

320
Baseline JIT and DFG IC code generation should be unified and rationalized

Source/JavaScriptCore/jit/JIT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
#include "LegacyProfiler.h"
4848
#include "Opcode.h"
4949
#include "ResultType.h"
50+
#include "SamplingTool.h"
5051
#include "UnusedPointer.h"
51-
#include <bytecode/SamplingTool.h>
5252

5353
namespace JSC {
5454

Source/JavaScriptCore/parser/SyntaxChecker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define SyntaxChecker_h
2828

2929
#include "Lexer.h"
30-
#include <yarr/YarrSyntaxChecker.h>
30+
#include "YarrSyntaxChecker.h"
3131

3232
namespace JSC {
3333

Source/JavaScriptCore/runtime/WeakGCMap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#ifndef WeakGCMap_h
2727
#define WeakGCMap_h
2828

29-
#include <heap/Weak.h>
30-
#include <heap/WeakInlines.h>
29+
#include "Weak.h"
30+
#include "WeakInlines.h"
3131
#include <wtf/HashMap.h>
3232

3333
namespace JSC {

0 commit comments

Comments
 (0)