Changeset 101081 in webkit


Ignore:
Timestamp:
Nov 23, 2011 7:28:40 AM (12 years ago)
Author:
yurys@chromium.org
Message:

Web Inspector: split console agent into worker and page console agents
https://bugs.webkit.org/show_bug.cgi?id=73019

InspectorConsoleAgent now has two descendants: WorkerConsoleAgent and PageConsoleAgent
which encapsulate functionality specific for the type of inspected instance.

Reviewed by Pavel Feldman.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • inspector/InspectorConsoleAgent.cpp:

(WebCore::InspectorConsoleAgent::InspectorConsoleAgent):
(WebCore::InspectorConsoleAgent::~InspectorConsoleAgent):
(WebCore::InspectorConsoleAgent::clearMessages):
(WebCore::InspectorConsoleAgent::addMessageToConsole):
(WebCore::InspectorConsoleAgent::resourceRetrievedByXMLHttpRequest):
(WebCore::InspectorConsoleAgent::didReceiveResponse):
(WebCore::InspectorConsoleAgent::didFailLoading):
(WebCore::InspectorConsoleAgent::addConsoleMessage):

  • inspector/InspectorConsoleAgent.h:
  • inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):

  • inspector/InspectorStyleTextEditor.cpp:
  • inspector/InspectorStyleTextEditor.h:
  • inspector/PageConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.cpp.

(WebCore::PageConsoleAgent::PageConsoleAgent):
(WebCore::PageConsoleAgent::~PageConsoleAgent):
(WebCore::PageConsoleAgent::clearMessages):
(WebCore::PageConsoleAgent::addInspectedNode):
(WebCore::PageConsoleAgent::developerExtrasEnabled):

  • inspector/PageConsoleAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
  • inspector/PageDebuggerAgent.cpp:
  • inspector/PageDebuggerAgent.h:
  • inspector/PageRuntimeAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.

(WebCore::PageRuntimeAgent::PageRuntimeAgent): PageRuntimeAgent was moved into its own file.
(WebCore::PageRuntimeAgent::~PageRuntimeAgent):
(WebCore::PageRuntimeAgent::scriptStateForFrameId):
(WebCore::PageRuntimeAgent::getDefaultInspectedState):

  • inspector/PageRuntimeAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
  • inspector/WorkerConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.

(WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
(WebCore::WorkerConsoleAgent::~WorkerConsoleAgent):
(WebCore::WorkerConsoleAgent::addInspectedNode):
(WebCore::WorkerConsoleAgent::developerExtrasEnabled):

  • inspector/WorkerConsoleAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
  • inspector/WorkerDebuggerAgent.cpp:
  • inspector/WorkerDebuggerAgent.h:
  • inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::WorkerInspectorController):

  • inspector/WorkerInspectorController.h:
  • inspector/WorkerRuntimeAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.

(WebCore::WorkerRuntimeAgent::WorkerRuntimeAgent): WorkerRuntimeAgent was moved into its own file.
(WebCore::WorkerRuntimeAgent::~WorkerRuntimeAgent):
(WebCore::WorkerRuntimeAgent::scriptStateForFrameId):
(WebCore::WorkerRuntimeAgent::getDefaultInspectedState):

  • inspector/WorkerRuntimeAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
Location:
trunk/Source/WebCore
Files:
18 edited
8 copied

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r101052 r101081  
    902902    inspector/InstrumentingAgents.cpp
    903903    inspector/NetworkResourcesData.cpp
     904    inspector/PageConsoleAgent.cpp
    904905    inspector/PageDebuggerAgent.cpp
     906    inspector/PageRuntimeAgent.cpp
    905907    inspector/ScriptArguments.cpp
    906908    inspector/ScriptCallFrame.cpp
    907909    inspector/ScriptCallStack.cpp
    908910    inspector/TimelineRecordFactory.cpp
     911    inspector/WorkerConsoleAgent.cpp
    909912    inspector/WorkerDebuggerAgent.cpp
    910913    inspector/WorkerInspectorController.cpp
     914    inspector/WorkerRuntimeAgent.cpp
    911915
    912916    loader/CrossOriginAccessControl.cpp
  • trunk/Source/WebCore/ChangeLog

    r101080 r101081  
     12011-11-23  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Web Inspector: split console agent into worker and page console agents
     4        https://bugs.webkit.org/show_bug.cgi?id=73019
     5
     6        InspectorConsoleAgent now has two descendants: WorkerConsoleAgent and PageConsoleAgent
     7        which encapsulate functionality specific for the type of inspected instance.
     8
     9        Reviewed by Pavel Feldman.
     10
     11        * CMakeLists.txt:
     12        * GNUmakefile.list.am:
     13        * Target.pri:
     14        * WebCore.gypi:
     15        * WebCore.vcproj/WebCore.vcproj:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * inspector/InspectorConsoleAgent.cpp:
     18        (WebCore::InspectorConsoleAgent::InspectorConsoleAgent):
     19        (WebCore::InspectorConsoleAgent::~InspectorConsoleAgent):
     20        (WebCore::InspectorConsoleAgent::clearMessages):
     21        (WebCore::InspectorConsoleAgent::addMessageToConsole):
     22        (WebCore::InspectorConsoleAgent::resourceRetrievedByXMLHttpRequest):
     23        (WebCore::InspectorConsoleAgent::didReceiveResponse):
     24        (WebCore::InspectorConsoleAgent::didFailLoading):
     25        (WebCore::InspectorConsoleAgent::addConsoleMessage):
     26        * inspector/InspectorConsoleAgent.h:
     27        * inspector/InspectorController.cpp:
     28        (WebCore::InspectorController::InspectorController):
     29        * inspector/InspectorStyleTextEditor.cpp:
     30        * inspector/InspectorStyleTextEditor.h:
     31        * inspector/PageConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.cpp.
     32        (WebCore::PageConsoleAgent::PageConsoleAgent):
     33        (WebCore::PageConsoleAgent::~PageConsoleAgent):
     34        (WebCore::PageConsoleAgent::clearMessages):
     35        (WebCore::PageConsoleAgent::addInspectedNode):
     36        (WebCore::PageConsoleAgent::developerExtrasEnabled):
     37        * inspector/PageConsoleAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
     38        * inspector/PageDebuggerAgent.cpp:
     39        * inspector/PageDebuggerAgent.h:
     40        * inspector/PageRuntimeAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
     41        (WebCore::PageRuntimeAgent::PageRuntimeAgent): PageRuntimeAgent was moved into its own file.
     42        (WebCore::PageRuntimeAgent::~PageRuntimeAgent):
     43        (WebCore::PageRuntimeAgent::scriptStateForFrameId):
     44        (WebCore::PageRuntimeAgent::getDefaultInspectedState):
     45        * inspector/PageRuntimeAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
     46        * inspector/WorkerConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
     47        (WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
     48        (WebCore::WorkerConsoleAgent::~WorkerConsoleAgent):
     49        (WebCore::WorkerConsoleAgent::addInspectedNode):
     50        (WebCore::WorkerConsoleAgent::developerExtrasEnabled):
     51        * inspector/WorkerConsoleAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
     52        * inspector/WorkerDebuggerAgent.cpp:
     53        * inspector/WorkerDebuggerAgent.h:
     54        * inspector/WorkerInspectorController.cpp:
     55        (WebCore::WorkerInspectorController::WorkerInspectorController):
     56        * inspector/WorkerInspectorController.h:
     57        * inspector/WorkerRuntimeAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
     58        (WebCore::WorkerRuntimeAgent::WorkerRuntimeAgent): WorkerRuntimeAgent was moved into its own file.
     59        (WebCore::WorkerRuntimeAgent::~WorkerRuntimeAgent):
     60        (WebCore::WorkerRuntimeAgent::scriptStateForFrameId):
     61        (WebCore::WorkerRuntimeAgent::getDefaultInspectedState):
     62        * inspector/WorkerRuntimeAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h.
     63
    1642011-11-23  Alexander Pavlov  <apavlov@chromium.org>
    265
  • trunk/Source/WebCore/GNUmakefile.list.am

    r100997 r101081  
    21102110        Source/WebCore/inspector/NetworkResourcesData.cpp \
    21112111        Source/WebCore/inspector/NetworkResourcesData.h \
     2112        Source/WebCore/inspector/PageConsoleAgent.cpp \
     2113        Source/WebCore/inspector/PageConsoleAgent.h \
    21122114        Source/WebCore/inspector/PageDebuggerAgent.cpp \
    21132115        Source/WebCore/inspector/PageDebuggerAgent.h \
     2116        Source/WebCore/inspector/PageRuntimeAgent.cpp \
     2117        Source/WebCore/inspector/PageRuntimeAgent.h \
    21142118        Source/WebCore/inspector/ScriptArguments.cpp \
    21152119        Source/WebCore/inspector/ScriptArguments.h \
     
    21232127        Source/WebCore/inspector/TimelineRecordFactory.cpp \
    21242128        Source/WebCore/inspector/TimelineRecordFactory.h \
     2129        Source/WebCore/inspector/WorkerConsoleAgent.cpp \
     2130        Source/WebCore/inspector/WorkerConsoleAgent.h \
    21252131        Source/WebCore/inspector/WorkerDebuggerAgent.cpp \
    21262132        Source/WebCore/inspector/WorkerDebuggerAgent.h \
    21272133        Source/WebCore/inspector/WorkerInspectorController.cpp \
    21282134        Source/WebCore/inspector/WorkerInspectorController.h \
     2135        Source/WebCore/inspector/WorkerRuntimeAgent.cpp \
     2136        Source/WebCore/inspector/WorkerRuntimeAgent.h \
    21292137        Source/WebCore/loader/appcache/ApplicationCache.cpp \
    21302138        Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp \
  • trunk/Source/WebCore/Target.pri

    r100993 r101081  
    887887    inspector/InstrumentingAgents.cpp \
    888888    inspector/NetworkResourcesData.cpp \
     889    inspector/PageConsoleAgent.cpp \
    889890    inspector/PageDebuggerAgent.cpp \
     891    inspector/PageRuntimeAgent.cpp \
    890892    inspector/ScriptArguments.cpp \
    891893    inspector/ScriptCallFrame.cpp \
    892894    inspector/ScriptCallStack.cpp \
    893895    inspector/TimelineRecordFactory.cpp \
     896    inspector/WorkerConsoleAgent.cpp \
    894897    inspector/WorkerDebuggerAgent.cpp \
    895898    inspector/WorkerInspectorController.cpp \
     899    inspector/WorkerRuntimeAgent.cpp \
    896900    loader/appcache/ApplicationCache.cpp \
    897901    loader/appcache/ApplicationCacheGroup.cpp \
     
    19331937    inspector/InstrumentingAgents.h \
    19341938    inspector/NetworkResourcesData.h \
     1939    inspector/PageConsoleAgent.h \
    19351940    inspector/PageDebuggerAgent.h \
     1941    inspector/PageRuntimeAgent.h \
    19361942    inspector/ScriptGCEventListener.h \
    19371943    inspector/TimelineRecordFactory.h \
     1944    inspector/WorkerConsoleAgent.h \
    19381945    inspector/WorkerDebuggerAgent.h \
     1946    inspector/WorkerRuntimeAgent.h \
    19391947    loader/appcache/ApplicationCacheGroup.h \
    19401948    loader/appcache/ApplicationCacheHost.h \
  • trunk/Source/WebCore/WebCore.gypi

    r101065 r101081  
    27722772            'inspector/NetworkResourcesData.cpp',
    27732773            'inspector/NetworkResourcesData.h',
     2774            'inspector/PageConsoleAgent.cpp',
     2775            'inspector/PageConsoleAgent.h',
    27742776            'inspector/PageDebuggerAgent.cpp',
    27752777            'inspector/PageDebuggerAgent.h',
     2778            'inspector/PageRuntimeAgent.cpp',
     2779            'inspector/PageRuntimeAgent.h',
    27762780            'inspector/ScriptArguments.cpp',
    27772781            'inspector/ScriptArguments.h',
     
    27832787            'inspector/TimelineRecordFactory.cpp',
    27842788            'inspector/TimelineRecordFactory.h',
     2789            'inspector/WorkerConsoleAgent.cpp',
     2790            'inspector/WorkerConsoleAgent.h',
    27852791            'inspector/WorkerDebuggerAgent.cpp',
    27862792            'inspector/WorkerDebuggerAgent.h',
    27872793            'inspector/WorkerInspectorController.cpp',
    27882794            'inspector/WorkerInspectorController.h',
     2795            'inspector/WorkerRuntimeAgent.cpp',
     2796            'inspector/WorkerRuntimeAgent.h',
    27892797            'loader/CachedMetadata.h',
    27902798            'loader/CrossOriginAccessControl.cpp',
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r100991 r101081  
    6857568575                        </File>
    6857668576                        <File
     68577                                RelativePath="..\inspector\PageConsoleAgent.cpp"
     68578                                >
     68579                        </File>
     68580                        <File
     68581                                RelativePath="..\inspector\PageConsoleAgent.h"
     68582                                >
     68583                        </File>
     68584                        <File
    6857768585                                RelativePath="..\inspector\PageDebuggerAgent.cpp"
    6857868586                                >
     
    6858368591                        </File>
    6858468592                        <File
     68593                                RelativePath="..\inspector\PageRuntimeAgent.cpp"
     68594                                >
     68595                        </File>
     68596                        <File
     68597                                RelativePath="..\inspector\PageRuntimeAgent.h"
     68598                                >
     68599                        </File>
     68600                        <File
    6858568601                                RelativePath="..\inspector\ScriptArguments.cpp"
    6858668602                                >
     
    6862368639                        </File>
    6862468640                        <File
     68641                                RelativePath="..\inspector\WorkerConsoleAgent.cpp"
     68642                                >
     68643                        </File>
     68644                        <File
     68645                                RelativePath="..\inspector\WorkerConsoleAgent.h"
     68646                                >
     68647                        </File>
     68648                        <File
    6862568649                                RelativePath="..\inspector\WorkerDebuggerAgent.cpp"
    6862668650                                >
     
    6863668660                        <File
    6863768661                                RelativePath="..\inspector\WorkerInspectorController.h"
     68662                                >
     68663                        </File>
     68664                        <File
     68665                                RelativePath="..\inspector\WorkerRuntimeAgent.cpp"
     68666                                >
     68667                        </File>
     68668                        <File
     68669                                RelativePath="..\inspector\WorkerRuntimeAgent.h"
    6863868670                                >
    6863968671                        </File>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r100616 r101081  
    60246024                F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */; };
    60256025                F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */; };
     6026                F3820892147D35F90010BC06 /* PageConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */; };
     6027                F3820893147D35F90010BC06 /* PageConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088B147D35F90010BC06 /* PageConsoleAgent.h */; };
     6028                F3820894147D35F90010BC06 /* PageRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */; };
     6029                F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088D147D35F90010BC06 /* PageRuntimeAgent.h */; };
     6030                F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */; };
     6031                F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */; };
     6032                F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */; };
     6033                F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */; };
    60266034                F392249C126F11AE00A926D9 /* ScriptCallStackFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F392249A126F11AE00A926D9 /* ScriptCallStackFactory.cpp */; };
    60276035                F392249D126F11AE00A926D9 /* ScriptCallStackFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F392249B126F11AE00A926D9 /* ScriptCallStackFactory.h */; };
     
    1338213390                F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWorkerAgent.cpp; sourceTree = "<group>"; };
    1338313391                F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWorkerAgent.h; sourceTree = "<group>"; };
     13392                F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageConsoleAgent.cpp; sourceTree = "<group>"; };
     13393                F382088B147D35F90010BC06 /* PageConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageConsoleAgent.h; sourceTree = "<group>"; };
     13394                F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageRuntimeAgent.cpp; sourceTree = "<group>"; };
     13395                F382088D147D35F90010BC06 /* PageRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageRuntimeAgent.h; sourceTree = "<group>"; };
     13396                F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerConsoleAgent.cpp; sourceTree = "<group>"; };
     13397                F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerConsoleAgent.h; sourceTree = "<group>"; };
     13398                F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerRuntimeAgent.cpp; sourceTree = "<group>"; };
     13399                F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerRuntimeAgent.h; sourceTree = "<group>"; };
    1338413400                F392249A126F11AE00A926D9 /* ScriptCallStackFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStackFactory.cpp; sourceTree = "<group>"; };
    1338513401                F392249B126F11AE00A926D9 /* ScriptCallStackFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallStackFactory.h; sourceTree = "<group>"; };
     
    1455714573                                59C27F04138D28C10079B7E2 /* NetworkResourcesData.cpp */,
    1455814574                                59C27F06138D28CF0079B7E2 /* NetworkResourcesData.h */,
     14575                                F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */,
     14576                                F382088B147D35F90010BC06 /* PageConsoleAgent.h */,
    1455914577                                F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */,
    1456014578                                F34742DB134362F000531BC2 /* PageDebuggerAgent.h */,
     14579                                F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */,
     14580                                F382088D147D35F90010BC06 /* PageRuntimeAgent.h */,
    1456114581                                F39BE95912673BF400E0A674 /* ScriptArguments.cpp */,
    1456214582                                F39BE95A12673BF400E0A674 /* ScriptArguments.h */,
     
    1457114591                                7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */,
    1457214592                                7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */,
     14593                                F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
     14594                                F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */,
    1457314595                                F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */,
    1457414596                                F34742DF1343631F00531BC2 /* WorkerDebuggerAgent.h */,
    1457514597                                F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */,
    1457614598                                F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */,
     14599                                F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */,
     14600                                F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */,
    1457714601                        );
    1457814602                        path = inspector;
     
    2472824752                                A3E2643114748991005A8588 /* WorkerEventQueue.h in Headers */,
    2472924753                                3138A9E51474434600B0ED12 /* StyleShader.h in Headers */,
     24754                                F3820893147D35F90010BC06 /* PageConsoleAgent.h in Headers */,
     24755                                F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */,
     24756                                F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */,
     24757                                F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */,
    2473024758                        );
    2473124759                        runOnlyForDeploymentPostprocessing = 0;
     
    2760227630                                5038BE401472AD980095E0D1 /* CachedShader.cpp in Sources */,
    2760327631                                A3E2643014748991005A8588 /* WorkerEventQueue.cpp in Sources */,
     27632                                F3820892147D35F90010BC06 /* PageConsoleAgent.cpp in Sources */,
     27633                                F3820894147D35F90010BC06 /* PageRuntimeAgent.cpp in Sources */,
     27634                                F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */,
     27635                                F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */,
    2760427636                        );
    2760527637                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp

    r100756 r101081  
    3535#include "InjectedScriptHost.h"
    3636#include "InjectedScriptManager.h"
    37 #include "InspectorAgent.h"
    38 #include "InspectorDOMAgent.h"
    3937#include "InspectorFrontend.h"
    4038#include "InspectorState.h"
     
    5957}
    6058
    61 InspectorConsoleAgent::InspectorConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorAgent* inspectorAgent, InspectorState* state, InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
     59InspectorConsoleAgent::InspectorConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, InjectedScriptManager* injectedScriptManager)
    6260    : m_instrumentingAgents(instrumentingAgents)
    63     , m_inspectorAgent(inspectorAgent)
    6461    , m_inspectorState(state)
    6562    , m_injectedScriptManager(injectedScriptManager)
    66     , m_inspectorDOMAgent(domAgent)
    6763    , m_frontend(0)
    6864    , m_previousMessage(0)
     
    7672    m_instrumentingAgents->setInspectorConsoleAgent(0);
    7773    m_instrumentingAgents = 0;
    78     m_inspectorAgent = 0;
    7974    m_inspectorState = 0;
    8075    m_injectedScriptManager = 0;
    81     m_inspectorDOMAgent = 0;
    8276}
    8377
     
    107101    m_previousMessage = 0;
    108102    m_injectedScriptManager->releaseObjectGroup("console");
    109     m_inspectorDOMAgent->releaseDanglingNodes();
    110103    if (m_frontend)
    111104        m_frontend->messagesCleared();
     
    141134void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> callStack)
    142135{
    143     if (!m_inspectorAgent->enabled())
     136    if (!developerExtrasEnabled())
    144137        return;
    145138    addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, arguments, callStack)));
     
    148141void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& scriptId)
    149142{
    150     if (!m_inspectorAgent->enabled())
     143    if (!developerExtrasEnabled())
    151144        return;
    152145    addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, scriptId)));
     
    217210void InspectorConsoleAgent::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const String& url, const String& sendURL, unsigned sendLineNumber)
    218211{
    219     if (!m_inspectorAgent->enabled())
     212    if (!developerExtrasEnabled())
    220213        return;
    221214    if (m_frontend && m_inspectorState->getBoolean(ConsoleAgentState::monitoringXHR)) {
     
    230223void InspectorConsoleAgent::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
    231224{
    232     if (!m_inspectorAgent->enabled())
     225    if (!developerExtrasEnabled())
    233226        return;
    234227
     
    242235void InspectorConsoleAgent::didFailLoading(unsigned long identifier, const ResourceError& error)
    243236{
    244     if (!m_inspectorAgent->enabled())
     237    if (!developerExtrasEnabled())
    245238        return;
    246239    if (error.isCancellation()) // Report failures only.
     
    258251}
    259252
    260 void InspectorConsoleAgent::addInspectedNode(ErrorString*, int nodeId)
    261 {
    262     Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
    263     if (!node)
    264         return;
    265     m_injectedScriptManager->injectedScriptHost()->addInspectedNode(node);
    266 }
    267 
    268253static bool isGroupMessage(MessageType type)
    269254{
     
    275260void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
    276261{
    277     ASSERT(m_inspectorAgent->enabled());
     262    ASSERT(developerExtrasEnabled());
    278263    ASSERT_ARG(consoleMessage, consoleMessage);
    279264
  • trunk/Source/WebCore/inspector/InspectorConsoleAgent.h

    r98326 r101081  
    4040class ConsoleMessage;
    4141class DOMWindow;
    42 class InspectorAgent;
    43 class InspectorDOMAgent;
    4442class InspectorFrontend;
    4543class InspectorState;
     
    5755    WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent);
    5856public:
    59     InspectorConsoleAgent(InstrumentingAgents*, InspectorAgent*, InspectorState*, InjectedScriptManager*, InspectorDOMAgent*);
    60     ~InspectorConsoleAgent();
     57    InspectorConsoleAgent(InstrumentingAgents*, InspectorState*, InjectedScriptManager*);
     58    virtual ~InspectorConsoleAgent();
    6159
    6260    void enable(ErrorString*);
    6361    void disable(ErrorString*);
    64     void clearMessages(ErrorString*);
     62    virtual void clearMessages(ErrorString*);
    6563    void reset();
    6664    void restore();
     
    8583#endif
    8684    void setMonitoringXHREnabled(ErrorString* error, bool enabled);
    87     void addInspectedNode(ErrorString*, int nodeId);
     85    virtual void addInspectedNode(ErrorString*, int nodeId) = 0;
    8886
    89 private:
     87protected:
    9088    void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
    9189
     90    virtual bool developerExtrasEnabled() = 0;
     91
    9292    InstrumentingAgents* m_instrumentingAgents;
    93     InspectorAgent* m_inspectorAgent;
    9493    InspectorState* m_inspectorState;
    9594    InjectedScriptManager* m_injectedScriptManager;
    96     InspectorDOMAgent* m_inspectorDOMAgent;
    9795    InspectorFrontend::Console* m_frontend;
    9896    ConsoleMessage* m_previousMessage;
  • trunk/Source/WebCore/inspector/InspectorController.cpp

    r100995 r101081  
    4444#include "InspectorCSSAgent.h"
    4545#include "InspectorClient.h"
    46 #include "InspectorConsoleAgent.h"
    4746#include "InspectorDOMAgent.h"
    4847#include "InspectorDOMDebuggerAgent.h"
     
    5655#include "InspectorProfilerAgent.h"
    5756#include "InspectorResourceAgent.h"
    58 #include "InspectorRuntimeAgent.h"
    5957#include "InspectorState.h"
    6058#include "InspectorTimelineAgent.h"
    6159#include "InspectorWorkerAgent.h"
    6260#include "InstrumentingAgents.h"
     61#include "PageConsoleAgent.h"
    6362#include "PageDebuggerAgent.h"
     63#include "PageRuntimeAgent.h"
    6464#include "Page.h"
    6565#include "ScriptObject.h"
     
    6868
    6969namespace WebCore {
    70 
    71 namespace {
    72 
    73 class PageRuntimeAgent : public InspectorRuntimeAgent {
    74 public:
    75     PageRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, Page* page, InspectorPageAgent* pageAgent)
    76         : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager)
    77         , m_inspectedPage(page)
    78         , m_pageAgent(pageAgent) { }
    79     virtual ~PageRuntimeAgent() { }
    80 
    81 private:
    82     virtual ScriptState* scriptStateForFrameId(const String& frameId)
    83     {
    84         Frame* frame = m_pageAgent->frameForId(frameId);
    85         if (!frame)
    86             return 0;
    87         return mainWorldScriptState(frame);
    88     }
    89     virtual ScriptState* getDefaultInspectedState() { return mainWorldScriptState(m_inspectedPage->mainFrame()); }
    90     Page* m_inspectedPage;
    91     InspectorPageAgent* m_pageAgent;
    92 };
    93 
    94 }
    9570
    9671InspectorController::InspectorController(Page* page, InspectorClient* inspectorClient)
     
    11085    , m_resourceAgent(InspectorResourceAgent::create(m_instrumentingAgents.get(), m_pageAgent.get(), inspectorClient, m_state.get()))
    11186    , m_runtimeAgent(adoptPtr(new PageRuntimeAgent(m_instrumentingAgents.get(), m_injectedScriptManager.get(), page, m_pageAgent.get())))
    112     , m_consoleAgent(adoptPtr(new InspectorConsoleAgent(m_instrumentingAgents.get(), m_inspectorAgent.get(), m_state.get(), m_injectedScriptManager.get(), m_domAgent.get())))
     87    , m_consoleAgent(adoptPtr(new PageConsoleAgent(m_instrumentingAgents.get(), m_inspectorAgent.get(), m_state.get(), m_injectedScriptManager.get(), m_domAgent.get())))
    11388#if ENABLE(JAVASCRIPT_DEBUGGER)
    11489    , m_debuggerAgent(PageDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), page, m_injectedScriptManager.get()))
  • trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp

    • Property svn:executable deleted
  • trunk/Source/WebCore/inspector/InspectorStyleTextEditor.h

    • Property svn:executable deleted
  • trunk/Source/WebCore/inspector/PageConsoleAgent.cpp

    • Property svn:executable deleted
    r101080 r101081  
    3030
    3131#include "config.h"
    32 #include "PageDebuggerAgent.h"
    3332
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     33#include "PageConsoleAgent.h"
    3534
    36 #include "PageScriptDebugServer.h"
     35#if ENABLE(INSPECTOR)
     36
     37#include "DOMWindow.h"
     38#include "InjectedScriptHost.h"
     39#include "InjectedScriptManager.h"
     40#include "InspectorAgent.h"
     41#include "InspectorDOMAgent.h"
    3742
    3843namespace WebCore {
    3944
    40 PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, Page* inspectedPage, InjectedScriptManager* injectedScriptManager)
    41 {
    42     return adoptPtr(new PageDebuggerAgent(instrumentingAgents, inspectorState, inspectedPage, injectedScriptManager));
    43 }
    44 
    45 PageDebuggerAgent::PageDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, Page* inspectedPage, InjectedScriptManager* injectedScriptManager)
    46     : InspectorDebuggerAgent(instrumentingAgents, inspectorState, injectedScriptManager)
    47     , m_inspectedPage(inspectedPage)
     45PageConsoleAgent::PageConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorAgent* inspectorAgent, InspectorState* state, InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
     46    : InspectorConsoleAgent(instrumentingAgents, state, injectedScriptManager)
     47    , m_inspectorAgent(inspectorAgent)
     48    , m_inspectorDOMAgent(domAgent)
    4849{
    4950}
    5051
    51 PageDebuggerAgent::~PageDebuggerAgent()
     52PageConsoleAgent::~PageConsoleAgent()
    5253{
     54    m_inspectorAgent = 0;
     55    m_inspectorDOMAgent = 0;
    5356}
    5457
    55 void PageDebuggerAgent::startListeningScriptDebugServer()
     58void PageConsoleAgent::clearMessages(ErrorString* errorString)
    5659{
    57     scriptDebugServer().addListener(this, m_inspectedPage);
     60    m_inspectorDOMAgent->releaseDanglingNodes();
     61    InspectorConsoleAgent::clearMessages(errorString);
    5862}
    5963
    60 void PageDebuggerAgent::stopListeningScriptDebugServer()
     64void PageConsoleAgent::addInspectedNode(ErrorString*, int nodeId)
    6165{
    62     scriptDebugServer().removeListener(this, m_inspectedPage);
     66    Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
     67    if (!node)
     68        return;
     69    m_injectedScriptManager->injectedScriptHost()->addInspectedNode(node);
    6370}
    6471
    65 PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer()
     72bool PageConsoleAgent::developerExtrasEnabled()
    6673{
    67     return PageScriptDebugServer::shared();
     74    return m_inspectorAgent->enabled();
    6875}
     76
    6977
    7078} // namespace WebCore
    7179
    72 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     80#endif // ENABLE(INSPECTOR)
  • trunk/Source/WebCore/inspector/PageConsoleAgent.h

    • Property svn:executable deleted
    r101080 r101081  
    2929 */
    3030
    31 #ifndef PageDebuggerAgent_h
    32 #define PageDebuggerAgent_h
     31#ifndef PageConsoleAgent_h
     32#define PageConsoleAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    35 #include "InspectorDebuggerAgent.h"
    36 #include "PageScriptDebugServer.h"
     34#include "InspectorConsoleAgent.h"
     35
     36#if ENABLE(INSPECTOR)
    3737
    3838namespace WebCore {
    3939
    40 class Page;
    41 class PageScriptDebugServer;
     40class InspectorAgent;
     41class InspectorDOMAgent;
    4242
    43 class PageDebuggerAgent : public InspectorDebuggerAgent {
    44     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
    45     WTF_MAKE_FAST_ALLOCATED;
     43class PageConsoleAgent : public InspectorConsoleAgent {
     44    WTF_MAKE_NONCOPYABLE(PageConsoleAgent);
    4645public:
    47     static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    48     virtual ~PageDebuggerAgent();
     46    PageConsoleAgent(InstrumentingAgents*, InspectorAgent*, InspectorState*, InjectedScriptManager*, InspectorDOMAgent*);
     47    virtual ~PageConsoleAgent();
    4948
    5049private:
    51     virtual void startListeningScriptDebugServer();
    52     virtual void stopListeningScriptDebugServer();
    53     virtual PageScriptDebugServer& scriptDebugServer();
     50    virtual void clearMessages(ErrorString*);
     51    virtual void addInspectedNode(ErrorString*, int nodeId);
     52    virtual bool developerExtrasEnabled();
    5453
    55     PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    56     Page* const m_inspectedPage;
     54    InspectorAgent* m_inspectorAgent;
     55    InspectorDOMAgent* m_inspectorDOMAgent;
    5756};
    5857
    5958} // namespace WebCore
    6059
    61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     60#endif // ENABLE(INSPECTOR)
    6261
    63 #endif // !defined(PageDebuggerAgent_h)
     62#endif // !defined(PageConsoleAgent_h)
  • trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp

    • Property svn:executable deleted
  • trunk/Source/WebCore/inspector/PageDebuggerAgent.h

    • Property svn:executable deleted
  • trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp

    • Property svn:executable deleted
    r101080 r101081  
    2929 */
    3030
    31 #ifndef PageDebuggerAgent_h
    32 #define PageDebuggerAgent_h
     31#include "config.h"
    3332
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    35 #include "InspectorDebuggerAgent.h"
    36 #include "PageScriptDebugServer.h"
     33#include "PageRuntimeAgent.h"
     34
     35#if ENABLE(INSPECTOR)
     36
     37#include "InspectorPageAgent.h"
     38#include "Page.h"
     39#include "ScriptState.h"
    3740
    3841namespace WebCore {
    3942
    40 class Page;
    41 class PageScriptDebugServer;
     43PageRuntimeAgent::PageRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, Page* page, InspectorPageAgent* pageAgent)
     44    : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager)
     45    , m_inspectedPage(page)
     46    , m_pageAgent(pageAgent)
     47{
     48}
    4249
    43 class PageDebuggerAgent : public InspectorDebuggerAgent {
    44     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
    45     WTF_MAKE_FAST_ALLOCATED;
    46 public:
    47     static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    48     virtual ~PageDebuggerAgent();
     50PageRuntimeAgent::~PageRuntimeAgent()
     51{
     52}
    4953
    50 private:
    51     virtual void startListeningScriptDebugServer();
    52     virtual void stopListeningScriptDebugServer();
    53     virtual PageScriptDebugServer& scriptDebugServer();
     54ScriptState* PageRuntimeAgent::scriptStateForFrameId(const String& frameId)
     55{
     56    Frame* frame = m_pageAgent->frameForId(frameId);
     57    if (!frame)
     58        return 0;
     59    return mainWorldScriptState(frame);
     60}
    5461
    55     PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    56     Page* const m_inspectedPage;
    57 };
     62ScriptState* PageRuntimeAgent::getDefaultInspectedState()
     63{
     64    return mainWorldScriptState(m_inspectedPage->mainFrame());
     65}
    5866
    5967} // namespace WebCore
    6068
    61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    62 
    63 #endif // !defined(PageDebuggerAgent_h)
     69#endif // ENABLE(INSPECTOR)
  • trunk/Source/WebCore/inspector/PageRuntimeAgent.h

    • Property svn:executable deleted
    r101080 r101081  
    2929 */
    3030
    31 #ifndef PageDebuggerAgent_h
    32 #define PageDebuggerAgent_h
     31#ifndef PageRuntimeAgent_h
     32#define PageRuntimeAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    35 #include "InspectorDebuggerAgent.h"
    36 #include "PageScriptDebugServer.h"
     34#if ENABLE(INSPECTOR)
     35
     36#include "InspectorRuntimeAgent.h"
    3737
    3838namespace WebCore {
    3939
     40class InspectorPageAgent;
    4041class Page;
    41 class PageScriptDebugServer;
    4242
    43 class PageDebuggerAgent : public InspectorDebuggerAgent {
    44     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
    45     WTF_MAKE_FAST_ALLOCATED;
     43class PageRuntimeAgent : public InspectorRuntimeAgent {
    4644public:
    47     static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    48     virtual ~PageDebuggerAgent();
     45    PageRuntimeAgent(InstrumentingAgents*, InjectedScriptManager*, Page*, InspectorPageAgent*);
     46    virtual ~PageRuntimeAgent();
    4947
    5048private:
    51     virtual void startListeningScriptDebugServer();
    52     virtual void stopListeningScriptDebugServer();
    53     virtual PageScriptDebugServer& scriptDebugServer();
    54 
    55     PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    56     Page* const m_inspectedPage;
     49    virtual ScriptState* scriptStateForFrameId(const String& frameId);
     50    virtual ScriptState* getDefaultInspectedState();
     51    Page* m_inspectedPage;
     52    InspectorPageAgent* m_pageAgent;
    5753};
    5854
    5955} // namespace WebCore
    6056
    61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     57#endif // ENABLE(INSPECTOR)
    6258
    63 #endif // !defined(PageDebuggerAgent_h)
     59#endif // !defined(InspectorPagerAgent_h)
  • trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp

    • Property svn:executable deleted
    r101080 r101081  
    2929 */
    3030
    31 #ifndef PageDebuggerAgent_h
    32 #define PageDebuggerAgent_h
     31#include "config.h"
    3332
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    35 #include "InspectorDebuggerAgent.h"
    36 #include "PageScriptDebugServer.h"
     33#include "WorkerConsoleAgent.h"
     34
     35#if ENABLE(INSPECTOR)
    3736
    3837namespace WebCore {
    3938
    40 class Page;
    41 class PageScriptDebugServer;
     39WorkerConsoleAgent::WorkerConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, InjectedScriptManager* injectedScriptManager)
     40    : InspectorConsoleAgent(instrumentingAgents, state, injectedScriptManager)
     41{
     42}
    4243
    43 class PageDebuggerAgent : public InspectorDebuggerAgent {
    44     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
    45     WTF_MAKE_FAST_ALLOCATED;
    46 public:
    47     static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    48     virtual ~PageDebuggerAgent();
     44WorkerConsoleAgent::~WorkerConsoleAgent()
     45{
     46}
    4947
    50 private:
    51     virtual void startListeningScriptDebugServer();
    52     virtual void stopListeningScriptDebugServer();
    53     virtual PageScriptDebugServer& scriptDebugServer();
     48void WorkerConsoleAgent::addInspectedNode(ErrorString* error, int)
     49{
     50    *error = "addInspectedNode is not supported for workers";
     51}
    5452
    55     PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    56     Page* const m_inspectedPage;
    57 };
     53bool WorkerConsoleAgent::developerExtrasEnabled()
     54{
     55    return true;
     56}
    5857
    5958} // namespace WebCore
    6059
    61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    62 
    63 #endif // !defined(PageDebuggerAgent_h)
     60#endif // ENABLE(INSPECTOR)
  • trunk/Source/WebCore/inspector/WorkerConsoleAgent.h

    • Property svn:executable deleted
    r101080 r101081  
    2929 */
    3030
    31 #ifndef PageDebuggerAgent_h
    32 #define PageDebuggerAgent_h
     31#ifndef WorkerConsoleAgent_h
     32#define WorkerConsoleAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    35 #include "InspectorDebuggerAgent.h"
    36 #include "PageScriptDebugServer.h"
     34#include "InspectorConsoleAgent.h"
     35
     36#if ENABLE(INSPECTOR)
    3737
    3838namespace WebCore {
    3939
    40 class Page;
    41 class PageScriptDebugServer;
    42 
    43 class PageDebuggerAgent : public InspectorDebuggerAgent {
    44     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
    45     WTF_MAKE_FAST_ALLOCATED;
     40class WorkerConsoleAgent : public InspectorConsoleAgent {
     41    WTF_MAKE_NONCOPYABLE(WorkerConsoleAgent);
    4642public:
    47     static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    48     virtual ~PageDebuggerAgent();
     43    WorkerConsoleAgent(InstrumentingAgents*, InspectorState*, InjectedScriptManager*);
     44    virtual ~WorkerConsoleAgent();
    4945
    5046private:
    51     virtual void startListeningScriptDebugServer();
    52     virtual void stopListeningScriptDebugServer();
    53     virtual PageScriptDebugServer& scriptDebugServer();
    54 
    55     PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    56     Page* const m_inspectedPage;
     47    virtual void addInspectedNode(ErrorString*, int nodeId);
     48    virtual bool developerExtrasEnabled();
    5749};
    5850
    5951} // namespace WebCore
    6052
    61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     53#endif // ENABLE(INSPECTOR)
    6254
    63 #endif // !defined(PageDebuggerAgent_h)
     55#endif // !defined(WorkerConsoleAgent_h)
  • trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp

    • Property svn:executable deleted
  • trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h

    • Property svn:executable deleted
  • trunk/Source/WebCore/inspector/WorkerInspectorController.cpp

    r98237 r101081  
    4141#include "InspectorFrontend.h"
    4242#include "InspectorFrontendChannel.h"
    43 #include "InspectorRuntimeAgent.h"
    4443#include "InspectorState.h"
    4544#include "InspectorStateClient.h"
    4645#include "InstrumentingAgents.h"
     46#include "WorkerConsoleAgent.h"
    4747#include "WorkerContext.h"
    4848#include "WorkerDebuggerAgent.h"
    4949#include "WorkerReportingProxy.h"
     50#include "WorkerRuntimeAgent.h"
    5051#include "WorkerThread.h"
    5152#include <wtf/PassOwnPtr.h>
     
    5455
    5556namespace {
    56 
    57 class WorkerRuntimeAgent : public InspectorRuntimeAgent {
    58 public:
    59     WorkerRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, WorkerContext* workerContext)
    60         : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager)
    61         , m_workerContext(workerContext) { }
    62     virtual ~WorkerRuntimeAgent() { }
    63 
    64 private:
    65     virtual ScriptState* scriptStateForFrameId(const String&)
    66     {
    67         return 0;
    68     }
    69 
    70     virtual ScriptState* getDefaultInspectedState()
    71     {
    72         return scriptStateFromWorkerContext(m_workerContext);
    73     }
    74 
    75     WorkerContext* m_workerContext;
    76 };
    7757
    7858class PageInspectorProxy : public InspectorFrontendChannel {
     
    11595#endif
    11696    , m_runtimeAgent(adoptPtr(new WorkerRuntimeAgent(m_instrumentingAgents.get(), m_injectedScriptManager.get(), workerContext)))
     97    , m_consoleAgent(adoptPtr(new WorkerConsoleAgent(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get())))
    11798{
    11899    m_injectedScriptManager->injectedScriptHost()->init(0
  • trunk/Source/WebCore/inspector/WorkerInspectorController.h

    r97449 r101081  
    4747#endif
    4848class InspectorBackendDispatcher;
     49class InspectorConsoleAgent;
    4950class InspectorFrontend;
    5051class InspectorFrontendChannel;
     
    8384#endif
    8485    OwnPtr<InspectorRuntimeAgent> m_runtimeAgent;
     86    OwnPtr<InspectorConsoleAgent> m_consoleAgent;
    8587
    8688    OwnPtr<InspectorFrontendChannel> m_frontendChannel;
  • trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp

    • Property svn:executable deleted
    r101080 r101081  
    2929 */
    3030
    31 #ifndef PageDebuggerAgent_h
    32 #define PageDebuggerAgent_h
     31#include "config.h"
    3332
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    35 #include "InspectorDebuggerAgent.h"
    36 #include "PageScriptDebugServer.h"
     33#include "WorkerRuntimeAgent.h"
     34
     35#if ENABLE(INSPECTOR)
     36
     37#include "ScriptState.h"
    3738
    3839namespace WebCore {
    3940
    40 class Page;
    41 class PageScriptDebugServer;
     41WorkerRuntimeAgent::WorkerRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, WorkerContext* workerContext)
     42    : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager)
     43    , m_workerContext(workerContext)
     44{
     45}
    4246
    43 class PageDebuggerAgent : public InspectorDebuggerAgent {
    44     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
    45     WTF_MAKE_FAST_ALLOCATED;
    46 public:
    47     static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    48     virtual ~PageDebuggerAgent();
     47WorkerRuntimeAgent::~WorkerRuntimeAgent()
     48{
     49}
    4950
    50 private:
    51     virtual void startListeningScriptDebugServer();
    52     virtual void stopListeningScriptDebugServer();
    53     virtual PageScriptDebugServer& scriptDebugServer();
     51ScriptState* WorkerRuntimeAgent::scriptStateForFrameId(const String&)
     52{
     53    return 0;
     54}
    5455
    55     PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    56     Page* const m_inspectedPage;
    57 };
     56ScriptState* WorkerRuntimeAgent::getDefaultInspectedState()
     57{
     58    return scriptStateFromWorkerContext(m_workerContext);
     59}
    5860
    5961} // namespace WebCore
    6062
    61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    62 
    63 #endif // !defined(PageDebuggerAgent_h)
     63#endif // ENABLE(INSPECTOR)
  • trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h

    • Property svn:executable deleted
    r101080 r101081  
    2929 */
    3030
    31 #ifndef PageDebuggerAgent_h
    32 #define PageDebuggerAgent_h
     31#ifndef WorkerRuntimeAgent_h
     32#define WorkerRuntimeAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
    35 #include "InspectorDebuggerAgent.h"
    36 #include "PageScriptDebugServer.h"
     34#if ENABLE(INSPECTOR)
     35
     36#include "InspectorRuntimeAgent.h"
    3737
    3838namespace WebCore {
    3939
    40 class Page;
    41 class PageScriptDebugServer;
     40class WorkerContext;
    4241
    43 class PageDebuggerAgent : public InspectorDebuggerAgent {
    44     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
    45     WTF_MAKE_FAST_ALLOCATED;
     42class WorkerRuntimeAgent : public InspectorRuntimeAgent {
    4643public:
    47     static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    48     virtual ~PageDebuggerAgent();
     44    WorkerRuntimeAgent(InstrumentingAgents*, InjectedScriptManager*, WorkerContext*);
     45    virtual ~WorkerRuntimeAgent();
    4946
    5047private:
    51     virtual void startListeningScriptDebugServer();
    52     virtual void stopListeningScriptDebugServer();
    53     virtual PageScriptDebugServer& scriptDebugServer();
    54 
    55     PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);
    56     Page* const m_inspectedPage;
     48    virtual ScriptState* scriptStateForFrameId(const String& frameId);
     49    virtual ScriptState* getDefaultInspectedState();
     50    WorkerContext* m_workerContext;
    5751};
    5852
    5953} // namespace WebCore
    6054
    61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     55#endif // ENABLE(INSPECTOR)
    6256
    63 #endif // !defined(PageDebuggerAgent_h)
     57#endif // !defined(InspectorPagerAgent_h)
Note: See TracChangeset for help on using the changeset viewer.