Skip to content

Commit a9d3d11

Browse files
rr-codesrr-codes
committed
[Swift in WebKit] Work towards modularizing JSC private headers (Part 1)
https://bugs.webkit.org/show_bug.cgi?id=296551 rdar://156880843 Reviewed by Keith Miller. This is step 1 towards creating a private module for JavaScriptCore, which in itself is another step towards facilitating full Swift-Cxx interop in WebKit. Currently, the WebKit-related modules that exist are: * WebKit * WebKit_Private * WebKit_Internal * bmalloc * wtf * JavaScriptCore This works towards the introduction of JavaScriptCore_Private; since modules have stricter requirements than textual includes, headers that belong to a module must be imported using angle brackets instead of quotation marks. This style of including has precedent via the previously mentioned modules, and so this also makes things more consistent. To address this, all of the imports of private headers are changed to use angle brackets instead of quotation marks. The only other change in this set of changes is to re-sort the imports, along with these minor related changes: * JavaScriptCore's CMakeLists.txt and WebKitMacros.cmake is updated to accomodate Linux and Windows builds to work properly with angled bracket imports. * A few more private headers are made project-level when possible Canonical link: https://commits.webkit.org/298358@main
1 parent 1880bd0 commit a9d3d11

717 files changed

Lines changed: 2301 additions & 2164 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/API/APICast.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
3131

32-
#include "Integrity.h"
33-
#include "JSAPIValueWrapper.h"
34-
#include "JSCJSValue.h"
35-
#include "JSCJSValueInlines.h"
36-
#include "HeapCellInlines.h"
32+
#include <JavaScriptCore/HeapCellInlines.h>
33+
#include <JavaScriptCore/Integrity.h>
34+
#include <JavaScriptCore/JSAPIValueWrapper.h>
35+
#include <JavaScriptCore/JSCJSValue.h>
36+
#include <JavaScriptCore/JSCJSValueInlines.h>
3737

3838
WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
3939

‎Source/JavaScriptCore/API/JSAPIValueWrapper.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
#pragma once
2424

25-
#include "CallFrame.h"
26-
#include "JSCJSValue.h"
27-
#include "JSCast.h"
28-
#include "Structure.h"
25+
#include <JavaScriptCore/CallFrame.h>
26+
#include <JavaScriptCore/JSCJSValue.h>
27+
#include <JavaScriptCore/JSCast.h>
28+
#include <JavaScriptCore/Structure.h>
2929

3030
namespace JSC {
3131

‎Source/JavaScriptCore/API/JSClassRef.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
#ifndef JSClassRef_h
2727
#define JSClassRef_h
2828

29-
#include "OpaqueJSString.h"
30-
#include "Protect.h"
31-
#include "Weak.h"
3229
#include <JavaScriptCore/JSObjectRef.h>
30+
#include <JavaScriptCore/OpaqueJSString.h>
31+
#include <JavaScriptCore/Protect.h>
32+
#include <JavaScriptCore/Weak.h>
3333
#include <wtf/HashMap.h>
3434
#include <wtf/text/WTFString.h>
3535

‎Source/JavaScriptCore/API/JSContextRefInspectorSupport.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#error Requires C++ Support.
3131
#endif
3232

33-
#include "JSContextRefPrivate.h"
33+
#include <JavaScriptCore/JSContextRefPrivate.h>
3434

3535
namespace Inspector {
3636
class AugmentableInspectorController;

‎Source/JavaScriptCore/API/JSVirtualMachinePrivate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#import "JSExportMacros.h"
26+
#import <JavaScriptCore/JSExportMacros.h>
2727
#import <JavaScriptCore/JavaScript.h>
2828

2929
#if JSC_OBJC_API_ENABLED

‎Source/JavaScriptCore/API/JSWeakObjectMapRefInternal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#ifndef JSWeakObjectMapRefInternal_h
2727
#define JSWeakObjectMapRefInternal_h
2828

29-
#include "WeakGCMap.h"
29+
#include <JavaScriptCore/WeakGCMap.h>
3030
#include <wtf/RefCounted.h>
3131

3232
namespace JSC {

‎Source/JavaScriptCore/API/JSWeakValue.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
#pragma once
2828

29-
#include "JSCJSValue.h"
30-
#include "Weak.h"
29+
#include <JavaScriptCore/JSCJSValue.h>
30+
#include <JavaScriptCore/Weak.h>
3131

3232
namespace JSC {
3333

0 commit comments

Comments
 (0)