Attachment #63876 for bug #43711

View Details Raw Unified Return to Bug 43711



2010-08-09  Ilya Tikhonovsky  <loislo@chromium.org>

        Reviewed by NOBODY (OOPS!).

        WebInspector: Current implementation of showPanel is a bit complicated.
        It is using internal enum for all the panels and this is the problem because
        we should change a lot of code for a new panel.
        https://bugs.webkit.org/show_bug.cgi?id=43711
        
        * inspector/debugger-breakpoints-not-activated-on-reload.html:
        * inspector/debugger-cyclic-ref.html:
        * inspector/debugger-eval-while-paused.html:
        * inspector/debugger-no-nested-pause.html:
        * inspector/debugger-pause-in-eval-script.html:
        * inspector/debugger-pause-on-debugger-statement.html:
        * inspector/debugger-proto-property.html:
        * inspector/elements-panel-limited-children.html:

2010-08-05  MORITA Hajime  <morrita@google.com>

        Reviewed by Tony Chang.

Lines 21-27 function frontend_testBreakpointsNotActivatedOnReload(testController) a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html_sec1
- a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html -1 / +1 lines
21		21
22	testController.waitUntilDone();	22	testController.waitUntilDone();
23		23
24	WebInspector.showScriptsPanel();	24	WebInspector.showPanel("scripts");
25	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);	25	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);
26		26
27	function debuggerWasEnabledCallback()	27	function debuggerWasEnabledCallback()

Lines 21-27 function frontend_testDebugObjectWithCyclicRef(testController) a/LayoutTests/inspector/debugger-cyclic-ref.html_sec1
- a/LayoutTests/inspector/debugger-cyclic-ref.html -1 / +1 lines
21	{	21	{
22	testController.waitUntilDone();	22	testController.waitUntilDone();
23		23
24	WebInspector.showScriptsPanel();	24	WebInspector.showPanel("scripts");
25	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);	25	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);
26		26
27	function debuggerWasEnabledCallback()	27	function debuggerWasEnabledCallback()

Lines 25-31 function frontend_testPauseOnDebuggerStatement(testController) a/LayoutTests/inspector/debugger-eval-while-paused.html_sec1
- a/LayoutTests/inspector/debugger-eval-while-paused.html -1 / +1 lines
25	{	25	{
26	testController.waitUntilDone();	26	testController.waitUntilDone();
27		27
28	WebInspector.showScriptsPanel();	28	WebInspector.showPanel("scripts");
29	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);	29	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);
30		30
31	function debuggerWasEnabledCallback()	31	function debuggerWasEnabledCallback()

Lines 20-26 function frontend_testNoNestedPause(testController) a/LayoutTests/inspector/debugger-no-nested-pause.html_sec1
- a/LayoutTests/inspector/debugger-no-nested-pause.html -1 / +1 lines
20	{	20	{
21	testController.waitUntilDone();	21	testController.waitUntilDone();
22		22
23	WebInspector.showScriptsPanel();	23	WebInspector.showPanel("scripts");
24	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);	24	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);
25		25
26	function debuggerWasEnabledCallback()	26	function debuggerWasEnabledCallback()

Lines 13-19 function frontend_testPauseOnDebuggerStatement(testController) a/LayoutTests/inspector/debugger-pause-in-eval-script.html_sec1
- a/LayoutTests/inspector/debugger-pause-in-eval-script.html -1 / +1 lines
13	{	13	{
14	testController.waitUntilDone();	14	testController.waitUntilDone();
15		15
16	WebInspector.showScriptsPanel();	16	WebInspector.showPanel("scripts");
17		17
18	var scriptToEvaluate = "function testFunction() {\n" +	18	var scriptToEvaluate = "function testFunction() {\n" +
19	" debugger;\n" +	19	" debugger;\n" +

Lines 17-23 function frontend_testPauseOnDebuggerStatement(testController) a/LayoutTests/inspector/debugger-pause-on-debugger-statement.html_sec1
- a/LayoutTests/inspector/debugger-pause-on-debugger-statement.html -1 / +1 lines
17	{	17	{
18	testController.waitUntilDone();	18	testController.waitUntilDone();
19		19
20	WebInspector.showScriptsPanel();	20	WebInspector.showPanel("scripts");
21	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);	21	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);
22		22
23	function debuggerWasEnabledCallback()	23	function debuggerWasEnabledCallback()

Lines 25-31 function frontend_testProtoPropertyOnPause(testController) a/LayoutTests/inspector/debugger-proto-property.html_sec1
- a/LayoutTests/inspector/debugger-proto-property.html -1 / +1 lines
25	{	25	{
26	testController.waitUntilDone();	26	testController.waitUntilDone();
27		27
28	WebInspector.showScriptsPanel();	28	WebInspector.showPanel("scripts");
29	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);	29	frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);
30		30
31	function debuggerWasEnabledCallback()	31	function debuggerWasEnabledCallback()

Lines 125-130 function frontend_revealAndExpandDataNodeInElementsPanel(testController) a/LayoutTests/inspector/elements-panel-limited-children.html_sec1
- a/LayoutTests/inspector/elements-panel-limited-children.html +1 lines
125		125
126	function frontend_loadDOM(testController)	126	function frontend_loadDOM(testController)
127	{	127	{
		128	WebInspector.showPanel("elements");
128	testController.waitUntilDone();	129	testController.waitUntilDone();
129	// Need test to be async to expand whole the tree first.	130	// Need test to be async to expand whole the tree first.
130	try {	131	try {



2010-08-09  Ilya Tikhonovsky  <loislo@chromium.org>

        Reviewed by NOBODY (OOPS!).

        WebInspector: Current implementation of showPanel is a bit complicated.
        It is using internal enum for all the panels and this is the problem because
        we should change a lot of code for a new panel.
        https://bugs.webkit.org/show_bug.cgi?id=43711
        
        * WebCore.exp.in:
        * inspector/Inspector.idl:
        * inspector/InspectorController.cpp:
        (WebCore::InspectorController::InspectorController):
        (WebCore::InspectorController::storeLastActivePanel):
        (WebCore::InspectorController::connectFrontend):
        (WebCore::InspectorController::showPanel):
        (WebCore::InspectorController::disconnectFrontend):
        * inspector/InspectorController.h:
        * inspector/InspectorFrontend.cpp:
        * inspector/InspectorFrontend.h:
        * inspector/front-end/ElementsTreeOutline.js:
        (WebInspector.ElementsTreeElement.prototype.selectOnMouseDown):
        * inspector/front-end/ExtensionServer.js:
        (WebInspector.ExtensionServer.prototype._onRevealAndSelectResource):
        * inspector/front-end/inspector.js:
        (WebInspector.documentClick.followLink):
        (WebInspector.documentClick):
        (WebInspector.toggleSearchingForNode):
        (WebInspector.showPanel):
        (WebInspector.selectDatabase):
        (WebInspector.selectDOMStorage):
        (WebInspector.showProfileForURL):

2010-08-08  Kevin Ollivier  <kevino@theolliviers.com>

        [wx] Build fix, add member needed to compile Mac-specific font code.

Lines 60-65 module core { a/WebCore/inspector/Inspector.idl_sec1
- a/WebCore/inspector/Inspector.idl +1 lines
60	[notify] void setChildNodes(out long parentId, out Array nodes);	60	[notify] void setChildNodes(out long parentId, out Array nodes);
61	[notify] void setDetachedRoot(out Object root);	61	[notify] void setDetachedRoot(out Object root);
62	[notify] void setDocument(out Value root);	62	[notify] void setDocument(out Value root);
		63	[notify] void showPanel(out String panel);
63	[notify] void timelineProfilerWasStarted();	64	[notify] void timelineProfilerWasStarted();
64	[notify] void timelineProfilerWasStopped();	65	[notify] void timelineProfilerWasStopped();
65	[notify] void updateConsoleMessageExpiredCount(out unsigned long count);	66	[notify] void updateConsoleMessageExpiredCount(out unsigned long count);



static const char* const debuggerEnabledSettingName = "debuggerEnabled";
static const char* const profilerEnabledSettingName = "profilerEnabled";
static const char* const inspectorAttachedHeightName = "inspectorAttachedHeight";
static const char* const lastActivePanel = "lastActivePanel";
const char* const InspectorController::ElementsPanel = "elements";
const char* const InspectorController::ConsolePanel = "console";
const char* const InspectorController::ScriptsPanel = "scripts";
const char* const InspectorController::ProfilesPanel = "profiles";

static const char* const monitoringXHRSettingName = "xhrMonitor";

int connectedFrontendCount = 0;

    , m_openingFrontend(false)
    , m_cssStore(new InspectorCSSStore(this))
    , m_expiredConsoleMessageCount(0)
    , m_showAfterVisible(lastActivePanel)
    , m_sessionSettings(InspectorObject::create())
    , m_groupLevel(0)
    , m_searchingForNode(false)


void InspectorController::storeLastActivePanel(const String& panelName)
{
    setSetting(lastActivePanel, panelName);
}

void InspectorController::mouseDidMoveOverElement(const HitTestResult& result, unsigned)

    }
#endif

    if (m_showAfterVisible == lastActivePanel)
        m_showAfterVisible = setting(lastActivePanel);
        m_showAfterVisible = specialPanelForJSName(lastActivePanelSetting);
    }

    if (m_nodeToFocus)
        focusNode();

    }
}

void InspectorController::showPanel(const String& panel)
{
    if (!enabled())
        return;

        return;
    }

    if (panel == lastActivePanel)
        return;

    m_remoteFrontend->showPanel(panel);
}

void InspectorController::close()

    unbindAllResources();
    stopTimelineProfiler();

    m_showAfterVisible = lastActivePanel;

    hideHighlight();


    return true;
}

InspectorController::SpecialPanels InspectorController::specialPanelForJSName(const String& panelName)
{
    if (panelName == "elements")
        return ElementsPanel;
    if (panelName == "resources")
        return ResourcesPanel;
    if (panelName == "scripts")
        return ScriptsPanel;
    if (panelName == "timeline")
        return TimelinePanel;
    if (panelName == "profiles")
        return ProfilesPanel;
    if (panelName == "storage" || panelName == "databases")
        return StoragePanel;
    if (panelName == "audits")
        return AuditsPanel;
    if (panelName == "console")
        return ConsolePanel;
    return ElementsPanel;
}

InjectedScript InspectorController::injectedScriptForNodeId(long id)
{




    typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
    typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;

    static const char* const ConsolePanel;
    static const char* const ElementsPanel;
    static const char* const ProfilesPanel;
    static const char* const ScriptsPanel;
        ElementsPanel,
        ResourcesPanel,
        ScriptsPanel,
        TimelinePanel,
        ProfilesPanel,
        StoragePanel
    } SpecialPanels;

    InspectorController(Page*, InspectorClient*);
    ~InspectorController();

    void hideDOMNodeHighlight() { hideHighlight(); }

    void show();
    void showPanel(const String&);
    void close();

    // We are in transition from JS transport via webInspector to native


    bool isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl);

    SpecialPanels specialPanelForJSName(const String& panelName);

    void didEvaluateForTestInFrontend(long callId, const String& jsonResult);

#if ENABLE(JAVASCRIPT_DEBUGGER)

#if ENABLE(DOM_STORAGE)
    DOMStorageResourcesMap m_domStorageResources;
#endif
    String m_showAfterVisible;
    RefPtr<Node> m_highlightedNode;
#if ENABLE(INSPECTOR)
    RefPtr<InspectorValue> m_sessionSettings;



    function.call();
}

void InspectorFrontend::showPanel(int panel)
{
    const char* showFunctionName;
    switch (panel) {
        case InspectorController::AuditsPanel:
            showFunctionName = "showAuditsPanel";
            break;
        case InspectorController::ConsolePanel:
            showFunctionName = "showConsolePanel";
            break;
        case InspectorController::ElementsPanel:
            showFunctionName = "showElementsPanel";
            break;
        case InspectorController::ResourcesPanel:
            showFunctionName = "showResourcesPanel";
            break;
        case InspectorController::TimelinePanel:
            showFunctionName = "showTimelinePanel";
            break;
        case InspectorController::ProfilesPanel:
            showFunctionName = "showProfilesPanel";
            break;
        case InspectorController::ScriptsPanel:
            showFunctionName = "showScriptsPanel";
            break;
        case InspectorController::StoragePanel:
            showFunctionName = "showStoragePanel";
            break;
        default:
            ASSERT_NOT_REACHED();
            showFunctionName = 0;
    }

    if (showFunctionName)
        callSimpleFunction(showFunctionName);
}

void InspectorFrontend::callSimpleFunction(const String& functionName)
{
    ScriptFunctionCall function(m_webInspector, "dispatch");

Lines 47-53 namespace WebCore { a/WebCore/inspector/InspectorFrontend.h_sec1
- a/WebCore/inspector/InspectorFrontend.h -1 lines
47	~InspectorFrontend();	47	~InspectorFrontend();
48		48
49	void close();	49	void close();
50	void showPanel(int panel);
51	ScriptState* scriptState() const { return m_webInspector.scriptState(); }	50	ScriptState* scriptState() const { return m_webInspector.scriptState(); }
52	private:	51	private:
53	void callSimpleFunction(const String& functionName);	52	void callSimpleFunction(const String& functionName);

Lines 683-689 WebInspector.ElementsTreeElement.prototype = { a/WebCore/inspector/front-end/ElementsTreeOutline.js_sec1
- a/WebCore/inspector/front-end/ElementsTreeOutline.js -1 / +1 lines
683	return;	683	return;
684		684
685	if (this.treeOutline.showInElementsPanelEnabled) {	685	if (this.treeOutline.showInElementsPanelEnabled) {
686	WebInspector.showElementsPanel();	686	WebInspector.showPanel("elements");
687	WebInspector.panels.elements.focusedDOMNode = this.representedObject;	687	WebInspector.panels.elements.focusedDOMNode = this.representedObject;
688	}	688	}
689		689

Lines 213-219 WebInspector.ExtensionServer.prototype = { a/WebCore/inspector/front-end/ExtensionServer.js_sec1
- a/WebCore/inspector/front-end/ExtensionServer.js -1 / +1 lines
213	if (!resource)	213	if (!resource)
214	return this._status.E_NOTFOUND(typeof id + ": " + id);	214	return this._status.E_NOTFOUND(typeof id + ": " + id);
215	WebInspector.panels.resources.showResource(resource, message.line);	215	WebInspector.panels.resources.showResource(resource, message.line);
216	WebInspector.showResourcesPanel();	216	WebInspector.showPanel("resources");
217	},	217	},
218		218
219	_dispatchCallback: function(requestId, port, result)	219	_dispatchCallback: function(requestId, port, result)



            return;
        }

        WebInspector.showPanel("resources");
    }

    if (WebInspector.followLinkTimeout)

WebInspector.toggleSearchingForNode = function()
{
    if (this.panels.elements) {
        this.showPanel("elements");
        this.panels.elements.toggleSearchingForNode();
    }
}

    this.drawer.showView(this.changes);
}

WebInspector.showPanel = function(panel)
{
    if (!(panel in this.panels)) {
        console.error("Unable to show %s panel.", panel);
        panel = "elements";
    }
    this.currentPanel = this.panels[panel];
    this.currentPanel = this.panels.resources;
}

WebInspector.showScriptsPanel = function()
{
    this.currentPanel = this.panels.scripts;
}

WebInspector.showTimelinePanel = function()
{
    this.currentPanel = this.panels.timeline;
}

WebInspector.showProfilesPanel = function()
{
    this.currentPanel = this.panels.profiles;
}

WebInspector.showStoragePanel = function()
{
    this.currentPanel = this.panels.storage;
}

WebInspector.showConsolePanel = function()
{
    this.currentPanel = this.panels.console;
}

WebInspector.showAuditsPanel = function()
{
    this.currentPanel = this.panels.audits;
}

WebInspector.selectDatabase = function(o)
{
    WebInspector.showPanel("storage");
    WebInspector.panels.storage.selectDatabase(o);
}

WebInspector.selectDOMStorage = function(o)
{
    WebInspector.showPanel("storage");
    WebInspector.panels.storage.selectDOMStorage(o);
}



WebInspector.showProfileForURL = function(url)
{
    WebInspector.showPanel("profiles");
    WebInspector.panels.profiles.showProfileForURL(url);
}


Return to Bug 43711

Lines 119-125 static const char* const resourceTrackingEnabledSettingName = "resourceTrackingE a/WebCore/inspector/InspectorController.cpp_sec1
- a/WebCore/inspector/InspectorController.cpp -32 / +14 lines
119	static const char* const debuggerEnabledSettingName = "debuggerEnabled";	119	static const char* const debuggerEnabledSettingName = "debuggerEnabled";
120	static const char* const profilerEnabledSettingName = "profilerEnabled";	120	static const char* const profilerEnabledSettingName = "profilerEnabled";
121	static const char* const inspectorAttachedHeightName = "inspectorAttachedHeight";	121	static const char* const inspectorAttachedHeightName = "inspectorAttachedHeight";
122	static const char* const lastActivePanelSettingName = "lastActivePanel";	122	static const char* const lastActivePanel = "lastActivePanel";
		123	const char* const InspectorController::ElementsPanel = "elements";
		124	const char* const InspectorController::ConsolePanel = "console";
		125	const char* const InspectorController::ScriptsPanel = "scripts";
		126	const char* const InspectorController::ProfilesPanel = "profiles";
		127
123	static const char* const monitoringXHRSettingName = "xhrMonitor";	128	static const char* const monitoringXHRSettingName = "xhrMonitor";
124		129
125	int connectedFrontendCount = 0;	130	int connectedFrontendCount = 0;
Lines 150-156 InspectorController::InspectorController(Page* page, InspectorClient* client) a/WebCore/inspector/InspectorController.cpp_sec2
150	, m_openingFrontend(false)	155	, m_openingFrontend(false)
151	, m_cssStore(new InspectorCSSStore(this))	156	, m_cssStore(new InspectorCSSStore(this))
152	, m_expiredConsoleMessageCount(0)	157	, m_expiredConsoleMessageCount(0)
153	, m_showAfterVisible(CurrentPanel)	158	, m_showAfterVisible(lastActivePanel)
154	, m_sessionSettings(InspectorObject::create())	159	, m_sessionSettings(InspectorObject::create())
155	, m_groupLevel(0)	160	, m_groupLevel(0)
156	, m_searchingForNode(false)	161	, m_searchingForNode(false)
Lines 381-387 void InspectorController::markTimeline(const String& message) a/WebCore/inspector/InspectorController.cpp_sec3
381		386
382	void InspectorController::storeLastActivePanel(const String& panelName)	387	void InspectorController::storeLastActivePanel(const String& panelName)
383	{	388	{
384	setSetting(lastActivePanelSettingName, panelName);	389	setSetting(lastActivePanel, panelName);
385	}	390	}
386		391
387	void InspectorController::mouseDidMoveOverElement(const HitTestResult& result, unsigned)	392	void InspectorController::mouseDidMoveOverElement(const HitTestResult& result, unsigned)
Lines 497-506 void InspectorController::connectFrontend(const ScriptObject& webInspector) a/WebCore/inspector/InspectorController.cpp_sec4
497	}	502	}
498	#endif	503	#endif
499		504
500	if (m_showAfterVisible == CurrentPanel) {	505	if (m_showAfterVisible == lastActivePanel)
501	String lastActivePanelSetting = setting(lastActivePanelSettingName);	506	m_showAfterVisible = setting(lastActivePanel);
502	m_showAfterVisible = specialPanelForJSName(lastActivePanelSetting);
503	}
504		507
505	if (m_nodeToFocus)	508	if (m_nodeToFocus)
506	focusNode();	509	focusNode();
Lines 531-537 void InspectorController::show() a/WebCore/inspector/InspectorController.cpp_sec5
531	}	534	}
532	}	535	}
533		536
534	void InspectorController::showPanel(SpecialPanels panel)	537	void InspectorController::showPanel(const String& panel)
535	{	538	{
536	if (!enabled())	539	if (!enabled())
537	return;	540	return;
Lines 543-552 void InspectorController::showPanel(SpecialPanels panel) a/WebCore/inspector/InspectorController.cpp_sec6
543	return;	546	return;
544	}	547	}
545		548
546	if (panel == CurrentPanel)	549	if (panel == lastActivePanel)
547	return;	550	return;
548		551
549	m_frontend->showPanel(panel);	552	m_remoteFrontend->showPanel(panel);
550	}	553	}
551		554
552	void InspectorController::close()	555	void InspectorController::close()
Lines 579-585 void InspectorController::disconnectFrontend() a/WebCore/inspector/InspectorController.cpp_sec7
579	unbindAllResources();	582	unbindAllResources();
580	stopTimelineProfiler();	583	stopTimelineProfiler();
581		584
582	m_showAfterVisible = CurrentPanel;	585	m_showAfterVisible = lastActivePanel;
583		586
584	hideHighlight();	587	hideHighlight();
585		588
Lines 1892-1918 bool InspectorController::stopTiming(const String& title, double& elapsed) a/WebCore/inspector/InspectorController.cpp_sec8
1892	return true;	1895	return true;
1893	}	1896	}
1894		1897
1895	InspectorController::SpecialPanels InspectorController::specialPanelForJSName(const String& panelName)
1896	{
1897	if (panelName == "elements")
1898	return ElementsPanel;
1899	if (panelName == "resources")
1900	return ResourcesPanel;
1901	if (panelName == "scripts")
1902	return ScriptsPanel;
1903	if (panelName == "timeline")
1904	return TimelinePanel;
1905	if (panelName == "profiles")
1906	return ProfilesPanel;
1907	if (panelName == "storage" \|\| panelName == "databases")
1908	return StoragePanel;
1909	if (panelName == "audits")
1910	return AuditsPanel;
1911	if (panelName == "console")
1912	return ConsolePanel;
1913	return ElementsPanel;
1914	}
1915
1916	InjectedScript InspectorController::injectedScriptForNodeId(long id)	1898	InjectedScript InspectorController::injectedScriptForNodeId(long id)
1917	{	1899	{
1918		1900

Lines 94-110 public: a/WebCore/inspector/InspectorController.h_sec1
- a/WebCore/inspector/InspectorController.h -15 / +6 lines
94	typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;	94	typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
95	typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;	95	typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
96		96
97	typedef enum {	97	static const char* const ConsolePanel;
98	AuditsPanel,	98	static const char* const ElementsPanel;
99	CurrentPanel,	99	static const char* const ProfilesPanel;
100	ConsolePanel,	100	static const char* const ScriptsPanel;
101	ElementsPanel,
102	ResourcesPanel,
103	ScriptsPanel,
104	TimelinePanel,
105	ProfilesPanel,
106	StoragePanel
107	} SpecialPanels;
108		101
109	InspectorController(Page, InspectorClient);	102	InspectorController(Page, InspectorClient);
110	~InspectorController();	103	~InspectorController();
Lines 134-140 public: a/WebCore/inspector/InspectorController.h_sec2
134	void hideDOMNodeHighlight() { hideHighlight(); }	127	void hideDOMNodeHighlight() { hideHighlight(); }
135		128
136	void show();	129	void show();
137	void showPanel(SpecialPanels);	130	void showPanel(const String&);
138	void close();	131	void close();
139		132
140	// We are in transition from JS transport via webInspector to native	133	// We are in transition from JS transport via webInspector to native
Lines 323-330 private: a/WebCore/inspector/InspectorController.h_sec3
323		316
324	bool isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl);	317	bool isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl);
325		318
326	SpecialPanels specialPanelForJSName(const String& panelName);
327
328	void didEvaluateForTestInFrontend(long callId, const String& jsonResult);	319	void didEvaluateForTestInFrontend(long callId, const String& jsonResult);
329		320
330	#if ENABLE(JAVASCRIPT_DEBUGGER)	321	#if ENABLE(JAVASCRIPT_DEBUGGER)
Lines 363-369 private: a/WebCore/inspector/InspectorController.h_sec4
363	#if ENABLE(DOM_STORAGE)	354	#if ENABLE(DOM_STORAGE)
364	DOMStorageResourcesMap m_domStorageResources;	355	DOMStorageResourcesMap m_domStorageResources;
365	#endif	356	#endif
366	SpecialPanels m_showAfterVisible;	357	String m_showAfterVisible;
367	RefPtr<Node> m_highlightedNode;	358	RefPtr<Node> m_highlightedNode;
368	#if ENABLE(INSPECTOR)	359	#if ENABLE(INSPECTOR)
369	RefPtr<InspectorValue> m_sessionSettings;	360	RefPtr<InspectorValue> m_sessionSettings;

Lines 691-697 WebInspector.documentClick = function(event) a/WebCore/inspector/front-end/inspector.js_sec1
- a/WebCore/inspector/front-end/inspector.js -42 / +11 lines
691	return;	691	return;
692	}	692	}
693		693
694	WebInspector.showResourcesPanel();	694	WebInspector.showPanel("resources");
695	}	695	}
696		696
697	if (WebInspector.followLinkTimeout)	697	if (WebInspector.followLinkTimeout)
Lines 1081-1087 WebInspector.elementDragEnd = function(event) a/WebCore/inspector/front-end/inspector.js_sec2
1081	WebInspector.toggleSearchingForNode = function()	1081	WebInspector.toggleSearchingForNode = function()
1082	{	1082	{
1083	if (this.panels.elements) {	1083	if (this.panels.elements) {
1084	this.showElementsPanel();	1084	this.showPanel("elements");
1085	this.panels.elements.toggleSearchingForNode();	1085	this.panels.elements.toggleSearchingForNode();
1086	}	1086	}
1087	}	1087	}
Lines 1096-1150 WebInspector.showChanges = function() a/WebCore/inspector/front-end/inspector.js_sec3
1096	this.drawer.showView(this.changes);	1096	this.drawer.showView(this.changes);
1097	}	1097	}
1098		1098
1099	WebInspector.showElementsPanel = function()	1099	WebInspector.showPanel = function(panel)
1100	{	1100	{
1101	this.currentPanel = this.panels.elements;	1101	if (!(panel in this.panels)) {
1102	}	1102	console.error("Unable to show %s panel.", panel);
1103		1103	panel = "elements";
1104	WebInspector.showResourcesPanel = function()	1104	}
1105	{	1105	this.currentPanel = this.panels[panel];
1106	this.currentPanel = this.panels.resources;
1107	}
1108
1109	WebInspector.showScriptsPanel = function()
1110	{
1111	this.currentPanel = this.panels.scripts;
1112	}
1113
1114	WebInspector.showTimelinePanel = function()
1115	{
1116	this.currentPanel = this.panels.timeline;
1117	}
1118
1119	WebInspector.showProfilesPanel = function()
1120	{
1121	this.currentPanel = this.panels.profiles;
1122	}
1123
1124	WebInspector.showStoragePanel = function()
1125	{
1126	this.currentPanel = this.panels.storage;
1127	}
1128
1129	WebInspector.showConsolePanel = function()
1130	{
1131	this.currentPanel = this.panels.console;
1132	}
1133
1134	WebInspector.showAuditsPanel = function()
1135	{
1136	this.currentPanel = this.panels.audits;
1137	}	1106	}
1138		1107
1139	WebInspector.selectDatabase = function(o)	1108	WebInspector.selectDatabase = function(o)
1140	{	1109	{
1141	WebInspector.showStoragePanel();	1110	WebInspector.showPanel("storage");
1142	WebInspector.panels.storage.selectDatabase(o);	1111	WebInspector.panels.storage.selectDatabase(o);
1143	}	1112	}
1144		1113
1145	WebInspector.selectDOMStorage = function(o)	1114	WebInspector.selectDOMStorage = function(o)
1146	{	1115	{
1147	WebInspector.showStoragePanel();	1116	WebInspector.showPanel("storage");
1148	WebInspector.panels.storage.selectDOMStorage(o);	1117	WebInspector.panels.storage.selectDOMStorage(o);
1149	}	1118	}
1150		1119
Lines 1742-1748 WebInspector.linkifyStringAsFragment = function(string) a/WebCore/inspector/front-end/inspector.js_sec4
1742		1711
1743	WebInspector.showProfileForURL = function(url)	1712	WebInspector.showProfileForURL = function(url)
1744	{	1713	{
1745	WebInspector.showProfilesPanel();	1714	WebInspector.showPanel("profiles");
1746	WebInspector.panels.profiles.showProfileForURL(url);	1715	WebInspector.panels.profiles.showProfileForURL(url);
1747	}	1716	}
1748		1717

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +18 lines
		1	2010-08-09 Ilya Tikhonovsky <loislo@chromium.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	WebInspector: Current implementation of showPanel is a bit complicated.
		6	It is using internal enum for all the panels and this is the problem because
		7	we should change a lot of code for a new panel.
		8	https://bugs.webkit.org/show_bug.cgi?id=43711
		9
		10	* inspector/debugger-breakpoints-not-activated-on-reload.html:
		11	* inspector/debugger-cyclic-ref.html:
		12	* inspector/debugger-eval-while-paused.html:
		13	* inspector/debugger-no-nested-pause.html:
		14	* inspector/debugger-pause-in-eval-script.html:
		15	* inspector/debugger-pause-on-debugger-statement.html:
		16	* inspector/debugger-proto-property.html:
		17	* inspector/elements-panel-limited-children.html:
		18
1	2010-08-05 MORITA Hajime <morrita@google.com>	19	2010-08-05 MORITA Hajime <morrita@google.com>
2		20
3	Reviewed by Tony Chang.	21	Reviewed by Tony Chang.

Lines 1-3 a/WebCore/ChangeLog_sec1
- a/WebCore/ChangeLog +33 lines
		1	2010-08-09 Ilya Tikhonovsky <loislo@chromium.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	WebInspector: Current implementation of showPanel is a bit complicated.
		6	It is using internal enum for all the panels and this is the problem because
		7	we should change a lot of code for a new panel.
		8	https://bugs.webkit.org/show_bug.cgi?id=43711
		9
		10	* WebCore.exp.in:
		11	* inspector/Inspector.idl:
		12	* inspector/InspectorController.cpp:
		13	(WebCore::InspectorController::InspectorController):
		14	(WebCore::InspectorController::storeLastActivePanel):
		15	(WebCore::InspectorController::connectFrontend):
		16	(WebCore::InspectorController::showPanel):
		17	(WebCore::InspectorController::disconnectFrontend):
		18	* inspector/InspectorController.h:
		19	* inspector/InspectorFrontend.cpp:
		20	* inspector/InspectorFrontend.h:
		21	* inspector/front-end/ElementsTreeOutline.js:
		22	(WebInspector.ElementsTreeElement.prototype.selectOnMouseDown):
		23	* inspector/front-end/ExtensionServer.js:
		24	(WebInspector.ExtensionServer.prototype._onRevealAndSelectResource):
		25	* inspector/front-end/inspector.js:
		26	(WebInspector.documentClick.followLink):
		27	(WebInspector.documentClick):
		28	(WebInspector.toggleSearchingForNode):
		29	(WebInspector.showPanel):
		30	(WebInspector.selectDatabase):
		31	(WebInspector.selectDOMStorage):
		32	(WebInspector.showProfileForURL):
		33
1	2010-08-08 Kevin Ollivier <kevino@theolliviers.com>	34	2010-08-08 Kevin Ollivier <kevino@theolliviers.com>
2		35
3	[wx] Build fix, add member needed to compile Mac-specific font code.	36	[wx] Build fix, add member needed to compile Mac-specific font code.

Lines 422-428 __ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKNS_ a/WebCore/WebCore.exp.in_sec1
- a/WebCore/WebCore.exp.in -1 / +4 lines
422	__ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKNS_6StringEd	422	__ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKNS_6StringEd
423	__ZN7WebCore19BackForwardListImplC1EPNS_4PageE	423	__ZN7WebCore19BackForwardListImplC1EPNS_4PageE
424	__ZN7WebCore19CSSStyleDeclaration11setPropertyERKNS_6StringES3_Ri	424	__ZN7WebCore19CSSStyleDeclaration11setPropertyERKNS_6StringES3_Ri
		425	__ZN7WebCore19InspectorController12ConsolePanelE
		426	__ZN7WebCore19InspectorController12ScriptsPanelE
		427	__ZN7WebCore19InspectorController13ProfilesPanelE
425	__ZN7WebCore19InspectorController34inspectorStartsAttachedSettingNameEv	428	__ZN7WebCore19InspectorController34inspectorStartsAttachedSettingNameEv
		429	__ZN7WebCore19InspectorController9showPanelERKNS_6StringE
426	__ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE	430	__ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
427	__ZN7WebCore19ResourceRequestBase13setHTTPMethodERKNS_6StringE	431	__ZN7WebCore19ResourceRequestBase13setHTTPMethodERKNS_6StringE
428	__ZN7WebCore19ResourceRequestBase19addHTTPHeaderFieldsERKNS_13HTTPHeaderMapE	432	__ZN7WebCore19ResourceRequestBase19addHTTPHeaderFieldsERKNS_13HTTPHeaderMapE
Lines 1199-1205 __ZN7WebCore19InspectorController27startUserInitiatedProfilingEPNS_5TimerIS0_EE a/WebCore/WebCore.exp.in_sec2
1199	__ZN7WebCore19InspectorController4showEv	1203	__ZN7WebCore19InspectorController4showEv
1200	__ZN7WebCore19InspectorController5closeEv	1204	__ZN7WebCore19InspectorController5closeEv
1201	__ZN7WebCore19InspectorController7inspectEPNS_4NodeE	1205	__ZN7WebCore19InspectorController7inspectEPNS_4NodeE
1202	__ZN7WebCore19InspectorController9showPanelENS0_13SpecialPanelsE
1203	__ZN7WebCore28InspectorFrontendClientLocal12moveWindowByEff	1206	__ZN7WebCore28InspectorFrontendClientLocal12moveWindowByEff
1204	__ZN7WebCore28InspectorFrontendClientLocal14frontendLoadedEv	1207	__ZN7WebCore28InspectorFrontendClientLocal14frontendLoadedEv
1205	__ZN7WebCore28InspectorFrontendClientLocal15canAttachWindowEv	1208	__ZN7WebCore28InspectorFrontendClientLocal15canAttachWindowEv

Lines 57-99 void InspectorFrontend::close() a/WebCore/inspector/InspectorFrontend.cpp_sec1
- a/WebCore/inspector/InspectorFrontend.cpp -37 lines
57	function.call();	57	function.call();
58	}	58	}
59		59
60	void InspectorFrontend::showPanel(int panel)
61	{
62	const char* showFunctionName;
63	switch (panel) {
64	case InspectorController::AuditsPanel:
65	showFunctionName = "showAuditsPanel";
66	break;
67	case InspectorController::ConsolePanel:
68	showFunctionName = "showConsolePanel";
69	break;
70	case InspectorController::ElementsPanel:
71	showFunctionName = "showElementsPanel";
72	break;
73	case InspectorController::ResourcesPanel:
74	showFunctionName = "showResourcesPanel";
75	break;
76	case InspectorController::TimelinePanel:
77	showFunctionName = "showTimelinePanel";
78	break;
79	case InspectorController::ProfilesPanel:
80	showFunctionName = "showProfilesPanel";
81	break;
82	case InspectorController::ScriptsPanel:
83	showFunctionName = "showScriptsPanel";
84	break;
85	case InspectorController::StoragePanel:
86	showFunctionName = "showStoragePanel";
87	break;
88	default:
89	ASSERT_NOT_REACHED();
90	showFunctionName = 0;
91	}
92
93	if (showFunctionName)
94	callSimpleFunction(showFunctionName);
95	}
96
97	void InspectorFrontend::callSimpleFunction(const String& functionName)	60	void InspectorFrontend::callSimpleFunction(const String& functionName)
98	{	61	{
99	ScriptFunctionCall function(m_webInspector, "dispatch");	62	ScriptFunctionCall function(m_webInspector, "dispatch");