⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 136191 in webkit


Ignore:
Timestamp:
Nov 29, 2012, 5:42:34 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

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).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-11-29

Source/WebCore:

  • 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):

Source/WebKit/chromium:

  • 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):

Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r136189 r136191  
     12012-11-29  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r136171.
     4        http://trac.webkit.org/changeset/136171
     5        https://bugs.webkit.org/show_bug.cgi?id=103695
     6
     7        Likely caused ReOpenedWithID and ReOpenedWithURL to fail in
     8        linux/chromeos (Requested by zhenyao on #webkit).
     9
     10        * inspector/InspectorClient.h:
     11        (WebCore::InspectorClient::startMainThreadMonitoring):
     12        (WebCore::InspectorClient::stopMainThreadMonitoring):
     13        * inspector/InspectorController.cpp:
     14        * inspector/InspectorController.h:
     15        (InspectorController):
     16        * inspector/InspectorInstrumentation.cpp:
     17        (WebCore):
     18        (WebCore::InspectorInstrumentation::willProcessTaskImpl):
     19        (WebCore::InspectorInstrumentation::didProcessTaskImpl):
     20        * inspector/InspectorInstrumentation.h:
     21        (InspectorInstrumentation):
     22        (WebCore::InspectorInstrumentation::willProcessTask):
     23        (WebCore):
     24        (WebCore::InspectorInstrumentation::didProcessTask):
     25        * inspector/InspectorTimelineAgent.cpp:
     26        (WebCore::InspectorTimelineAgent::start):
     27        (WebCore::InspectorTimelineAgent::stop):
     28
    1292012-11-29  Viatcheslav Ostapenko  <v.ostapenko@samsung.com>
    230

  • trunk/Source/WebCore/inspector/InspectorClient.h

    r136171 r136191  
    5959    virtual void clearBrowserCookies() { }
    6060    virtual bool canMonitorMainThread() { return false; }
     61    virtual void startMainThreadMonitoring() { }
     62    virtual void stopMainThreadMonitoring() { }
    6163
    6264    virtual bool canOverrideDeviceMetrics() { return false; }

  • trunk/Source/WebCore/inspector/InspectorController.cpp

    r136171 r136191  
    400400}
    401401
    402 void InspectorController::willProcessTask()
    403 {
    404     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
    405         timelineAgent->willProcessTask();
    406 }
    407 
    408 void InspectorController::didProcessTask()
    409 {
    410     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
    411         timelineAgent->didProcessTask();
    412 }
    413 
    414402} // namespace WebCore
    415403

  • trunk/Source/WebCore/inspector/InspectorController.h

    r136171 r136191  
    120120    void reportMemoryUsage(MemoryObjectInfo*) const;
    121121
    122     void willProcessTask();
    123     void didProcessTask();
    124 
    125122private:
    126123    InspectorController(Page*, InspectorClient*);

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r136171 r136191  
    608608}
    609609
     610void InspectorInstrumentation::willProcessTaskImpl(InstrumentingAgents* instrumentingAgents)
     611{
     612    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
     613        timelineAgent->willProcessTask();
     614}
     615
     616void InspectorInstrumentation::didProcessTaskImpl(InstrumentingAgents* instrumentingAgents)
     617{
     618    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
     619        timelineAgent->didProcessTask();
     620}
     621
    610622void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents* instrumentingAgents, String* userAgent)
    611623{

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r136171 r136191  
    155155    static InspectorInstrumentationCookie willProcessRule(Document*, const StyleRule*);
    156156    static void didProcessRule(const InspectorInstrumentationCookie&);
     157    static void willProcessTask(Page*);
     158    static void didProcessTask(Page*);
    157159
    158160    static void applyUserAgentOverride(Frame*, String*);
    … …  
    347349    static InspectorInstrumentationCookie willProcessRuleImpl(InstrumentingAgents*, const StyleRule*);
    348350    static void didProcessRuleImpl(const InspectorInstrumentationCookie&);
     351    static void willProcessTaskImpl(InstrumentingAgents*);
     352    static void didProcessTaskImpl(InstrumentingAgents*);
    349353
    350354    static void applyUserAgentOverrideImpl(InstrumentingAgents*, String*);
    … …  
    10291033}
    10301034
     1035inline void InspectorInstrumentation::willProcessTask(Page* page)
     1036{
     1037#if ENABLE(INSPECTOR)
     1038    FAST_RETURN_IF_NO_FRONTENDS(void());
     1039    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
     1040        willProcessTaskImpl(instrumentingAgents);
     1041#endif
     1042}
     1043
     1044inline void InspectorInstrumentation::didProcessTask(Page* page)
     1045{
     1046#if ENABLE(INSPECTOR)
     1047    FAST_RETURN_IF_NO_FRONTENDS(void());
     1048    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
     1049        didProcessTaskImpl(instrumentingAgents);
     1050#endif
     1051}
     1052
    10311053inline void InspectorInstrumentation::applyUserAgentOverride(Frame* frame, String* userAgent)
    10321054{

  • trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

    r136171 r136191  
    169169    m_timestampOffset = currentTime() - monotonicallyIncreasingTime();
    170170
     171    if (m_client)
     172        m_client->startMainThreadMonitoring();
     173
    171174    m_instrumentingAgents->setInspectorTimelineAgent(this);
    172175    ScriptGCEvent::addEventListener(this);
    … …  
    178181    if (!m_state->getBoolean(TimelineAgentState::timelineAgentEnabled))
    179182        return;
     183
     184    if (m_client)
     185        m_client->stopMainThreadMonitoring();
    180186
    181187    m_instrumentingAgents->setInspectorTimelineAgent(0);

  • trunk/Source/WebKit/chromium/ChangeLog

    r136186 r136191  
     12012-11-29  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r136171.
     4        http://trac.webkit.org/changeset/136171
     5        https://bugs.webkit.org/show_bug.cgi?id=103695
     6
     7        Likely caused ReOpenedWithID and ReOpenedWithURL to fail in
     8        linux/chromeos (Requested by zhenyao on #webkit).
     9
     10        * src/InspectorClientImpl.cpp:
     11        (WebKit::InspectorClientImpl::startMainThreadMonitoring):
     12        (WebKit):
     13        (WebKit::InspectorClientImpl::stopMainThreadMonitoring):
     14        (WebKit::InspectorClientImpl::willProcessTask):
     15        (WebKit::InspectorClientImpl::didProcessTask):
     16        * src/InspectorClientImpl.h:
     17        (InspectorClientImpl):
     18        * src/WebDevToolsAgentImpl.cpp:
     19        (WebKit::WebDevToolsAgentImpl::attach):
     20        (WebKit::WebDevToolsAgentImpl::detach):
     21        * src/WebDevToolsAgentImpl.h:
     22        (WebDevToolsAgentImpl):
     23
    1242012-11-29  Sadrul Habib Chowdhury  <sadrul@chromium.org>
    225

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

    r136171 r136191  
    4040#include "WebViewClient.h"
    4141#include "WebViewImpl.h"
     42#include <public/Platform.h>
    4243#include <public/WebRect.h>
    4344#include <public/WebURL.h>
    … …  
    136137}
    137138
     139void InspectorClientImpl::startMainThreadMonitoring()
     140{
     141    WebKit::Platform::current()->currentThread()->addTaskObserver(this);
     142}
     143
     144void InspectorClientImpl::stopMainThreadMonitoring()
     145{
     146    WebKit::Platform::current()->currentThread()->removeTaskObserver(this);
     147}
     148
    138149bool InspectorClientImpl::canOverrideDeviceMetrics()
    139150{
    … …  
    190201}
    191202
     203void InspectorClientImpl::willProcessTask()
     204{
     205    InspectorInstrumentation::willProcessTask(m_inspectedWebView->page());
     206}
     207
     208void InspectorClientImpl::didProcessTask()
     209{
     210    InspectorInstrumentation::didProcessTask(m_inspectedWebView->page());
     211}
     212
    192213WebDevToolsAgentImpl* InspectorClientImpl::devToolsAgent()
    193214{

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

    r136171 r136191  
    3535#include "InspectorController.h"
    3636#include "InspectorFrontendChannel.h"
     37#include <public/WebThread.h>
    3738#include <wtf/OwnPtr.h>
    3839
    … …  
    4445
    4546class InspectorClientImpl : public WebCore::InspectorClient,
    46                             public WebCore::InspectorFrontendChannel {
     47                            public WebCore::InspectorFrontendChannel,
     48                            public WebThread::TaskObserver {
    4749public:
    4850    InspectorClientImpl(WebViewImpl*);
    … …  
    6971
    7072    virtual bool canMonitorMainThread();
     73    virtual void startMainThreadMonitoring();
     74    virtual void stopMainThreadMonitoring();
    7175
    7276    virtual bool canOverrideDeviceMetrics();
    … …  
    8690
    8791private:
     92    // WebThread::TaskObserver
     93    virtual void willProcessTask();
     94    virtual void didProcessTask();
     95
    8896    WebDevToolsAgentImpl* devToolsAgent();
    8997

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

    r136171 r136191  
    5757#include "WebViewClient.h"
    5858#include "WebViewImpl.h"
    59 #include <public/Platform.h>
    6059#include <public/WebRect.h>
    6160#include <public/WebString.h>
    … …  
    384383    inspectorController()->connectFrontend(this);
    385384    inspectorController()->webViewResized(m_webViewImpl->size());
    386     WebKit::Platform::current()->currentThread()->addTaskObserver(this);
    387385    m_attached = true;
    388386}
    … …  
    400398void WebDevToolsAgentImpl::detach()
    401399{
    402     WebKit::Platform::current()->currentThread()->removeTaskObserver(this);
    403 
    404400    // Prevent controller from sending messages to the frontend.
    405401    InspectorController* ic = inspectorController();
    … …  
    659655    InspectorController* ic = inspectorController();
    660656    ic->evaluateForTestInFrontend(callId, script);
    661 }
    662 
    663 void WebDevToolsAgentImpl::willProcessTask()
    664 {
    665     if (InspectorController* ic = inspectorController())
    666         ic->willProcessTask();
    667 }
    668 
    669 void WebDevToolsAgentImpl::didProcessTask()
    670 {
    671     if (InspectorController* ic = inspectorController())
    672         ic->didProcessTask();
    673657}
    674658

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

    r136171 r136191  
    3838#include "WebPageOverlay.h"
    3939#include <public/WebSize.h>
    40 #include <public/WebThread.h>
    4140#include <wtf/Forward.h>
    4241#include <wtf/OwnPtr.h>
    … …  
    6867                             public WebCore::InspectorClient,
    6968                             public WebCore::InspectorFrontendChannel,
    70                              public WebPageOverlay,
    71                              private WebThread::TaskObserver {
     69                             public WebPageOverlay {
    7270public:
    7371    WebDevToolsAgentImpl(WebViewImpl* webViewImpl, WebDevToolsAgentClient* client);
    … …  
    117115
    118116private:
    119     // WebThread::TaskObserver
    120     virtual void willProcessTask();
    121     virtual void didProcessTask();
    122 
    123117    WebCore::InspectorController* inspectorController();
    124118    WebCore::Frame* mainFrame();
Note: See TracChangeset for help on using the changeset viewer.