Changeset 173402 in webkit


Ignore:
Timestamp:
Sep 8, 2014, 3:58:25 PM (11 years ago)
Author:
mark.lam@apple.com
Message:

Move CallFrame and Register inlines functions out of JSScope.h.
<​https://webkit.org/b/136579>

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

This include fixing up some files to #include JSCInlines.h to pick up
these inline functions. I also added JSCellInlines.h to JSCInlines.h
since it is included from many of the affected .cpp files.

  • API/ObjCCallbackFunction.mm:
  • JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
  • JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • bindings/ScriptValue.cpp:
  • inspector/InjectedScriptHost.cpp:
  • inspector/InjectedScriptManager.cpp:
  • inspector/JSGlobalObjectInspectorController.cpp:
  • inspector/JSJavaScriptCallFrame.cpp:
  • inspector/ScriptDebugServer.cpp:
  • interpreter/CallFrameInlines.h:

(JSC::CallFrame::vm):
(JSC::CallFrame::lexicalGlobalObject):
(JSC::CallFrame::globalThisValue):

  • interpreter/RegisterInlines.h: Added.

(JSC::Register::operator=):
(JSC::Register::scope):

  • runtime/ArgumentsIteratorConstructor.cpp:
  • runtime/JSArrayIterator.cpp:
  • runtime/JSCInlines.h:
  • runtime/JSCJSValue.cpp:
  • runtime/JSMapIterator.cpp:
  • runtime/JSPromiseConstructor.cpp:
  • runtime/JSPromiseDeferred.cpp:
  • runtime/JSPromiseFunctions.cpp:
  • runtime/JSPromisePrototype.cpp:
  • runtime/JSPromiseReaction.cpp:
  • runtime/JSScope.h:

(JSC::Register::operator=): Deleted.
(JSC::Register::scope): Deleted.
(JSC::ExecState::vm): Deleted.
(JSC::ExecState::lexicalGlobalObject): Deleted.
(JSC::ExecState::globalThisValue): Deleted.

  • runtime/JSSetIterator.cpp:
  • runtime/MapConstructor.cpp:
  • runtime/MapData.cpp:
  • runtime/MapIteratorPrototype.cpp:
  • runtime/MapPrototype.cpp:
  • runtime/SetConstructor.cpp:
  • runtime/SetIteratorPrototype.cpp:
  • runtime/SetPrototype.cpp:
  • runtime/WeakMapConstructor.cpp:
  • runtime/WeakMapPrototype.cpp:

Source/WebCore:

No new tests.

Added #include of the appropriate *Inlines.h files. Unlike in
JavaScriptCore, I #include'd the specific needed *Inlines.h instead of
JSCInlines.h. This is done to minimize the need for WebCore to be
rebuilt when JSC changes are introduced.

  • ForwardingHeaders/interpreter/RegisterInlines.h: Added.
  • bindings/js/JSAudioBufferSourceNodeCustom.cpp:
  • bindings/js/JSAudioTrackCustom.cpp:
  • bindings/js/JSBiquadFilterNodeCustom.cpp:
  • bindings/js/JSCSSStyleDeclarationCustom.cpp:
  • bindings/js/JSCanvasRenderingContext2DCustom.cpp:
  • bindings/js/JSCommandLineAPIHostCustom.cpp:
  • bindings/js/JSCustomSQLStatementErrorCallback.cpp:
  • bindings/js/JSDOMBinding.h:
  • bindings/js/JSDOMStringListCustom.cpp:
  • bindings/js/JSDOMWindowBase.cpp:
  • bindings/js/JSDOMWindowShell.cpp:
  • bindings/js/JSDocumentCustom.cpp:
  • bindings/js/JSHTMLDocumentCustom.cpp:
  • bindings/js/JSOscillatorNodeCustom.cpp:
  • bindings/js/JSPannerNodeCustom.cpp:
  • bindings/js/JSPopStateEventCustom.cpp:
  • dom/TreeWalker.cpp:
  • html/HTMLPlugInImageElement.cpp:
  • inspector/CommandLineAPIModule.cpp:
  • inspector/InspectorController.cpp:
Location:
trunk/Source
Files:
2 added
54 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm

    r171824 r173402  
    3333#import "DelayedReleaseScope.h"
    3434#import "Error.h"
    35 #import "JSCJSValueInlines.h"
     35#import "JSCInlines.h"
    3636#import "JSCell.h"
    37 #import "JSCellInlines.h"
    3837#import "JSContextInternal.h"
    3938#import "JSWrapperMap.h"

  • trunk/Source/JavaScriptCore/ChangeLog

    r173397 r173402  
     12014-09-08  Mark Lam  <mark.lam@apple.com>
     2
     3        Move CallFrame and Register inlines functions out of JSScope.h.
     4        <https://webkit.org/b/136579>
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        This include fixing up some files to #include JSCInlines.h to pick up
     9        these inline functions.  I also added JSCellInlines.h to JSCInlines.h
     10        since it is included from many of the affected .cpp files.
     11
     12        * API/ObjCCallbackFunction.mm:
     13        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
     14        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
     15        * JavaScriptCore.xcodeproj/project.pbxproj:
     16        * bindings/ScriptValue.cpp:
     17        * inspector/InjectedScriptHost.cpp:
     18        * inspector/InjectedScriptManager.cpp:
     19        * inspector/JSGlobalObjectInspectorController.cpp:
     20        * inspector/JSJavaScriptCallFrame.cpp:
     21        * inspector/ScriptDebugServer.cpp:
     22        * interpreter/CallFrameInlines.h:
     23        (JSC::CallFrame::vm):
     24        (JSC::CallFrame::lexicalGlobalObject):
     25        (JSC::CallFrame::globalThisValue):
     26        * interpreter/RegisterInlines.h: Added.
     27        (JSC::Register::operator=):
     28        (JSC::Register::scope):
     29        * runtime/ArgumentsIteratorConstructor.cpp:
     30        * runtime/JSArrayIterator.cpp:
     31        * runtime/JSCInlines.h:
     32        * runtime/JSCJSValue.cpp:
     33        * runtime/JSMapIterator.cpp:
     34        * runtime/JSPromiseConstructor.cpp:
     35        * runtime/JSPromiseDeferred.cpp:
     36        * runtime/JSPromiseFunctions.cpp:
     37        * runtime/JSPromisePrototype.cpp:
     38        * runtime/JSPromiseReaction.cpp:
     39        * runtime/JSScope.h:
     40        (JSC::Register::operator=): Deleted.
     41        (JSC::Register::scope): Deleted.
     42        (JSC::ExecState::vm): Deleted.
     43        (JSC::ExecState::lexicalGlobalObject): Deleted.
     44        (JSC::ExecState::globalThisValue): Deleted.
     45        * runtime/JSSetIterator.cpp:
     46        * runtime/MapConstructor.cpp:
     47        * runtime/MapData.cpp:
     48        * runtime/MapIteratorPrototype.cpp:
     49        * runtime/MapPrototype.cpp:
     50        * runtime/SetConstructor.cpp:
     51        * runtime/SetIteratorPrototype.cpp:
     52        * runtime/SetPrototype.cpp:
     53        * runtime/WeakMapConstructor.cpp:
     54        * runtime/WeakMapPrototype.cpp:
     55
    1562014-09-08  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
    257

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

    r173333 r173402  
    12931293    <ClInclude Include="..\interpreter\ProtoCallFrame.h" />
    12941294    <ClInclude Include="..\interpreter\Register.h" />
     1295    <ClInclude Include="..\interpreter\RegisterInlines.h" />
    12951296    <ClInclude Include="..\interpreter\StackVisitor.h" />
    12961297    <ClInclude Include="..\interpreter\VMInspector.h" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

    r173333 r173402  
    22292229      <Filter>interpreter</Filter>
    22302230    </ClInclude>
     2231    <ClInclude Include="..\interpreter\RegisterInlines.h">
     2232      <Filter>interpreter</Filter>
     2233    </ClInclude>
    22312234    <ClInclude Include="..\interpreter\StackVisitor.h">
    22322235      <Filter>interpreter</Filter>

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r173364 r173402  
    18181818                E49DC16C12EF294E00184A1F /* SourceProviderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E49DC15112EF272200184A1F /* SourceProviderCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18191819                E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */ = {isa = PBXBuildFile; fileRef = E49DC14912EF261A00184A1F /* SourceProviderCacheItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1820                FE0403F519B990220034161B /* RegisterInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = FE0403F419B990220034161B /* RegisterInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18201821                FE20CE9D15F04A9500DF3430 /* LLIntCLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */; };
    18211822                FE20CE9E15F04A9500DF3430 /* LLIntCLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = FE20CE9C15F04A9500DF3430 /* LLIntCLoop.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    35163517                F692A87E0255597D01FF60F7 /* RegExp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegExp.h; sourceTree = "<group>"; tabWidth = 8; };
    35173518                F692A8870255597D01FF60F7 /* JSCJSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCJSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
     3519                FE0403F419B990220034161B /* RegisterInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterInlines.h; path = interpreter/RegisterInlines.h; sourceTree = "<group>"; };
    35183520                FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLIntCLoop.cpp; path = llint/LLIntCLoop.cpp; sourceTree = "<group>"; };
    35193521                FE20CE9C15F04A9500DF3430 /* LLIntCLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLIntCLoop.h; path = llint/LLIntCLoop.h; sourceTree = "<group>"; };
    … …  
    36243626                        isa = PBXGroup;
    36253627                        children = (
     3628                                FE0403F419B990220034161B /* RegisterInlines.h */,
    36263629                                6529FB3018B2D63900C61102 /* generate-bytecode-files */,
    36273630                                8604F4F2143A6C4400B295F5 /* ChangeLog */,
    … …  
    57625765                                147B83AC0E6DB8C9004775A4 /* BatchedTransitionOptimizer.h in Headers */,
    57635766                                2A111246192FCE79005EE18D /* CustomGetterSetter.h in Headers */,
     5767                                FE0403F519B990220034161B /* RegisterInlines.h in Headers */,
    57645768                                A584032018BFFBE1005A0811 /* InspectorAgent.h in Headers */,
    57655769                                2AABCDE718EF294200002096 /* GCLogging.h in Headers */,

  • trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp

    r169834 r173402  
    3333#include "APICast.h"
    3434#include "InspectorValues.h"
     35#include "JSCInlines.h"
    3536#include "JSLock.h"
    36 #include "StructureInlines.h"
    3737
    3838using namespace JSC;

  • trunk/Source/JavaScriptCore/inspector/InjectedScriptHost.cpp

    r163959 r173402  
    2929#if ENABLE(INSPECTOR)
    3030
     31#include "JSCInlines.h"
    3132#include "JSInjectedScriptHost.h"
    3233

  • trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp

    r172888 r173402  
    3838#include "InjectedScriptSource.h"
    3939#include "InspectorValues.h"
     40#include "JSCInlines.h"
    4041#include "JSInjectedScriptHost.h"
    4142#include "JSLock.h"

  • trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp

    r173251 r173402  
    3636#include "InspectorBackendDispatcher.h"
    3737#include "InspectorFrontendChannel.h"
     38#include "JSCInlines.h"
    3839#include "JSGlobalObject.h"
    3940#include "JSGlobalObjectConsoleAgent.h"

  • trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp

    r173100 r173402  
    3131#include "DebuggerScope.h"
    3232#include "Error.h"
     33#include "JSCInlines.h"
    3334#include "JSCJSValue.h"
    34 #include "JSCellInlines.h"
    3535#include "JSJavaScriptCallFramePrototype.h"
    36 #include "StructureInlines.h"
    3736
    3837using namespace JSC;

  • trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp

    r173264 r173402  
    3636#include "DebuggerCallFrame.h"
    3737#include "DebuggerScope.h"
     38#include "JSCInlines.h"
    3839#include "JSJavaScriptCallFrame.h"
    3940#include "JSLock.h"

  • trunk/Source/JavaScriptCore/interpreter/CallFrameInlines.h

    r163223 r173402  
    2929#include "CallFrame.h"
    3030#include "CodeBlock.h"
     31#include "JSScope.h"
    3132
    3233namespace JSC  {
    … …  
    148149}
    149150
     151inline VM& CallFrame::vm() const
     152{
     153    ASSERT(scope()->vm());
     154    return *scope()->vm();
     155}
     156
     157inline JSGlobalObject* CallFrame::lexicalGlobalObject() const
     158{
     159    return scope()->globalObject();
     160}
     161
     162inline JSObject* CallFrame::globalThisValue() const
     163{
     164    return scope()->globalThis();
     165}
     166
    150167} // namespace JSC
    151168

  • trunk/Source/JavaScriptCore/runtime/ArgumentsIteratorConstructor.cpp

    r171824 r173402  
    2929#include "ArgumentsIteratorPrototype.h"
    3030#include "JSArgumentsIterator.h"
    31 #include "JSCJSValueInlines.h"
    32 #include "JSCellInlines.h"
     31#include "JSCInlines.h"
    3332#include "JSGlobalObject.h"
    34 #include "StructureInlines.h"
    3533
    3634namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSArrayIterator.cpp

    r171939 r173402  
    2727#include "JSArrayIterator.h"
    2828
    29 #include "JSCJSValueInlines.h"
    30 #include "JSCellInlines.h"
    31 #include "SlotVisitorInlines.h"
    32 #include "StructureInlines.h"
     29#include "JSCInlines.h"
    3330
    3431namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSCInlines.h

    r166278 r173402  
    4646#include "JSArrayBufferViewInlines.h"
    4747#include "JSCJSValueInlines.h"
     48#include "JSCellInlines.h"
    4849#include "JSFunctionInlines.h"
    4950#include "JSProxy.h"
    5051#include "JSString.h"
    5152#include "Operations.h"
     53#include "RegisterInlines.h"
    5254#include "SlotVisitorInlines.h"
    5355#include "StructureInlines.h"

  • trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp

    r172129 r173402  
    3030#include "ExceptionHelpers.h"
    3131#include "GetterSetter.h"
    32 #include "JSCJSValueInlines.h"
     32#include "JSCInlines.h"
    3333#include "JSFunction.h"
    3434#include "JSGlobalObject.h"
    3535#include "JSNotAnObject.h"
    3636#include "NumberObject.h"
    37 #include "StructureInlines.h"
    3837#include <wtf/MathExtras.h>
    3938#include <wtf/StringExtras.h>

  • trunk/Source/JavaScriptCore/runtime/JSMapIterator.cpp

    r171939 r173402  
    2727#include "JSMapIterator.h"
    2828
    29 #include "JSCJSValueInlines.h"
    30 #include "JSCellInlines.h"
     29#include "JSCInlines.h"
    3130#include "JSMap.h"
    32 #include "SlotVisitorInlines.h"
    33 #include "StructureInlines.h"
    3431
    3532namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp

    r173120 r173402  
    3030
    3131#include "Error.h"
    32 #include "JSCJSValueInlines.h"
    33 #include "JSCellInlines.h"
     32#include "JSCInlines.h"
    3433#include "JSPromise.h"
    3534#include "JSPromiseDeferred.h"
    … …  
    3837#include "Lookup.h"
    3938#include "NumberObject.h"
    40 #include "StructureInlines.h"
    4139
    4240namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSPromiseDeferred.cpp

    r171939 r173402  
    3030
    3131#include "Error.h"
    32 #include "JSCJSValueInlines.h"
    33 #include "JSCellInlines.h"
     32#include "JSCInlines.h"
    3433#include "JSPromise.h"
    3534#include "JSPromiseConstructor.h"
    3635#include "JSPromiseFunctions.h"
    37 #include "SlotVisitorInlines.h"
    38 #include "StructureInlines.h"
    3936
    4037namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSPromiseFunctions.cpp

    r169703 r173402  
    3030
    3131#include "Error.h"
    32 #include "JSCJSValueInlines.h"
    33 #include "JSCellInlines.h"
     32#include "JSCInlines.h"
    3433#include "JSPromise.h"
    3534#include "JSPromiseConstructor.h"
    3635#include "JSPromiseDeferred.h"
    3736#include "NumberObject.h"
    38 #include "StructureInlines.h"
    3937
    4038namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp

    r171824 r173402  
    3030
    3131#include "Error.h"
    32 #include "JSCJSValueInlines.h"
    33 #include "JSCellInlines.h"
     32#include "JSCInlines.h"
    3433#include "JSGlobalObject.h"
    3534#include "JSPromise.h"
    … …  
    3837#include "JSPromiseReaction.h"
    3938#include "Microtask.h"
    40 #include "StructureInlines.h"
    4139
    4240namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSPromiseReaction.cpp

    r171939 r173402  
    3030
    3131#include "Error.h"
    32 #include "JSCJSValueInlines.h"
    33 #include "JSCellInlines.h"
     32#include "JSCInlines.h"
    3433#include "JSGlobalObject.h"
    3534#include "JSPromiseDeferred.h"
    3635#include "Microtask.h"
    37 #include "SlotVisitorInlines.h"
    3836#include "StrongInlines.h"
    3937

  • trunk/Source/JavaScriptCore/runtime/JSScope.h

    r173100 r173402  
    226226}
    227227
    228 inline Register& Register::operator=(JSScope* scope)
    229 {
    230     *this = JSValue(scope);
    231     return *this;
    232 }
    233 
    234 inline JSScope* Register::scope() const
    235 {
    236     return jsCast<JSScope*>(jsValue());
    237 }
    238 
    239 inline VM& ExecState::vm() const
    240 {
    241     ASSERT(scope()->vm());
    242     return *scope()->vm();
    243 }
    244 
    245 inline JSGlobalObject* ExecState::lexicalGlobalObject() const
    246 {
    247     return scope()->globalObject();
    248 }
    249 
    250 inline JSObject* ExecState::globalThisValue() const
    251 {
    252     return scope()->globalThis();
    253 }
    254 
    255228inline size_t JSScope::offsetOfNext()
    256229{

  • trunk/Source/JavaScriptCore/runtime/JSSetIterator.cpp

    r171939 r173402  
    2727#include "JSSetIterator.h"
    2828
    29 #include "JSCJSValueInlines.h"
    30 #include "JSCellInlines.h"
     29#include "JSCInlines.h"
    3130#include "JSSet.h"
    32 #include "SlotVisitorInlines.h"
    33 #include "StructureInlines.h"
    3431
    3532namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp

    r171824 r173402  
    2828
    2929#include "Error.h"
    30 #include "JSCJSValueInlines.h"
    31 #include "JSCellInlines.h"
     30#include "JSCInlines.h"
    3231#include "JSGlobalObject.h"
    3332#include "JSMap.h"
    3433#include "MapPrototype.h"
    35 #include "StructureInlines.h"
    3634
    3735namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/MapData.cpp

    r171824 r173402  
    3030#include "CopyVisitorInlines.h"
    3131#include "ExceptionHelpers.h"
    32 #include "JSCJSValueInlines.h"
    33 #include "SlotVisitorInlines.h"
     32#include "JSCInlines.h"
    3433
    3534#include <wtf/CryptographicallyRandomNumber.h>

  • trunk/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp

    r172707 r173402  
    2727#include "MapIteratorPrototype.h"
    2828
    29 #include "JSCJSValueInlines.h"
    30 #include "JSCellInlines.h"
     29#include "JSCInlines.h"
    3130#include "JSMapIterator.h"
    32 #include "StructureInlines.h"
    3331
    3432namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/MapPrototype.cpp

    r171824 r173402  
    3131#include "ExceptionHelpers.h"
    3232#include "GetterSetter.h"
    33 #include "JSCJSValueInlines.h"
    34 #include "JSFunctionInlines.h"
     33#include "JSCInlines.h"
    3534#include "JSMap.h"
    3635#include "JSMapIterator.h"
    3736#include "MapData.h"
    38 #include "StructureInlines.h"
    3937
    4038namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp

    r171824 r173402  
    2828
    2929#include "Error.h"
    30 #include "JSCJSValueInlines.h"
    31 #include "JSCellInlines.h"
     30#include "JSCInlines.h"
    3231#include "JSGlobalObject.h"
    3332#include "JSSet.h"
    3433#include "MapData.h"
    3534#include "SetPrototype.h"
    36 #include "StructureInlines.h"
    3735
    3836namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp

    r172707 r173402  
    2727#include "SetIteratorPrototype.h"
    2828
    29 #include "JSCJSValueInlines.h"
    30 #include "JSCellInlines.h"
     29#include "JSCInlines.h"
    3130#include "JSSetIterator.h"
    32 #include "StructureInlines.h"
    3331
    3432namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/SetPrototype.cpp

    r171824 r173402  
    3131#include "ExceptionHelpers.h"
    3232#include "GetterSetter.h"
    33 #include "JSCJSValueInlines.h"
    34 #include "JSFunctionInlines.h"
     33#include "JSCInlines.h"
    3534#include "JSSet.h"
    3635#include "JSSetIterator.h"
    3736#include "MapData.h"
    38 #include "StructureInlines.h"
    3937
    4038namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp

    r171824 r173402  
    2727#include "WeakMapConstructor.h"
    2828
    29 #include "JSCJSValueInlines.h"
    30 #include "JSCellInlines.h"
     29#include "JSCInlines.h"
    3130#include "JSGlobalObject.h"
    3231#include "JSWeakMap.h"
    33 #include "StructureInlines.h"
    3432#include "WeakMapPrototype.h"
    3533

  • trunk/Source/JavaScriptCore/runtime/WeakMapPrototype.cpp

    r171824 r173402  
    2727#include "WeakMapPrototype.h"
    2828
    29 #include "JSCJSValueInlines.h"
     29#include "JSCInlines.h"
    3030#include "JSWeakMap.h"
    31 #include "StructureInlines.h"
    3231#include "WeakMapData.h"
    3332

  • trunk/Source/WebCore/ChangeLog

    r173401 r173402  
     12014-09-05  Mark Lam  <mark.lam@apple.com>
     2
     3        Move CallFrame and Register inlines functions out of JSScope.h.
     4        <https://webkit.org/b/136579>
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        No new tests.
     9
     10        Added #include of the appropriate *Inlines.h files.  Unlike in
     11        JavaScriptCore, I #include'd the specific needed *Inlines.h instead of
     12        JSCInlines.h.  This is done to minimize the need for WebCore to be
     13        rebuilt when JSC changes are introduced.
     14
     15        * ForwardingHeaders/interpreter/RegisterInlines.h: Added.
     16        * bindings/js/JSAudioBufferSourceNodeCustom.cpp:
     17        * bindings/js/JSAudioTrackCustom.cpp:
     18        * bindings/js/JSBiquadFilterNodeCustom.cpp:
     19        * bindings/js/JSCSSStyleDeclarationCustom.cpp:
     20        * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
     21        * bindings/js/JSCommandLineAPIHostCustom.cpp:
     22        * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
     23        * bindings/js/JSDOMBinding.h:
     24        * bindings/js/JSDOMStringListCustom.cpp:
     25        * bindings/js/JSDOMWindowBase.cpp:
     26        * bindings/js/JSDOMWindowShell.cpp:
     27        * bindings/js/JSDocumentCustom.cpp:
     28        * bindings/js/JSHTMLDocumentCustom.cpp:
     29        * bindings/js/JSOscillatorNodeCustom.cpp:
     30        * bindings/js/JSPannerNodeCustom.cpp:
     31        * bindings/js/JSPopStateEventCustom.cpp:
     32        * dom/TreeWalker.cpp:
     33        * html/HTMLPlugInImageElement.cpp:
     34        * inspector/CommandLineAPIModule.cpp:
     35        * inspector/InspectorController.cpp:
     36
    1372014-09-08  Dean Jackson  <dino@apple.com>
    238

  • trunk/Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp

    r170167 r173402  
    3333#include "AudioBufferSourceNode.h"
    3434#include "JSAudioBuffer.h"
     35#include <interpreter/CallFrameInlines.h>
     36#include <interpreter/RegisterInlines.h>
    3537#include <runtime/Error.h>
    3638#include <runtime/JSCJSValueInlines.h>

  • trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp

    r167794 r173402  
    3131
    3232#include "JSTrackCustom.h"
     33#include <interpreter/CallFrameInlines.h>
    3334
    3435using namespace JSC;

  • trunk/Source/WebCore/bindings/js/JSBiquadFilterNodeCustom.cpp

    r170167 r173402  
    3131#include "BiquadFilterNode.h"
    3232#include "ExceptionCode.h"
     33#include <interpreter/CallFrameInlines.h>
     34#include <interpreter/RegisterInlines.h>
    3335#include <runtime/Error.h>
    3436#include <runtime/JSCJSValueInlines.h>

  • trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp

    r169668 r173402  
    3737#include "Settings.h"
    3838#include "StyleProperties.h"
     39#include <interpreter/CallFrameInlines.h>
    3940#include <runtime/IdentifierInlines.h>
    4041#include <runtime/StringPrototype.h>

  • trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp

    r157215 r173402  
    3434#include "JSHTMLImageElement.h"
    3535#include "JSImageData.h"
     36#include <interpreter/CallFrameInlines.h>
     37#include <interpreter/RegisterInlines.h>
    3638
    3739using namespace JSC;

  • trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp

    r166091 r173402  
    4545#include <bindings/ScriptValue.h>
    4646#include <inspector/InspectorValues.h>
     47#include <interpreter/CallFrameInlines.h>
     48#include <interpreter/RegisterInlines.h>
    4749#include <parser/SourceCode.h>
    4850#include <runtime/IdentifierInlines.h>

  • trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp

    r165676 r173402  
    3636#include "JSSQLTransaction.h"
    3737#include "ScriptExecutionContext.h"
     38#include <interpreter/CallFrameInlines.h>
    3839#include <runtime/JSLock.h>
    3940#include <wtf/Ref.h>

  • trunk/Source/WebCore/bindings/js/JSDOMBinding.h

    r173176 r173402  
    3535#include <heap/Weak.h>
    3636#include <heap/WeakInlines.h>
     37#include <interpreter/CallFrameInlines.h>
     38#include <interpreter/RegisterInlines.h>
    3739#include <runtime/Error.h>
    3840#include <runtime/JSArray.h>

  • trunk/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp

    r170167 r173402  
    2020#include "JSDOMStringList.h"
    2121
     22#include <interpreter/CallFrameInlines.h>
     23#include <interpreter/RegisterInlines.h>
    2224#include <runtime/JSCJSValueInlines.h>
    2325

  • trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

    r172129 r173402  
    3737#include "Settings.h"
    3838#include "WebCoreJSClientData.h"
     39#include <interpreter/CallFrameInlines.h>
    3940#include <runtime/Microtask.h>
    4041#include <wtf/MainThread.h>

  • trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp

    r171824 r173402  
    3636#include "ScriptController.h"
    3737#include <heap/StrongInlines.h>
     38#include <interpreter/CallFrameInlines.h>
    3839#include <runtime/JSObject.h>
    3940

  • trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp

    r173258 r173402  
    3535#include "SVGDocument.h"
    3636#include "TouchList.h"
     37#include <interpreter/CallFrameInlines.h>
    3738#include <wtf/GetPtr.h>
    3839

  • trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp

    r171838 r173402  
    4242#include "SegmentedString.h"
    4343#include "DocumentParser.h"
     44#include <interpreter/CallFrameInlines.h>
    4445#include <runtime/Error.h>
    4546#include <runtime/JSCell.h>

  • trunk/Source/WebCore/bindings/js/JSOscillatorNodeCustom.cpp

    r170167 r173402  
    3131#include "ExceptionCode.h"
    3232#include "OscillatorNode.h"
     33#include <interpreter/CallFrameInlines.h>
     34#include <interpreter/RegisterInlines.h>
    3335#include <runtime/Error.h>
    3436#include <runtime/JSCJSValueInlines.h>

  • trunk/Source/WebCore/bindings/js/JSPannerNodeCustom.cpp

    r170167 r173402  
    3131#include "ExceptionCode.h"
    3232#include "PannerNode.h"
     33#include <interpreter/CallFrameInlines.h>
     34#include <interpreter/RegisterInlines.h>
    3335#include <runtime/Error.h>
    3436#include <runtime/JSCJSValueInlines.h>

  • trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp

    r170167 r173402  
    3333
    3434#include "JSHistory.h"
     35#include <interpreter/CallFrameInlines.h>
     36#include <interpreter/RegisterInlines.h>
    3537#include <runtime/JSCJSValueInlines.h>
    3638

  • trunk/Source/WebCore/dom/TreeWalker.cpp

    r166091 r173402  
    3030#include "NodeTraversal.h"
    3131
     32#include <interpreter/CallFrameInlines.h>
     33#include <interpreter/RegisterInlines.h>
    3234#include <runtime/JSCJSValueInlines.h>
    3335

  • trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

    r171702 r173402  
    5353#include <JavaScriptCore/APICast.h>
    5454#include <JavaScriptCore/JSBase.h>
     55#include <interpreter/CallFrameInlines.h>
    5556#include <wtf/HashMap.h>
    5657#include <wtf/text/StringHash.h>

  • trunk/Source/WebCore/inspector/CommandLineAPIModule.cpp

    r172888 r173402  
    3333#include "WebInjectedScriptManager.h"
    3434#include <inspector/InjectedScript.h>
     35#include <interpreter/CallFrameInlines.h>
     36#include <interpreter/RegisterInlines.h>
    3537
    3638using namespace JSC;

  • trunk/Source/WebCore/inspector/InspectorController.cpp

    r173198 r173402  
    7373#include <inspector/InspectorBackendDispatcher.h>
    7474#include <inspector/agents/InspectorAgent.h>
     75#include <interpreter/CallFrameInlines.h>
    7576#include <runtime/JSLock.h>
    7677
Note: See TracChangeset for help on using the changeset viewer.