Changeset 57784 in webkit


Ignore:
Timestamp:
Apr 17, 2010 11:42:07 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-17 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: move JavaScriptCallFrame.{h,cpp} to WebCore/bindings/js

​https://bugs.webkit.org/show_bug.cgi?id=37740

  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSBindingsAllInOne.cpp:
  • bindings/js/JavaScriptCallFrame.cpp: Renamed from WebCore/inspector/JavaScriptCallFrame.cpp. (WebCore::JavaScriptCallFrame::JavaScriptCallFrame): (WebCore::JavaScriptCallFrame::caller): (WebCore::JavaScriptCallFrame::scopeChain): (WebCore::JavaScriptCallFrame::dynamicGlobalObject): (WebCore::JavaScriptCallFrame::functionName): (WebCore::JavaScriptCallFrame::type): (WebCore::JavaScriptCallFrame::thisObject): (WebCore::JavaScriptCallFrame::evaluate):
  • bindings/js/JavaScriptCallFrame.h: Renamed from WebCore/inspector/JavaScriptCallFrame.h. (WebCore::JavaScriptCallFrame::create): (WebCore::JavaScriptCallFrame::invalidate): (WebCore::JavaScriptCallFrame::isValid): (WebCore::JavaScriptCallFrame::sourceID): (WebCore::JavaScriptCallFrame::line): (WebCore::JavaScriptCallFrame::update):
  • inspector/InjectedScriptHost.h:
  • inspector/InspectorController.h:
Location:
trunk/WebCore
Files:
9 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r57780 r57784  
     12010-04-17  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: move JavaScriptCallFrame.{h,cpp} to WebCore/bindings/js
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=37740
     8
     9        * GNUmakefile.am:
     10        * WebCore.gypi:
     11        * WebCore.pro:
     12        * WebCore.vcproj/WebCore.vcproj:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * bindings/js/JSBindingsAllInOne.cpp:
     15        * bindings/js/JavaScriptCallFrame.cpp: Renamed from WebCore/inspector/JavaScriptCallFrame.cpp.
     16        (WebCore::JavaScriptCallFrame::JavaScriptCallFrame):
     17        (WebCore::JavaScriptCallFrame::caller):
     18        (WebCore::JavaScriptCallFrame::scopeChain):
     19        (WebCore::JavaScriptCallFrame::dynamicGlobalObject):
     20        (WebCore::JavaScriptCallFrame::functionName):
     21        (WebCore::JavaScriptCallFrame::type):
     22        (WebCore::JavaScriptCallFrame::thisObject):
     23        (WebCore::JavaScriptCallFrame::evaluate):
     24        * bindings/js/JavaScriptCallFrame.h: Renamed from WebCore/inspector/JavaScriptCallFrame.h.
     25        (WebCore::JavaScriptCallFrame::create):
     26        (WebCore::JavaScriptCallFrame::invalidate):
     27        (WebCore::JavaScriptCallFrame::isValid):
     28        (WebCore::JavaScriptCallFrame::sourceID):
     29        (WebCore::JavaScriptCallFrame::line):
     30        (WebCore::JavaScriptCallFrame::update):
     31        * inspector/InjectedScriptHost.h:
     32        * inspector/InspectorController.h:
     33
    1342010-04-17  Vangelis Kokkevis  <vangelis@chromium.org>
    235

  • trunk/WebCore/GNUmakefile.am

    r57775 r57784  
    391391        WebCore/bindings/js/JSDOMBinding.cpp \
    392392        WebCore/bindings/js/JSDOMBinding.h \
    393   WebCore/bindings/js/JSDOMFormDataCustom.cpp \
     393        WebCore/bindings/js/JSDOMFormDataCustom.cpp \
    394394        WebCore/bindings/js/JSDOMGlobalObject.cpp \
    395395        WebCore/bindings/js/JSDOMGlobalObject.h \
    … …  
    491491        WebCore/bindings/js/JSXSLTProcessorConstructor.h \
    492492        WebCore/bindings/js/JSXSLTProcessorCustom.cpp \
     493        WebCore/bindings/js/JavaScriptCallFrame.cpp \
     494        WebCore/bindings/js/JavaScriptCallFrame.h \
    493495        WebCore/bindings/js/ScheduledAction.cpp \
    494496        WebCore/bindings/js/ScheduledAction.h \
    … …  
    12761278        WebCore/inspector/InspectorTimelineAgent.h \
    12771279        WebCore/inspector/InspectorWorkerResource.h \
    1278         WebCore/inspector/JavaScriptCallFrame.cpp \
    1279         WebCore/inspector/JavaScriptCallFrame.h \
    12801280        WebCore/inspector/ScriptBreakpoint.h \
    12811281        WebCore/inspector/ScriptDebugListener.h \

  • trunk/WebCore/WebCore.gypi

    r57780 r57784  
    640640            'bindings/js/JSXSLTProcessorConstructor.h',
    641641            'bindings/js/JSXSLTProcessorCustom.cpp',
     642            'bindings/js/JavaScriptCallFrame.cpp',
     643            'bindings/js/JavaScriptCallFrame.h',
    642644            'bindings/js/ScheduledAction.cpp',
    643645            'bindings/js/ScheduledAction.h',
    … …  
    16641666            'inspector/InspectorTimelineAgent.h',
    16651667            'inspector/InspectorWorkerResource.h',
    1666             'inspector/JavaScriptCallFrame.cpp',
    1667             'inspector/JavaScriptCallFrame.h',
    16681668            'inspector/ScriptBreakpoint.h',
    16691669            'inspector/ScriptDebugListener.h',

  • trunk/WebCore/WebCore.pro

    r57775 r57784  
    10791079    bindings/js/JSXMLHttpRequestConstructor.h \
    10801080    bindings/js/JSXSLTProcessorConstructor.h \
     1081    bindings/js/JavaScriptCallFrame.h \
    10811082    bindings/js/ScheduledAction.h \
    10821083    bindings/js/ScriptArray.h \
    … …  
    14411442    inspector/InspectorResource.h \
    14421443    inspector/InspectorTimelineAgent.h \
    1443     inspector/JavaScriptCallFrame.h \
    14441444    inspector/ScriptGCEventListener.h \
    14451445    inspector/TimelineRecordFactory.h \
    … …  
    27342734        bindings/js/JSJavaScriptCallFrameCustom.cpp \
    27352735        bindings/js/ScriptProfiler.cpp \
    2736         inspector/JavaScriptCallFrame.cpp \
     2736        bindings/js/JavaScriptCallFrame.cpp \
    27372737}
    27382738

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r57775 r57784  
    4329343293                        </File>
    4329443294                        <File
    43295                                 RelativePath="..\inspector\JavaScriptCallFrame.cpp"
    43296                                 >
    43297                         </File>
    43298                         <File
    43299                                 RelativePath="..\inspector\JavaScriptCallFrame.h"
    43300                                 >
    43301                         </File>
    43302                         <File
    4330343295                                RelativePath="..\inspector\ScriptBreakpoint.h"
    4330443296                                >

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r57775 r57784  
    1084510845                                754133A7102E00E800075D00 /* InspectorTimelineAgent.h */,
    1084610846                                F375CC061150D300008DDB81 /* InspectorWorkerResource.h */,
    10847                                 1C81BA030E97348300266E07 /* JavaScriptCallFrame.cpp */,
    10848                                 1C81BA040E97348300266E07 /* JavaScriptCallFrame.h */,
    1084910847                                1C81BA050E97348300266E07 /* JavaScriptCallFrame.idl */,
    1085010848                                BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */,
    … …  
    1489714895                                F3D461461161D53200CA0D09 /* JSWorkerContextErrorHandler.cpp */,
    1489814896                                F3D461471161D53200CA0D09 /* JSWorkerContextErrorHandler.h */,
     14897                                1C81BA030E97348300266E07 /* JavaScriptCallFrame.cpp */,
     14898                                1C81BA040E97348300266E07 /* JavaScriptCallFrame.h */,
    1489914899                                BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
    1490014900                                BCA378BB0D15F64200B793D6 /* ScheduledAction.h */,

  • trunk/WebCore/bindings/js/JSBindingsAllInOne.cpp

    r57505 r57784  
    136136#include "JSXSLTProcessorConstructor.cpp"
    137137#include "JSXSLTProcessorCustom.cpp"
     138#include "JavaScriptCallFrame.cpp"
    138139#include "ScheduledAction.cpp"
    139140#include "ScriptArray.cpp"

  • trunk/WebCore/bindings/js/JavaScriptCallFrame.cpp

    r57783 r57784  
    2626#include "config.h"
    2727#include "JavaScriptCallFrame.h"
     28
    2829#include "JSDOMBinding.h"
    2930
    … …  
    3233#include "PlatformString.h"
    3334#include <debugger/DebuggerCallFrame.h>
     35#include <runtime/Completion.h>
    3436#include <runtime/JSGlobalObject.h>
    35 #include <runtime/Completion.h>
    3637#include <runtime/JSLock.h>
    3738#include <runtime/JSObject.h>

  • trunk/WebCore/bindings/js/JavaScriptCallFrame.h

    r57783 r57784  
    2929#if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
    3030
     31#include <debugger/DebuggerCallFrame.h>
    3132#include <interpreter/CallFrame.h>
    3233#include <wtf/PassRefPtr.h>
    3334#include <wtf/RefCounted.h>
    34 #include <debugger/DebuggerCallFrame.h>
    3535
    3636namespace WebCore {
    3737
    38     class String;
     38class String;
    3939
    40     class JavaScriptCallFrame : public RefCounted<JavaScriptCallFrame> {
    41     public:
    42         static PassRefPtr<JavaScriptCallFrame> create(const JSC::DebuggerCallFrame& debuggerCallFrame, PassRefPtr<JavaScriptCallFrame> caller, intptr_t sourceID, int line)
    43         {
    44             return adoptRef(new JavaScriptCallFrame(debuggerCallFrame, caller, sourceID, line));
    45         }
     40class JavaScriptCallFrame : public RefCounted<JavaScriptCallFrame> {
     41public:
     42    static PassRefPtr<JavaScriptCallFrame> create(const JSC::DebuggerCallFrame& debuggerCallFrame, PassRefPtr<JavaScriptCallFrame> caller, intptr_t sourceID, int line)
     43    {
     44        return adoptRef(new JavaScriptCallFrame(debuggerCallFrame, caller, sourceID, line));
     45    }
    4646
    47         void invalidate()
    48         {
    49             m_isValid = false;
    50             m_debuggerCallFrame = 0;
    51         }
     47    void invalidate()
     48    {
     49        m_isValid = false;
     50        m_debuggerCallFrame = 0;
     51    }
    5252
    53         bool isValid() const { return m_isValid; }
     53    bool isValid() const { return m_isValid; }
    5454
    55         JavaScriptCallFrame* caller();
     55    JavaScriptCallFrame* caller();
    5656
    57         intptr_t sourceID() const { return m_sourceID; }
    58         int line() const { return m_line; }
    59         void update(const JSC::DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int line)
    60         {
    61             m_debuggerCallFrame = debuggerCallFrame;
    62             m_line = line;
    63             m_sourceID = sourceID;
    64             m_isValid = true;
    65         }
     57    intptr_t sourceID() const { return m_sourceID; }
     58    int line() const { return m_line; }
     59    void update(const JSC::DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int line)
     60    {
     61        m_debuggerCallFrame = debuggerCallFrame;
     62        m_line = line;
     63        m_sourceID = sourceID;
     64        m_isValid = true;
     65    }
    6666
    67         String functionName() const;
    68         JSC::DebuggerCallFrame::Type type() const;
    69         const JSC::ScopeChainNode* scopeChain() const;
    70         JSC::JSGlobalObject* dynamicGlobalObject() const;
     67    String functionName() const;
     68    JSC::DebuggerCallFrame::Type type() const;
     69    const JSC::ScopeChainNode* scopeChain() const;
     70    JSC::JSGlobalObject* dynamicGlobalObject() const;
    7171
    72         JSC::JSObject* thisObject() const;
    73         JSC::JSValue evaluate(const JSC::UString& script, JSC::JSValue& exception) const;
    74        
    75     private:
    76         JavaScriptCallFrame(const JSC::DebuggerCallFrame&, PassRefPtr<JavaScriptCallFrame> caller, intptr_t sourceID, int line);
     72    JSC::JSObject* thisObject() const;
     73    JSC::JSValue evaluate(const JSC::UString& script, JSC::JSValue& exception) const;
     74   
     75private:
     76    JavaScriptCallFrame(const JSC::DebuggerCallFrame&, PassRefPtr<JavaScriptCallFrame> caller, intptr_t sourceID, int line);
    7777
    78         JSC::DebuggerCallFrame m_debuggerCallFrame;
    79         RefPtr<JavaScriptCallFrame> m_caller;
    80         intptr_t m_sourceID;
    81         int m_line;
    82         bool m_isValid;
    83     };
     78    JSC::DebuggerCallFrame m_debuggerCallFrame;
     79    RefPtr<JavaScriptCallFrame> m_caller;
     80    intptr_t m_sourceID;
     81    int m_line;
     82    bool m_isValid;
     83};
    8484
    8585} // namespace WebCore

  • trunk/WebCore/inspector/InjectedScriptHost.h

    r56841 r57784  
    4545class InspectorDOMAgent;
    4646class InspectorFrontend;
    47 class JavaScriptCallFrame;
    4847class Node;
    4948class SerializedScriptValue;

  • trunk/WebCore/inspector/InspectorController.h

    r57337 r57784  
    6969class InspectorFrontendClient;
    7070class InspectorTimelineAgent;
    71 class JavaScriptCallFrame;
    7271class KURL;
    7372class Node;
Note: See TracChangeset for help on using the changeset viewer.