[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
pfeldman at chromium.org
pfeldman at chromium.org
Thu Dec 3 13:22:42 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 7137f437ca8059e77eb51ffbf469848cba4a23a5
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 29 16:36:18 2009 +0000
2009-10-29 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: get rid of timelineProfilerEnabled method.
https://bugs.webkit.org/show_bug.cgi?id=30911
* inspector/InspectorBackend.cpp:
* inspector/InspectorBackend.h:
* inspector/InspectorBackend.idl:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::setWindowVisible):
* inspector/InspectorController.h:
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel.prototype._toggleTimelineButtonClicked):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50276 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2065e0b..b85bd78 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,22 @@
2009-10-29 Pavel Feldman <pfeldman at chromium.org>
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: get rid of timelineProfilerEnabled method.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30911
+
+ * inspector/InspectorBackend.cpp:
+ * inspector/InspectorBackend.h:
+ * inspector/InspectorBackend.idl:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::setWindowVisible):
+ * inspector/InspectorController.h:
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel.prototype._toggleTimelineButtonClicked):
+
+2009-10-29 Pavel Feldman <pfeldman at chromium.org>
+
Reviewed by Darin Fisher.
Create stub methods for raw cookies access in ChromiumBridge.h
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index 83a9719..1fea25b 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -270,13 +270,6 @@ void InspectorBackend::stopTimelineProfiler()
m_inspectorController->stopTimelineProfiler();
}
-bool InspectorBackend::timelineProfilerEnabled() const
-{
- if (m_inspectorController)
- return m_inspectorController->timelineProfilerEnabled();
- return false;
-}
-
#if ENABLE(JAVASCRIPT_DEBUGGER)
void InspectorBackend::startProfiling()
{
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index 9d75e2f..71f71ab 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -97,7 +97,6 @@ public:
void startTimelineProfiler();
void stopTimelineProfiler();
- bool timelineProfilerEnabled() const;
#if ENABLE(JAVASCRIPT_DEBUGGER)
void startProfiling();
diff --git a/WebCore/inspector/InspectorBackend.idl b/WebCore/inspector/InspectorBackend.idl
index 7a00c6a..9783699 100644
--- a/WebCore/inspector/InspectorBackend.idl
+++ b/WebCore/inspector/InspectorBackend.idl
@@ -63,7 +63,6 @@ module core {
DOMString platform();
void startTimelineProfiler();
void stopTimelineProfiler();
- boolean timelineProfilerEnabled();
[ImplementationFunction=moveWindowBy] void moveByUnrestricted(in float x, in float y);
void setAttachedWindowHeight(in unsigned long height);
[Custom] DOMObject wrapCallback(in DOMObject callback);
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index a6628cd..459b175 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -346,6 +346,7 @@ void InspectorController::setWindowVisible(bool visible, bool attached)
m_attachDebuggerWhenShown = true;
#endif
resetScriptObjects();
+ stopTimelineProfiler();
}
m_showAfterVisible = CurrentPanel;
}
@@ -1120,14 +1121,6 @@ void InspectorController::stopTimelineProfiler()
m_frontend->timelineProfilerWasStopped();
}
-bool InspectorController::timelineProfilerEnabled() const
-{
- if (!enabled())
- return false;
-
- return m_timelineAgent;
-}
-
#if ENABLE(DATABASE)
void InspectorController::selectDatabase(Database* database)
{
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 382d887..e5642b9 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -230,7 +230,6 @@ public:
void startTimelineProfiler();
void stopTimelineProfiler();
- bool timelineProfilerEnabled() const;
InspectorTimelineAgent* timelineAgent() { return m_timelineAgent.get(); }
void mainResourceFiredLoadEvent(DocumentLoader*, const KURL&);
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index df63a0b..ce4e39b 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -130,7 +130,7 @@ WebInspector.TimelinePanel.prototype = {
_toggleTimelineButtonClicked: function()
{
- if (InspectorController.timelineProfilerEnabled())
+ if (this.toggleTimelineButton.toggled)
InspectorController.stopTimelineProfiler();
else
InspectorController.startTimelineProfiler();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list