diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebKit/win/WebInspector.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebKit/win/WebInspector.cpp')
| -rw-r--r-- | Source/WebKit/win/WebInspector.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebKit/win/WebInspector.cpp b/Source/WebKit/win/WebInspector.cpp index c3823b2..ec35099 100644 --- a/Source/WebKit/win/WebInspector.cpp +++ b/Source/WebKit/win/WebInspector.cpp @@ -110,7 +110,7 @@ HRESULT STDMETHODCALLTYPE WebInspector::showConsole() { if (m_webView) if (Page* page = m_webView->page()) - page->inspectorController()->showPanel(InspectorController::ConsolePanel); + page->inspectorController()->showConsole(); return S_OK; } @@ -205,10 +205,9 @@ HRESULT STDMETHODCALLTYPE WebInspector::toggleProfilingJavaScript() InspectorController* inspector = page->inspectorController(); - if (inspector->isRecordingUserInitiatedProfile()) { + if (inspector->isRecordingUserInitiatedProfile()) inspector->stopUserInitiatedProfiling(); - inspector->showPanel(InspectorController::ProfilesPanel); - } else + else inspector->startUserInitiatedProfiling(); return S_OK; @@ -277,7 +276,7 @@ HRESULT STDMETHODCALLTYPE WebInspector::isTimelineProfilingEnabled(BOOL* isEnabl if (!page) return S_OK; - *isEnabled = page->inspectorController()->timelineAgent() != 0; + *isEnabled = page->inspectorController()->timelineProfilerEnabled(); return S_OK; } |