Changeset 89252 in webkit


Ignore:
Timestamp:
Jun 20, 2011 9:48:23 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

2011-06-20 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: remove LayoutTestController::setTimelineProfilingEnabled.
​https://bugs.webkit.org/show_bug.cgi?id=62994

  • public/WebDevToolsAgent.h:
  • src/WebDevToolsAgentImpl.cpp:
  • src/WebDevToolsAgentImpl.h:

2011-06-20 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: remove LayoutTestController::setTimelineProfilingEnabled.
​https://bugs.webkit.org/show_bug.cgi?id=62994

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp:
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

2011-06-20 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: remove LayoutTestController::setTimelineProfilingEnabled.
​https://bugs.webkit.org/show_bug.cgi?id=62994

  • DumpRenderTree/LayoutTestController.cpp: (closeWebInspectorCallback): (LayoutTestController::staticFunctions):
  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/chromium/DRTDevToolsAgent.cpp:
  • DumpRenderTree/chromium/DRTDevToolsAgent.h:
  • DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::LayoutTestController):
  • DumpRenderTree/chromium/LayoutTestController.h:
  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
  • DumpRenderTree/mac/LayoutTestControllerMac.mm:
  • DumpRenderTree/qt/LayoutTestControllerQt.cpp:
  • DumpRenderTree/qt/LayoutTestControllerQt.h:
  • DumpRenderTree/win/LayoutTestControllerWin.cpp:
  • DumpRenderTree/wx/LayoutTestControllerWx.cpp:
  • WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
  • WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
  • WebKitTestRunner/InjectedBundle/LayoutTestController.h:
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r89225 r89252  
     12011-06-20  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: remove LayoutTestController::setTimelineProfilingEnabled.
     6        https://bugs.webkit.org/show_bug.cgi?id=62994
     7
     8        * public/WebDevToolsAgent.h:
     9        * src/WebDevToolsAgentImpl.cpp:
     10        * src/WebDevToolsAgentImpl.h:
     11
    1122011-06-19  Ryosuke Niwa  <rniwa@webkit.org>
    213

  • trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h

    r88010 r89252  
    6464    virtual void evaluateInWebInspector(long callId, const WebString& script) = 0;
    6565    virtual void setJavaScriptProfilingEnabled(bool) = 0;
    66     virtual void setTimelineProfilingEnabled(bool enabled) = 0;
    6766
    6867    // Asynchronously executes debugger command in the render thread.

  • trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

    r88582 r89252  
    322322}
    323323
    324 void WebDevToolsAgentImpl::setTimelineProfilingEnabled(bool enabled)
    325 {
    326     InspectorController* ic = inspectorController();
    327     if (enabled)
    328         ic->startTimelineProfiler();
    329     else
    330         ic->stopTimelineProfiler();
    331 }
    332 
    333324void WebDevToolsAgent::executeDebuggerCommand(const WebString& command, int callerId)
    334325{

  • trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h

    r88582 r89252  
    8282    virtual void setJavaScriptProfilingEnabled(bool);
    8383    virtual void setRuntimeProperty(const WebString& name, const WebString& value);
    84     virtual void setTimelineProfilingEnabled(bool enable);
    8584
    8685    // InspectorClient implementation.

  • trunk/Source/WebKit/qt/ChangeLog

    r89216 r89252  
     12011-06-20  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: remove LayoutTestController::setTimelineProfilingEnabled.
     6        https://bugs.webkit.org/show_bug.cgi?id=62994
     7
     8        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     9        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     10
    1112011-06-18  Dimitri Glazkov  <dglazkov@chromium.org>
    212

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r89019 r89252  
    225225}
    226226
    227 void DumpRenderTreeSupportQt::setTimelineProfilingEnabled(QWebPage* page, bool enabled)
    228 {
    229 #if ENABLE(INSPECTOR)
    230     InspectorController* controller = page->handle()->page->inspectorController();
    231     if (!controller)
    232         return;
    233     if (enabled)
    234         controller->startTimelineProfiler();
    235     else
    236         controller->stopTimelineProfiler();
    237 #endif
    238 }
    239 
    240227bool DumpRenderTreeSupportQt::hasDocumentElement(QWebFrame* frame)
    241228{

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r89019 r89252  
    122122    static void evaluateScriptInIsolatedWorld(QWebFrame* frame, int worldID, const QString& script);
    123123
    124     static void setTimelineProfilingEnabled(QWebPage*, bool enabled);
    125124    static void webInspectorExecuteScript(QWebPage* page, long callId, const QString& script);
    126125    static void webInspectorShow(QWebPage* page);

  • trunk/Tools/ChangeLog

    r89249 r89252  
     12011-06-20  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: remove LayoutTestController::setTimelineProfilingEnabled.
     6        https://bugs.webkit.org/show_bug.cgi?id=62994
     7
     8        * DumpRenderTree/LayoutTestController.cpp:
     9        (closeWebInspectorCallback):
     10        (LayoutTestController::staticFunctions):
     11        * DumpRenderTree/LayoutTestController.h:
     12        * DumpRenderTree/chromium/DRTDevToolsAgent.cpp:
     13        * DumpRenderTree/chromium/DRTDevToolsAgent.h:
     14        * DumpRenderTree/chromium/LayoutTestController.cpp:
     15        (LayoutTestController::LayoutTestController):
     16        * DumpRenderTree/chromium/LayoutTestController.h:
     17        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     18        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     19        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     20        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     21        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     22        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     23        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
     24        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
     25        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
     26
    1272011-06-20  Lukasz Slachciak  <l.slachciak@samsung.com>
    228

  • trunk/Tools/DumpRenderTree/LayoutTestController.cpp

    r88432 r89252  
    15411541}
    15421542
    1543 static JSValueRef setTimelineProfilingEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    1544 {
    1545     if (argumentCount < 1)
    1546         return JSValueMakeUndefined(context);
    1547 
    1548     LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
    1549     controller->setTimelineProfilingEnabled(JSValueToBoolean(context, arguments[0]));
    1550     return JSValueMakeUndefined(context);
    1551 }
    1552 
    15531543static JSValueRef setUseDashboardCompatibilityModeCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    15541544{
    … …  
    18211811{
    18221812    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
    1823     controller->setTimelineProfilingEnabled(false);
    18241813    controller->closeWebInspector();
    18251814    return JSValueMakeUndefined(context);
    … …  
    24172406        { "setStopProvisionalFrameLoads", setStopProvisionalFrameLoadsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    24182407        { "setTabKeyCyclesThroughElements", setTabKeyCyclesThroughElementsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2419         { "setTimelineProfilingEnabled", setTimelineProfilingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    24202408        { "setUseDashboardCompatibilityMode", setUseDashboardCompatibilityModeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    24212409        { "setUserStyleSheetEnabled", setUserStyleSheetEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/Tools/DumpRenderTree/LayoutTestController.h

    r88432 r89252  
    306306    void showWebInspector();
    307307    void closeWebInspector();
    308     void setTimelineProfilingEnabled(bool enabled);
    309308    void evaluateInWebInspector(long callId, JSStringRef script);
    310309    void evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script);

  • trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp

    r88010 r89252  
    137137}
    138138
    139 bool DRTDevToolsAgent::setTimelineProfilingEnabled(bool enabled)
    140 {
    141     WebDevToolsAgent* agent = webDevToolsAgent();
    142     if (!agent)
    143         return false;
    144     agent->setTimelineProfilingEnabled(enabled);
    145     return true;
    146 }
    147 
    148139bool DRTDevToolsAgent::evaluateInWebInspector(long callID, const std::string& script)
    149140{

  • trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.h

    r88010 r89252  
    7272    bool evaluateInWebInspector(long callID, const std::string& script);
    7373    bool setJavaScriptProfilingEnabled(bool);
    74     bool setTimelineProfilingEnabled(bool);
    7574    TaskList* taskList() { return &m_taskList; }
    7675

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

    r88726 r89252  
    176176    bindMethod("setStopProvisionalFrameLoads", &LayoutTestController::setStopProvisionalFrameLoads);
    177177    bindMethod("setTabKeyCyclesThroughElements", &LayoutTestController::setTabKeyCyclesThroughElements);
    178     bindMethod("setTimelineProfilingEnabled", &LayoutTestController::setTimelineProfilingEnabled);
    179178    bindMethod("setUserStyleSheetEnabled", &LayoutTestController::setUserStyleSheetEnabled);
    180179    bindMethod("setUserStyleSheetLocation", &LayoutTestController::setUserStyleSheetLocation);
    … …  
    16701669}
    16711670
    1672 void LayoutTestController::setTimelineProfilingEnabled(const CppArgumentList& arguments, CppVariant* result)
    1673 {
    1674     result->setNull();
    1675     if (arguments.size() < 1 || !arguments[0].isBool())
    1676         return;
    1677     m_shell->drtDevToolsAgent()->setTimelineProfilingEnabled(arguments[0].toBoolean());
    1678 }
    1679 
    16801671void LayoutTestController::evaluateInWebInspector(const CppArgumentList& arguments, CppVariant* result)
    16811672{

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

    r88726 r89252  
    336336    // Allows layout tests to start JavaScript profiling.
    337337    void setJavaScriptProfilingEnabled(const CppArgumentList&, CppVariant*);
    338 
    339     // Allows layout tests to start Timeline profiling.
    340     void setTimelineProfilingEnabled(const CppArgumentList&, CppVariant*);
    341338
    342339    // Allows layout tests to exec scripts at WebInspector side.

  • trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r88432 r89252  
    302302}
    303303
    304 void LayoutTestController::setTimelineProfilingEnabled(bool flag)
    305 {
    306     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
    307     ASSERT(view);
    308 
    309     WebKitWebInspector* inspector = webkit_web_view_get_inspector(view);
    310     g_object_set(G_OBJECT(inspector), "timeline-profiling-enabled", flag, NULL);
    311 }
    312 
    313304void LayoutTestController::setUseDashboardCompatibilityMode(bool flag)
    314305{

  • trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r88432 r89252  
    571571}
    572572
    573 void LayoutTestController::setTimelineProfilingEnabled(bool enabled)
    574 {
    575     [[[mainFrame webView] inspector] setTimelineProfilingEnabled:enabled];
    576 }
    577 
    578573void LayoutTestController::setUseDashboardCompatibilityMode(bool flag)
    579574{

  • trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r89019 r89252  
    441441}
    442442
    443 void LayoutTestController::setTimelineProfilingEnabled(bool enable)
    444 {
    445     DumpRenderTreeSupportQt::setTimelineProfilingEnabled(m_drt->webPage(), enable);
    446 }
    447 
    448443void LayoutTestController::setValueForUser(const QWebElement& element, const QString& value)
    449444{

  • trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r89019 r89252  
    155155    void setAutofilled(const QWebElement&, bool enable);
    156156    void setJavaScriptProfilingEnabled(bool enable);
    157     void setTimelineProfilingEnabled(bool enable);
    158157    void setValueForUser(const QWebElement&, const QString& value);
    159158    void setFixedContentsSize(int width, int height);

  • trunk/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r88432 r89252  
    630630}
    631631
    632 void LayoutTestController::setTimelineProfilingEnabled(bool flag)
    633 {
    634     COMPtr<IWebView> webView;
    635     if (FAILED(frame->webView(&webView)))
    636         return;
    637 
    638     COMPtr<IWebViewPrivate> viewPrivate;
    639     if (FAILED(webView->QueryInterface(&viewPrivate)))
    640         return;
    641 
    642     COMPtr<IWebInspector> inspector;
    643     if (FAILED(viewPrivate->inspector(&inspector)))
    644         return;
    645 
    646     inspector->setTimelineProfilingEnabled(flag);
    647 }
    648 
    649632void LayoutTestController::setUseDashboardCompatibilityMode(bool flag)
    650633{

  • trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r88130 r89252  
    451451}
    452452
    453 void LayoutTestController::setTimelineProfilingEnabled(bool enabled)
    454 {
    455 
    456 }
    457 
    458453void LayoutTestController::evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script)
    459454{

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl

    r87452 r89252  
    112112        void closeWebInspector();
    113113        void evaluateInWebInspector(in long callID, in DOMString script);
    114         void setTimelineProfilingEnabled(in boolean enabled);
    115114
    116115        void setPOSIXLocale(in DOMString locale);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp

    r88010 r89252  
    498498}
    499499
    500 void LayoutTestController::setTimelineProfilingEnabled(bool enabled)
    501 {
    502     WKBundleInspectorSetPageProfilingEnabled(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), enabled);
    503 }
    504 
    505500typedef WTF::HashMap<unsigned, WKRetainPtr<WKBundleScriptWorldRef> > WorldMap;
    506501static WorldMap& worldMap()

  • trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

    r88010 r89252  
    163163    void evaluateInWebInspector(long callId, JSStringRef script);
    164164    void setJavaScriptProfilingEnabled(bool);
    165     void setTimelineProfilingEnabled(bool);
    166165
    167166    void setPOSIXLocale(JSStringRef);
Note: See TracChangeset for help on using the changeset viewer.