Changeset 101429 in webkit


Ignore:
Timestamp:
Nov 29, 2011 4:19:58 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r101418.
http://trac.webkit.org/changeset/101418
https://bugs.webkit.org/show_bug.cgi?id=73372

Chromium renderer crashes with ENABLE(MUTATION_OBSERVERS)
(Requested by aklein on #webkit).

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

  • public/platform/WebThread.h:
  • src/WebKit.cpp:

(WebKit::initialize):
(WebKit::shutdown):

Location:
trunk/Source/WebKit/chromium
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r101425 r101429  
     12011-11-29  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r101418.
     4        http://trac.webkit.org/changeset/101418
     5        https://bugs.webkit.org/show_bug.cgi?id=73372
     6
     7        Chromium renderer crashes with ENABLE(MUTATION_OBSERVERS)
     8        (Requested by aklein on #webkit).
     9
     10        * public/platform/WebThread.h:
     11        * src/WebKit.cpp:
     12        (WebKit::initialize):
     13        (WebKit::shutdown):
     14
    1152011-11-29  Dirk Pranke  <dpranke@chromium.org>
    216
  • trunk/Source/WebKit/chromium/public/platform/WebThread.h

    r101418 r101429  
    4444    };
    4545
    46     class TaskObserver {
    47     public:
    48         virtual ~TaskObserver() { }
    49         virtual void didProcessTask() = 0;
    50     };
    51 
    5246    virtual void postTask(Task*) = 0;
    5347    virtual void postDelayedTask(Task*, long long delayMs) = 0;
    54     virtual void addTaskObserver(TaskObserver*) { }
    55     virtual void removeTaskObserver(TaskObserver*) { }
    5648
    5749    virtual ~WebThread() { }
  • trunk/Source/WebKit/chromium/src/WebKit.cpp

    r101418 r101429  
    4040#include "TextEncoding.h"
    4141#include "V8Binding.h"
    42 #include "WebKitMutationObserver.h"
    4342#include "WebKitPlatformSupport.h"
    4443#include "WebMediaPlayerClientImpl.h"
    4544#include "WebSocket.h"
    46 #include "WebThread.h"
    4745#include "WorkerContextExecutionProxy.h"
    4846#include "v8.h"
     
    5452
    5553namespace WebKit {
    56 
    57 #if ENABLE(MUTATION_OBSERVERS)
    58 namespace {
    59 
    60 class EndOfTaskRunner : public WebThread::TaskObserver {
    61 public:
    62     virtual void didProcessTask()
    63     {
    64         WebCore::WebKitMutationObserver::deliverAllMutations();
    65     }
    66 };
    67 
    68 } // namespace
    69 
    70 static WebThread::TaskObserver* s_endOfTaskRunner = 0;
    71 #endif // ENABLE(MUTATION_OBSERVERS)
    7254
    7355// Make sure we are not re-initialized in the same address space.
     
    9476    v8::V8::Initialize();
    9577    WebCore::V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
    96 
    97 #if ENABLE(MUTATION_OBSERVERS)
    98     ASSERT(!s_endOfTaskRunner);
    99     s_endOfTaskRunner = new EndOfTaskRunner;
    100     webKitPlatformSupport->currentThread()->addTaskObserver(s_endOfTaskRunner);
    101 #endif
    10278}
    10379
     
    132108    delete WebCore::CCProxy::mainThread();
    133109    WebCore::CCProxy::setMainThread(0);
    134 #if ENABLE(MUTATION_OBSERVERS)
    135     if (s_endOfTaskRunner) {
    136         s_webKitPlatformSupport->currentThread()->removeTaskObserver(s_endOfTaskRunner);
    137         delete s_endOfTaskRunner;
    138         s_endOfTaskRunner = 0;
    139     }
    140 #endif
    141110    s_webKitPlatformSupport = 0;
    142111}
Note: See TracChangeset for help on using the changeset viewer.