Diff
Modified: trunk/Source/WebCore/ChangeLog (136190 => 136191)
--- trunk/Source/WebCore/ChangeLog 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebCore/ChangeLog 2012-11-30 01:42:34 UTC (rev 136191)
@@ -1,3 +1,31 @@
+2012-11-29 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r136171.
+ http://trac.webkit.org/changeset/136171
+ https://bugs.webkit.org/show_bug.cgi?id=103695
+
+ Likely caused ReOpenedWithID and ReOpenedWithURL to fail in
+ linux/chromeos (Requested by zhenyao on #webkit).
+
+ * inspector/InspectorClient.h:
+ (WebCore::InspectorClient::startMainThreadMonitoring):
+ (WebCore::InspectorClient::stopMainThreadMonitoring):
+ * inspector/InspectorController.cpp:
+ * inspector/InspectorController.h:
+ (InspectorController):
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore):
+ (WebCore::InspectorInstrumentation::willProcessTaskImpl):
+ (WebCore::InspectorInstrumentation::didProcessTaskImpl):
+ * inspector/InspectorInstrumentation.h:
+ (InspectorInstrumentation):
+ (WebCore::InspectorInstrumentation::willProcessTask):
+ (WebCore):
+ (WebCore::InspectorInstrumentation::didProcessTask):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::start):
+ (WebCore::InspectorTimelineAgent::stop):
+
2012-11-29 Viatcheslav Ostapenko <[email protected]>
Optimization in image decoding.
Modified: trunk/Source/WebCore/inspector/InspectorClient.h (136190 => 136191)
--- trunk/Source/WebCore/inspector/InspectorClient.h 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebCore/inspector/InspectorClient.h 2012-11-30 01:42:34 UTC (rev 136191)
@@ -58,6 +58,8 @@
virtual bool canClearBrowserCookies() { return false; }
virtual void clearBrowserCookies() { }
virtual bool canMonitorMainThread() { return false; }
+ virtual void startMainThreadMonitoring() { }
+ virtual void stopMainThreadMonitoring() { }
virtual bool canOverrideDeviceMetrics() { return false; }
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (136190 => 136191)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2012-11-30 01:42:34 UTC (rev 136191)
@@ -399,18 +399,6 @@
info.addMember(m_agents);
}
-void InspectorController::willProcessTask()
-{
- if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->willProcessTask();
-}
-
-void InspectorController::didProcessTask()
-{
- if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->didProcessTask();
-}
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InspectorController.h (136190 => 136191)
--- trunk/Source/WebCore/inspector/InspectorController.h 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2012-11-30 01:42:34 UTC (rev 136191)
@@ -119,9 +119,6 @@
void reportMemoryUsage(MemoryObjectInfo*) const;
- void willProcessTask();
- void didProcessTask();
-
private:
InspectorController(Page*, InspectorClient*);
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (136190 => 136191)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-11-30 01:42:34 UTC (rev 136191)
@@ -607,6 +607,18 @@
cssAgent->didProcessRule();
}
+void InspectorInstrumentation::willProcessTaskImpl(InstrumentingAgents* instrumentingAgents)
+{
+ if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
+ timelineAgent->willProcessTask();
+}
+
+void InspectorInstrumentation::didProcessTaskImpl(InstrumentingAgents* instrumentingAgents)
+{
+ if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
+ timelineAgent->didProcessTask();
+}
+
void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents* instrumentingAgents, String* userAgent)
{
if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (136190 => 136191)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-11-30 01:42:34 UTC (rev 136191)
@@ -154,6 +154,8 @@
static void didMatchRule(const InspectorInstrumentationCookie&, bool matched);
static InspectorInstrumentationCookie willProcessRule(Document*, const StyleRule*);
static void didProcessRule(const InspectorInstrumentationCookie&);
+ static void willProcessTask(Page*);
+ static void didProcessTask(Page*);
static void applyUserAgentOverride(Frame*, String*);
static void applyScreenWidthOverride(Frame*, long*);
@@ -346,6 +348,8 @@
static void didMatchRuleImpl(const InspectorInstrumentationCookie&, bool matched);
static InspectorInstrumentationCookie willProcessRuleImpl(InstrumentingAgents*, const StyleRule*);
static void didProcessRuleImpl(const InspectorInstrumentationCookie&);
+ static void willProcessTaskImpl(InstrumentingAgents*);
+ static void didProcessTaskImpl(InstrumentingAgents*);
static void applyUserAgentOverrideImpl(InstrumentingAgents*, String*);
static void applyScreenWidthOverrideImpl(InstrumentingAgents*, long*);
@@ -1028,6 +1032,24 @@
#endif
}
+inline void InspectorInstrumentation::willProcessTask(Page* page)
+{
+#if ENABLE(INSPECTOR)
+ FAST_RETURN_IF_NO_FRONTENDS(void());
+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+ willProcessTaskImpl(instrumentingAgents);
+#endif
+}
+
+inline void InspectorInstrumentation::didProcessTask(Page* page)
+{
+#if ENABLE(INSPECTOR)
+ FAST_RETURN_IF_NO_FRONTENDS(void());
+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+ didProcessTaskImpl(instrumentingAgents);
+#endif
+}
+
inline void InspectorInstrumentation::applyUserAgentOverride(Frame* frame, String* userAgent)
{
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (136190 => 136191)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-11-30 01:42:34 UTC (rev 136191)
@@ -168,6 +168,9 @@
m_state->setLong(TimelineAgentState::timelineMaxCallStackDepth, m_maxCallStackDepth);
m_timestampOffset = currentTime() - monotonicallyIncreasingTime();
+ if (m_client)
+ m_client->startMainThreadMonitoring();
+
m_instrumentingAgents->setInspectorTimelineAgent(this);
ScriptGCEvent::addEventListener(this);
m_state->setBoolean(TimelineAgentState::timelineAgentEnabled, true);
@@ -178,6 +181,9 @@
if (!m_state->getBoolean(TimelineAgentState::timelineAgentEnabled))
return;
+ if (m_client)
+ m_client->stopMainThreadMonitoring();
+
m_instrumentingAgents->setInspectorTimelineAgent(0);
ScriptGCEvent::removeEventListener(this);
Modified: trunk/Source/WebKit/chromium/ChangeLog (136190 => 136191)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-30 01:42:34 UTC (rev 136191)
@@ -1,3 +1,26 @@
+2012-11-29 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r136171.
+ http://trac.webkit.org/changeset/136171
+ https://bugs.webkit.org/show_bug.cgi?id=103695
+
+ Likely caused ReOpenedWithID and ReOpenedWithURL to fail in
+ linux/chromeos (Requested by zhenyao on #webkit).
+
+ * src/InspectorClientImpl.cpp:
+ (WebKit::InspectorClientImpl::startMainThreadMonitoring):
+ (WebKit):
+ (WebKit::InspectorClientImpl::stopMainThreadMonitoring):
+ (WebKit::InspectorClientImpl::willProcessTask):
+ (WebKit::InspectorClientImpl::didProcessTask):
+ * src/InspectorClientImpl.h:
+ (InspectorClientImpl):
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::WebDevToolsAgentImpl::attach):
+ (WebKit::WebDevToolsAgentImpl::detach):
+ * src/WebDevToolsAgentImpl.h:
+ (WebDevToolsAgentImpl):
+
2012-11-29 Sadrul Habib Chowdhury <[email protected]>
[chromium] Remove deprecated API since it is no longer used
Modified: trunk/Source/WebKit/chromium/src/InspectorClientImpl.cpp (136190 => 136191)
--- trunk/Source/WebKit/chromium/src/InspectorClientImpl.cpp 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebKit/chromium/src/InspectorClientImpl.cpp 2012-11-30 01:42:34 UTC (rev 136191)
@@ -39,6 +39,7 @@
#include "WebDevToolsAgentImpl.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
+#include <public/Platform.h>
#include <public/WebRect.h>
#include <public/WebURL.h>
#include <public/WebURLRequest.h>
@@ -135,6 +136,16 @@
return true;
}
+void InspectorClientImpl::startMainThreadMonitoring()
+{
+ WebKit::Platform::current()->currentThread()->addTaskObserver(this);
+}
+
+void InspectorClientImpl::stopMainThreadMonitoring()
+{
+ WebKit::Platform::current()->currentThread()->removeTaskObserver(this);
+}
+
bool InspectorClientImpl::canOverrideDeviceMetrics()
{
return true;
@@ -189,6 +200,16 @@
agent->dumpUncountedAllocatedObjects(map);
}
+void InspectorClientImpl::willProcessTask()
+{
+ InspectorInstrumentation::willProcessTask(m_inspectedWebView->page());
+}
+
+void InspectorClientImpl::didProcessTask()
+{
+ InspectorInstrumentation::didProcessTask(m_inspectedWebView->page());
+}
+
WebDevToolsAgentImpl* InspectorClientImpl::devToolsAgent()
{
return static_cast<WebDevToolsAgentImpl*>(m_inspectedWebView->devToolsAgent());
Modified: trunk/Source/WebKit/chromium/src/InspectorClientImpl.h (136190 => 136191)
--- trunk/Source/WebKit/chromium/src/InspectorClientImpl.h 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebKit/chromium/src/InspectorClientImpl.h 2012-11-30 01:42:34 UTC (rev 136191)
@@ -34,6 +34,7 @@
#include "InspectorClient.h"
#include "InspectorController.h"
#include "InspectorFrontendChannel.h"
+#include <public/WebThread.h>
#include <wtf/OwnPtr.h>
namespace WebKit {
@@ -43,7 +44,8 @@
class WebViewImpl;
class InspectorClientImpl : public WebCore::InspectorClient,
- public WebCore::InspectorFrontendChannel {
+ public WebCore::InspectorFrontendChannel,
+ public WebThread::TaskObserver {
public:
InspectorClientImpl(WebViewImpl*);
~InspectorClientImpl();
@@ -68,6 +70,8 @@
virtual void clearBrowserCookies();
virtual bool canMonitorMainThread();
+ virtual void startMainThreadMonitoring();
+ virtual void stopMainThreadMonitoring();
virtual bool canOverrideDeviceMetrics();
virtual void overrideDeviceMetrics(int, int, float, bool);
@@ -85,6 +89,10 @@
virtual void dumpUncountedAllocatedObjects(const HashMap<const void*, size_t>&);
private:
+ // WebThread::TaskObserver
+ virtual void willProcessTask();
+ virtual void didProcessTask();
+
WebDevToolsAgentImpl* devToolsAgent();
// The WebViewImpl of the page being inspected; gets passed to the constructor
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp (136190 => 136191)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2012-11-30 01:42:34 UTC (rev 136191)
@@ -56,7 +56,6 @@
#include "WebFrameImpl.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
-#include <public/Platform.h>
#include <public/WebRect.h>
#include <public/WebString.h>
#include <public/WebURL.h>
@@ -383,7 +382,6 @@
ClientMessageLoopAdapter::ensureClientMessageLoopCreated(m_client);
inspectorController()->connectFrontend(this);
inspectorController()->webViewResized(m_webViewImpl->size());
- WebKit::Platform::current()->currentThread()->addTaskObserver(this);
m_attached = true;
}
@@ -399,8 +397,6 @@
void WebDevToolsAgentImpl::detach()
{
- WebKit::Platform::current()->currentThread()->removeTaskObserver(this);
-
// Prevent controller from sending messages to the frontend.
InspectorController* ic = inspectorController();
ic->disconnectFrontend();
@@ -660,18 +656,6 @@
ic->evaluateForTestInFrontend(callId, script);
}
-void WebDevToolsAgentImpl::willProcessTask()
-{
- if (InspectorController* ic = inspectorController())
- ic->willProcessTask();
-}
-
-void WebDevToolsAgentImpl::didProcessTask()
-{
- if (InspectorController* ic = inspectorController())
- ic->didProcessTask();
-}
-
WebString WebDevToolsAgent::inspectorProtocolVersion()
{
return WebCore::inspectorProtocolVersion();
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h (136190 => 136191)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h 2012-11-30 01:25:07 UTC (rev 136190)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h 2012-11-30 01:42:34 UTC (rev 136191)
@@ -37,7 +37,6 @@
#include "WebDevToolsAgentPrivate.h"
#include "WebPageOverlay.h"
#include <public/WebSize.h>
-#include <public/WebThread.h>
#include <wtf/Forward.h>
#include <wtf/OwnPtr.h>
@@ -67,8 +66,7 @@
class WebDevToolsAgentImpl : public WebDevToolsAgentPrivate,
public WebCore::InspectorClient,
public WebCore::InspectorFrontendChannel,
- public WebPageOverlay,
- private WebThread::TaskObserver {
+ public WebPageOverlay {
public:
WebDevToolsAgentImpl(WebViewImpl* webViewImpl, WebDevToolsAgentClient* client);
virtual ~WebDevToolsAgentImpl();
@@ -116,10 +114,6 @@
virtual void paintPageOverlay(WebCanvas*);
private:
- // WebThread::TaskObserver
- virtual void willProcessTask();
- virtual void didProcessTask();
-
WebCore::InspectorController* inspectorController();
WebCore::Frame* mainFrame();
