Title: [100904] trunk/Source/WebKit/win
- Revision
- 100904
- Author
- [email protected]
- Date
- 2011-11-21 05:20:30 -0800 (Mon, 21 Nov 2011)
Log Message
2011-11-21 Pavel Feldman <[email protected]>
Not reviewed: an attempt to fix windows build.
* WebInspector.cpp:
(WebInspector::isJavaScriptProfilingEnabled):
(WebInspector::setJavaScriptProfilingEnabled):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (100903 => 100904)
--- trunk/Source/WebKit/win/ChangeLog 2011-11-21 12:54:59 UTC (rev 100903)
+++ trunk/Source/WebKit/win/ChangeLog 2011-11-21 13:20:30 UTC (rev 100904)
@@ -1,3 +1,11 @@
+2011-11-21 Pavel Feldman <[email protected]>
+
+ Not reviewed: an attempt to fix windows build.
+
+ * WebInspector.cpp:
+ (WebInspector::isJavaScriptProfilingEnabled):
+ (WebInspector::setJavaScriptProfilingEnabled):
+
2011-06-20 Pavel Feldman <[email protected]>
Web Inspector: introduce InspectorFrontendAPI for actions initiated from the application menu.
Modified: trunk/Source/WebKit/win/WebInspector.cpp (100903 => 100904)
--- trunk/Source/WebKit/win/WebInspector.cpp 2011-11-21 12:54:59 UTC (rev 100903)
+++ trunk/Source/WebKit/win/WebInspector.cpp 2011-11-21 13:20:30 UTC (rev 100904)
@@ -210,21 +210,31 @@
*isProfilingEnabled = FALSE;
- if (!frontendClient())
+ if (!m_webView)
return S_OK;
- *isProfilingEnabled = frontendClient()->isJavaScriptProfilingEnabled();
+ Page* page = m_webView->page();
+ if (!page)
+ return S_OK;
+
+ *isProfilingEnabled = page->inspectorController()->profilerEnabled();
return S_OK;
}
HRESULT STDMETHODCALLTYPE WebInspector::setJavaScriptProfilingEnabled(BOOL enabled)
{
- show();
+ if (!m_webView)
+ return S_OK;
- if (!frontendClient())
+ Page* page = m_webView->page();
+ if (!page)
return S_OK;
- frontendClient()->setJavaScriptProfilingEnabled(enabled);
+ if (enabled)
+ page->inspectorController()->enableProfiler();
+ else
+ page->inspectorController()->disableProfiler();
+
return S_OK;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
