Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (89251 => 89252)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-20 16:48:23 UTC (rev 89252)
@@ -1,3 +1,14 @@
+2011-06-20 Pavel Feldman <[email protected]>
+
+ 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-19 Ryosuke Niwa <[email protected]>
Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h (89251 => 89252)
--- trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -63,7 +63,6 @@
// Exposed for LayoutTestController.
virtual void evaluateInWebInspector(long callId, const WebString& script) = 0;
virtual void setJavaScriptProfilingEnabled(bool) = 0;
- virtual void setTimelineProfilingEnabled(bool enabled) = 0;
// Asynchronously executes debugger command in the render thread.
// |callerIdentifier| will be used for sending response.
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp (89251 => 89252)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -321,15 +321,6 @@
ic->disableProfiler();
}
-void WebDevToolsAgentImpl::setTimelineProfilingEnabled(bool enabled)
-{
- InspectorController* ic = inspectorController();
- if (enabled)
- ic->startTimelineProfiler();
- else
- ic->stopTimelineProfiler();
-}
-
void WebDevToolsAgent::executeDebuggerCommand(const WebString& command, int callerId)
{
DebuggerAgentManager::executeDebuggerCommand(command, callerId);
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h (89251 => 89252)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -81,7 +81,6 @@
virtual void evaluateInWebInspector(long callId, const WebString& script);
virtual void setJavaScriptProfilingEnabled(bool);
virtual void setRuntimeProperty(const WebString& name, const WebString& value);
- virtual void setTimelineProfilingEnabled(bool enable);
// InspectorClient implementation.
virtual void inspectorDestroyed();
Modified: trunk/Source/WebKit/qt/ChangeLog (89251 => 89252)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-20 16:48:23 UTC (rev 89252)
@@ -1,3 +1,13 @@
+2011-06-20 Pavel Feldman <[email protected]>
+
+ 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-18 Dimitri Glazkov <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (89251 => 89252)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -224,19 +224,6 @@
#endif
}
-void DumpRenderTreeSupportQt::setTimelineProfilingEnabled(QWebPage* page, bool enabled)
-{
-#if ENABLE(INSPECTOR)
- InspectorController* controller = page->handle()->page->inspectorController();
- if (!controller)
- return;
- if (enabled)
- controller->startTimelineProfiler();
- else
- controller->stopTimelineProfiler();
-#endif
-}
-
bool DumpRenderTreeSupportQt::hasDocumentElement(QWebFrame* frame)
{
return QWebFramePrivate::core(frame)->document()->documentElement();
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (89251 => 89252)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -121,7 +121,6 @@
static void clearScriptWorlds();
static void evaluateScriptInIsolatedWorld(QWebFrame* frame, int worldID, const QString& script);
- static void setTimelineProfilingEnabled(QWebPage*, bool enabled);
static void webInspectorExecuteScript(QWebPage* page, long callId, const QString& script);
static void webInspectorShow(QWebPage* page);
static void webInspectorClose(QWebPage* page);
Modified: trunk/Tools/ChangeLog (89251 => 89252)
--- trunk/Tools/ChangeLog 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/ChangeLog 2011-06-20 16:48:23 UTC (rev 89252)
@@ -1,3 +1,29 @@
+2011-06-20 Pavel Feldman <[email protected]>
+
+ 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:
+
2011-06-20 Lukasz Slachciak <[email protected]>
Reviewed by Martin Robinson.
Modified: trunk/Tools/DumpRenderTree/LayoutTestController.cpp (89251 => 89252)
--- trunk/Tools/DumpRenderTree/LayoutTestController.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/LayoutTestController.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -1540,16 +1540,6 @@
return JSValueMakeUndefined(context);
}
-static JSValueRef setTimelineProfilingEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- if (argumentCount < 1)
- return JSValueMakeUndefined(context);
-
- LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
- controller->setTimelineProfilingEnabled(JSValueToBoolean(context, arguments[0]));
- return JSValueMakeUndefined(context);
-}
-
static JSValueRef setUseDashboardCompatibilityModeCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
// Has mac implementation
@@ -1820,7 +1810,6 @@
static JSValueRef closeWebInspectorCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
- controller->setTimelineProfilingEnabled(false);
controller->closeWebInspector();
return JSValueMakeUndefined(context);
}
@@ -2416,7 +2405,6 @@
{ "setSpatialNavigationEnabled", setSpatialNavigationEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setStopProvisionalFrameLoads", setStopProvisionalFrameLoadsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setTabKeyCyclesThroughElements", setTabKeyCyclesThroughElementsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "setTimelineProfilingEnabled", setTimelineProfilingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setUseDashboardCompatibilityMode", setUseDashboardCompatibilityModeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setUserStyleSheetEnabled", setUserStyleSheetEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setUserStyleSheetLocation", setUserStyleSheetLocationCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
Modified: trunk/Tools/DumpRenderTree/LayoutTestController.h (89251 => 89252)
--- trunk/Tools/DumpRenderTree/LayoutTestController.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/LayoutTestController.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -305,7 +305,6 @@
void setAsynchronousSpellCheckingEnabled(bool);
void showWebInspector();
void closeWebInspector();
- void setTimelineProfilingEnabled(bool enabled);
void evaluateInWebInspector(long callId, JSStringRef script);
void evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script);
Modified: trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp (89251 => 89252)
--- trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -136,15 +136,6 @@
return true;
}
-bool DRTDevToolsAgent::setTimelineProfilingEnabled(bool enabled)
-{
- WebDevToolsAgent* agent = webDevToolsAgent();
- if (!agent)
- return false;
- agent->setTimelineProfilingEnabled(enabled);
- return true;
-}
-
bool DRTDevToolsAgent::evaluateInWebInspector(long callID, const std::string& script)
{
WebDevToolsAgent* agent = webDevToolsAgent();
Modified: trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.h (89251 => 89252)
--- trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -71,7 +71,6 @@
bool evaluateInWebInspector(long callID, const std::string& script);
bool setJavaScriptProfilingEnabled(bool);
- bool setTimelineProfilingEnabled(bool);
TaskList* taskList() { return &m_taskList; }
private:
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (89251 => 89252)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -175,7 +175,6 @@
bindMethod("setSmartInsertDeleteEnabled", &LayoutTestController::setSmartInsertDeleteEnabled);
bindMethod("setStopProvisionalFrameLoads", &LayoutTestController::setStopProvisionalFrameLoads);
bindMethod("setTabKeyCyclesThroughElements", &LayoutTestController::setTabKeyCyclesThroughElements);
- bindMethod("setTimelineProfilingEnabled", &LayoutTestController::setTimelineProfilingEnabled);
bindMethod("setUserStyleSheetEnabled", &LayoutTestController::setUserStyleSheetEnabled);
bindMethod("setUserStyleSheetLocation", &LayoutTestController::setUserStyleSheetLocation);
bindMethod("setValueForUser", &LayoutTestController::setValueForUser);
@@ -1669,14 +1668,6 @@
m_shell->drtDevToolsAgent()->setJavaScriptProfilingEnabled(arguments[0].toBoolean());
}
-void LayoutTestController::setTimelineProfilingEnabled(const CppArgumentList& arguments, CppVariant* result)
-{
- result->setNull();
- if (arguments.size() < 1 || !arguments[0].isBool())
- return;
- m_shell->drtDevToolsAgent()->setTimelineProfilingEnabled(arguments[0].toBoolean());
-}
-
void LayoutTestController::evaluateInWebInspector(const CppArgumentList& arguments, CppVariant* result)
{
result->setNull();
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h (89251 => 89252)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -336,9 +336,6 @@
// Allows layout tests to start _javascript_ profiling.
void setJavaScriptProfilingEnabled(const CppArgumentList&, CppVariant*);
- // Allows layout tests to start Timeline profiling.
- void setTimelineProfilingEnabled(const CppArgumentList&, CppVariant*);
-
// Allows layout tests to exec scripts at WebInspector side.
void evaluateInWebInspector(const CppArgumentList&, CppVariant*);
Modified: trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (89251 => 89252)
--- trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -301,15 +301,6 @@
g_object_set(G_OBJECT(settings), "tab-key-cycles-through-elements", cycles, NULL);
}
-void LayoutTestController::setTimelineProfilingEnabled(bool flag)
-{
- WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
- ASSERT(view);
-
- WebKitWebInspector* inspector = webkit_web_view_get_inspector(view);
- g_object_set(G_OBJECT(inspector), "timeline-profiling-enabled", flag, NULL);
-}
-
void LayoutTestController::setUseDashboardCompatibilityMode(bool flag)
{
// FIXME: implement
Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm (89251 => 89252)
--- trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm 2011-06-20 16:48:23 UTC (rev 89252)
@@ -570,11 +570,6 @@
[[mainFrame webView] setTabKeyCyclesThroughElements:cycles];
}
-void LayoutTestController::setTimelineProfilingEnabled(bool enabled)
-{
- [[[mainFrame webView] inspector] setTimelineProfilingEnabled:enabled];
-}
-
void LayoutTestController::setUseDashboardCompatibilityMode(bool flag)
{
[[mainFrame webView] _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:flag];
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (89251 => 89252)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -440,11 +440,6 @@
DumpRenderTreeSupportQt::setJavaScriptProfilingEnabled(m_topLoadingFrame, enable);
}
-void LayoutTestController::setTimelineProfilingEnabled(bool enable)
-{
- DumpRenderTreeSupportQt::setTimelineProfilingEnabled(m_drt->webPage(), enable);
-}
-
void LayoutTestController::setValueForUser(const QWebElement& element, const QString& value)
{
DumpRenderTreeSupportQt::setValueForUser(element, value);
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h (89251 => 89252)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -154,7 +154,6 @@
void setAppCacheMaximumSize(unsigned long long quota);
void setAutofilled(const QWebElement&, bool enable);
void setJavaScriptProfilingEnabled(bool enable);
- void setTimelineProfilingEnabled(bool enable);
void setValueForUser(const QWebElement&, const QString& value);
void setFixedContentsSize(int width, int height);
void setPrivateBrowsingEnabled(bool enable);
Modified: trunk/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp (89251 => 89252)
--- trunk/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -629,23 +629,6 @@
viewPrivate->setTabKeyCyclesThroughElements(shouldCycle ? TRUE : FALSE);
}
-void LayoutTestController::setTimelineProfilingEnabled(bool flag)
-{
- COMPtr<IWebView> webView;
- if (FAILED(frame->webView(&webView)))
- return;
-
- COMPtr<IWebViewPrivate> viewPrivate;
- if (FAILED(webView->QueryInterface(&viewPrivate)))
- return;
-
- COMPtr<IWebInspector> inspector;
- if (FAILED(viewPrivate->inspector(&inspector)))
- return;
-
- inspector->setTimelineProfilingEnabled(flag);
-}
-
void LayoutTestController::setUseDashboardCompatibilityMode(bool flag)
{
// FIXME: Implement!
Modified: trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp (89251 => 89252)
--- trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -450,11 +450,6 @@
// FIXME: Implement this.
}
-void LayoutTestController::setTimelineProfilingEnabled(bool enabled)
-{
-
-}
-
void LayoutTestController::evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script)
{
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl (89251 => 89252)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl 2011-06-20 16:48:23 UTC (rev 89252)
@@ -111,7 +111,6 @@
void showWebInspector();
void closeWebInspector();
void evaluateInWebInspector(in long callID, in DOMString script);
- void setTimelineProfilingEnabled(in boolean enabled);
void setPOSIXLocale(in DOMString locale);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp (89251 => 89252)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2011-06-20 16:48:23 UTC (rev 89252)
@@ -497,11 +497,6 @@
WKBundleInspectorSetJavaScriptProfilingEnabled(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), enabled);
}
-void LayoutTestController::setTimelineProfilingEnabled(bool enabled)
-{
- WKBundleInspectorSetPageProfilingEnabled(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), enabled);
-}
-
typedef WTF::HashMap<unsigned, WKRetainPtr<WKBundleScriptWorldRef> > WorldMap;
static WorldMap& worldMap()
{
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h (89251 => 89252)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h 2011-06-20 16:40:08 UTC (rev 89251)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h 2011-06-20 16:48:23 UTC (rev 89252)
@@ -162,7 +162,6 @@
void closeWebInspector();
void evaluateInWebInspector(long callId, JSStringRef script);
void setJavaScriptProfilingEnabled(bool);
- void setTimelineProfilingEnabled(bool);
void setPOSIXLocale(JSStringRef);
