Changeset 76337 in webkit

Timestamp:

Jan 21, 2011 2:06:52 AM (13 years ago)

Author:

loislo@chromium.org

Message:

2011-01-21 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r76335.
​http://trac.webkit.org/changeset/76335
​https://bugs.webkit.org/show_bug.cgi?id=52875

profiler tests were broken (Requested by loislo on #webkit).

• inspector/InspectorController.cpp: (WebCore::InspectorController::addProfile): (WebCore::InspectorController::getCurrentUserInitiatedProfileName):
• inspector/InspectorController.h:
• inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::addStartProfilingMessageToConsoleImpl):
• inspector/InspectorInstrumentation.h: (WebCore::InspectorInstrumentation::addStartProfilingMessageToConsole): (WebCore::InspectorInstrumentation::inspectorControllerWithFrontendForPage):
• page/Console.cpp: (WebCore::Console::profile): (WebCore::Console::profileEnd):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (1 diff)
• inspector/InspectorController.h (modified) (1 diff)
• inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• inspector/InspectorInstrumentation.h (modified) (4 diffs)
• page/Console.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-21  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r76335.
+        http://trac.webkit.org/changeset/76335
+        https://bugs.webkit.org/show_bug.cgi?id=52875
+
+        profiler tests were broken (Requested by loislo on #webkit).
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::addProfile):
+        (WebCore::InspectorController::getCurrentUserInitiatedProfileName):
+        * inspector/InspectorController.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::addStartProfilingMessageToConsoleImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::addStartProfilingMessageToConsole):
+        (WebCore::InspectorInstrumentation::inspectorControllerWithFrontendForPage):
+        * page/Console.cpp:
+        (WebCore::Console::profile):
+        (WebCore::Console::profileEnd):
+
 2011-01-21  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -984 +984 @@
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
+void InspectorController::addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, const String& sourceURL)
+{
+    if (!enabled())
+        return;
+    m_profilerAgent->addProfile(prpProfile, lineNumber, sourceURL);
+}
+
 bool InspectorController::isRecordingUserInitiatedProfile() const
 {
     return m_profilerAgent->isRecordingUserInitiatedProfile();
+}
+
+String InspectorController::getCurrentUserInitiatedProfileName(bool incrementProfileNumber)
+{
+    return m_profilerAgent->getCurrentUserInitiatedProfileName(incrementProfileNumber);
 }
 

trunk/Source/WebCore/inspector/InspectorController.h

@@ -228 +228 @@
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
+    void addProfile(PassRefPtr<ScriptProfile>, unsigned lineNumber, const String& sourceURL);
     bool isRecordingUserInitiatedProfile() const;
+    String getCurrentUserInitiatedProfileName(bool incrementProfileNumber = false);
     void startProfiling() { startUserInitiatedProfiling(); }
     void startUserInitiatedProfiling();

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -553 +553 @@
         profilerAgent->addStartProfilingMessageToConsole(title, lineNumber, sourceURL);
 }
-
-void InspectorInstrumentation::addProfileImpl(InspectorController* inspectorController, RefPtr<ScriptProfile> profile, ScriptCallStack* callStack)
-{
-    if (InspectorProfilerAgent* profilerAgent = inspectorController->profilerAgent()) {
-        const ScriptCallFrame& lastCaller = callStack->at(0);
-        profilerAgent->addProfile(profile, lastCaller.lineNumber(), lastCaller.sourceURL());
-    }
-}
-
-bool InspectorInstrumentation::profilerEnabledImpl(InspectorController* inspectorController)
-{
-    if (inspectorController->enabled())
-        return false;
-
-    InspectorProfilerAgent* profilerAgent = inspectorController->profilerAgent();
-    if (!profilerAgent)
-        return false;
-
-    return profilerAgent->enabled();
-}
-
-String InspectorInstrumentation::getCurrentUserInitiatedProfileNameImpl(InspectorController* inspectorController, bool incrementProfileNumber)
-{
-    if (InspectorProfilerAgent* profilerAgent = inspectorController->profilerAgent())
-        return profilerAgent->getCurrentUserInitiatedProfileName(incrementProfileNumber);
-    return "";
-}
 #endif
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -140 +140 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, const String& sourceURL);
-    static void addProfile(Page*, RefPtr<ScriptProfile>, ScriptCallStack*);
-    static bool profilerEnabled(Page*);
-    static String getCurrentUserInitiatedProfileName(Page*, bool incrementProfileNumber);
 #endif
 
@@ -250 +247 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     static void addStartProfilingMessageToConsoleImpl(InspectorController*, const String& title, unsigned lineNumber, const String& sourceURL);
-    static void addProfileImpl(InspectorController*, RefPtr<ScriptProfile>, ScriptCallStack*);
-    static bool profilerEnabledImpl(InspectorController*);
-    static String getCurrentUserInitiatedProfileNameImpl(InspectorController*, bool incrementProfileNumber);
 #endif
 
@@ -888 +882 @@
 #endif
 }
-
-inline void InspectorInstrumentation::addProfile(Page* page, RefPtr<ScriptProfile> profile, ScriptCallStack* callStack)
-{
-#if ENABLE(INSPECTOR)
-    if (InspectorController* inspectorController = inspectorControllerForPage(page))
-        addProfileImpl(inspectorController, profile, callStack);
-#endif
-}
-
-inline bool InspectorInstrumentation::profilerEnabled(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    if (InspectorController* inspectorController = inspectorControllerForPage(page))
-        return profilerEnabledImpl(inspectorController);
-#endif
-    return false;
-}
-
-inline String InspectorInstrumentation::getCurrentUserInitiatedProfileName(Page* page, bool incrementProfileNumber)
-{
-#if ENABLE(INSPECTOR)
-    if (InspectorController* inspectorController = inspectorControllerForPage(page))
-        return InspectorInstrumentation::getCurrentUserInitiatedProfileNameImpl(inspectorController, incrementProfileNumber);
-#endif
-    return "";
-}
 #endif
 
@@ -969 +937 @@
     return 0;
 }
-
 #endif
 

trunk/Source/WebCore/page/Console.cpp

@@ -263 +263 @@
         return;
 
+#if ENABLE(INSPECTOR)
+    InspectorController* controller = page->inspectorController();
     // FIXME: log a console message when profiling is disabled.
-    if (!InspectorInstrumentation::profilerEnabled(page))
-        return;
+    if (!controller->profilerEnabled())
+        return;
+#endif
 
     String resolvedTitle = title;
     if (title.isNull()) // no title so give it the next user initiated profile title.
-        resolvedTitle = InspectorInstrumentation::getCurrentUserInitiatedProfileName(page, true);
+#if ENABLE(INSPECTOR)
+        resolvedTitle = controller->getCurrentUserInitiatedProfileName(true);
+#else
+        resolvedTitle = "";
+#endif
 
     ScriptProfiler::start(state, resolvedTitle);
@@ -283 +290 @@
         return;
 
-    if (!InspectorInstrumentation::profilerEnabled(page))
-        return;
+#if ENABLE(INSPECTOR)
+    InspectorController* controller = page->inspectorController();
+    if (!controller->profilerEnabled())
+        return;
+#endif
 
     RefPtr<ScriptProfile> profile = ScriptProfiler::stop(state, title);
@@ -291 +301 @@
 
     m_profiles.append(profile);
-    InspectorInstrumentation::addProfile(page, profile, callStack.get());
+
+#if ENABLE(INSPECTOR)
+    const ScriptCallFrame& lastCaller = callStack->at(0);
+    controller->addProfile(profile, lastCaller.lineNumber(), lastCaller.sourceURL());
+#endif
 }