Title: [129438] trunk/Source/WebCore
- Revision
- 129438
- Author
- [email protected]
- Date
- 2012-09-24 18:05:43 -0700 (Mon, 24 Sep 2012)
Log Message
There is a mistake in InspectorProfilerAgent::enable(bool skipRecompile)
https://bugs.webkit.org/show_bug.cgi?id=97450
Patch by Peter Wang <[email protected]> on 2012-09-24
Reviewed by Yury Semikhatsky.
The "InspectorProfilerAgent::enable()" should invokes "PageScriptDebugServer" in
no-worker thread.
No new test case.
* inspector/InspectorProfilerAgent.cpp:
(WebCore::PageProfilerAgent::recompileScript):
(PageProfilerAgent):
(WebCore::WorkerProfilerAgent::recompileScript):
(WorkerProfilerAgent):
(WebCore::InspectorProfilerAgent::disable):
(WebCore::InspectorProfilerAgent::enable):
* inspector/InspectorProfilerAgent.h:
(InspectorProfilerAgent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129437 => 129438)
--- trunk/Source/WebCore/ChangeLog 2012-09-25 00:54:11 UTC (rev 129437)
+++ trunk/Source/WebCore/ChangeLog 2012-09-25 01:05:43 UTC (rev 129438)
@@ -1,3 +1,25 @@
+2012-09-24 Peter Wang <[email protected]>
+
+ There is a mistake in InspectorProfilerAgent::enable(bool skipRecompile)
+ https://bugs.webkit.org/show_bug.cgi?id=97450
+
+ Reviewed by Yury Semikhatsky.
+
+ The "InspectorProfilerAgent::enable()" should invokes "PageScriptDebugServer" in
+ no-worker thread.
+
+ No new test case.
+
+ * inspector/InspectorProfilerAgent.cpp:
+ (WebCore::PageProfilerAgent::recompileScript):
+ (PageProfilerAgent):
+ (WebCore::WorkerProfilerAgent::recompileScript):
+ (WorkerProfilerAgent):
+ (WebCore::InspectorProfilerAgent::disable):
+ (WebCore::InspectorProfilerAgent::enable):
+ * inspector/InspectorProfilerAgent.h:
+ (InspectorProfilerAgent):
+
2012-09-24 Patrick Gansterer <[email protected]>
Remove String::operator+=()
Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (129437 => 129438)
--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2012-09-25 00:54:11 UTC (rev 129437)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2012-09-25 01:05:43 UTC (rev 129438)
@@ -48,6 +48,7 @@
#include "ScriptObject.h"
#include "ScriptProfile.h"
#include "ScriptProfiler.h"
+#include "WorkerScriptDebugServer.h"
#include <wtf/OwnPtr.h>
#include <wtf/text/StringConcatenate.h>
@@ -70,6 +71,11 @@
virtual ~PageProfilerAgent() { }
private:
+ virtual void recompileScript()
+ {
+ PageScriptDebugServer::shared().recompileAllJSFunctionsSoon();
+ }
+
virtual void startProfiling(const String& title)
{
ScriptProfiler::startForPage(m_inspectedPage, title);
@@ -88,7 +94,6 @@
return adoptPtr(new PageProfilerAgent(instrumentingAgents, consoleAgent, inspectedPage, inspectorState, injectedScriptManager));
}
-
#if ENABLE(WORKERS)
class WorkerProfilerAgent : public InspectorProfilerAgent {
public:
@@ -97,6 +102,8 @@
virtual ~WorkerProfilerAgent() { }
private:
+ virtual void recompileScript() { }
+
virtual void startProfiling(const String& title)
{
ScriptProfiler::startForWorkerContext(m_workerContext, title);
@@ -222,7 +229,7 @@
return;
m_enabled = false;
m_headersRequested = false;
- PageScriptDebugServer::shared().recompileAllJSFunctionsSoon();
+ recompileScript();
}
void InspectorProfilerAgent::enable(bool skipRecompile)
@@ -231,7 +238,7 @@
return;
m_enabled = true;
if (!skipRecompile)
- PageScriptDebugServer::shared().recompileAllJSFunctionsSoon();
+ recompileScript();
}
String InspectorProfilerAgent::getCurrentUserInitiatedProfileName(bool incrementProfileNumber)
Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.h (129437 => 129438)
--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2012-09-25 00:54:11 UTC (rev 129437)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2012-09-25 01:05:43 UTC (rev 129438)
@@ -73,6 +73,7 @@
void resetState();
virtual void causesRecompilation(ErrorString*, bool*);
+ virtual void recompileScript() = 0;
virtual void isSampling(ErrorString*, bool*);
virtual void hasHeapProfiler(ErrorString*, bool*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
