Title: [101429] trunk/Source/WebKit/chromium
- Revision
- 101429
- Author
- commit-qu...@webkit.org
- Date
- 2011-11-29 16:19:58 -0800 (Tue, 29 Nov 2011)
Log 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....@gmail.com> on 2011-11-29
* public/platform/WebThread.h:
* src/WebKit.cpp:
(WebKit::initialize):
(WebKit::shutdown):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101428 => 101429)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-30 00:19:50 UTC (rev 101428)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-30 00:19:58 UTC (rev 101429)
@@ -1,3 +1,17 @@
+2011-11-29 Sheriff Bot <webkit.review....@gmail.com>
+
+ 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).
+
+ * public/platform/WebThread.h:
+ * src/WebKit.cpp:
+ (WebKit::initialize):
+ (WebKit::shutdown):
+
2011-11-29 Dirk Pranke <dpra...@chromium.org>
add webkit_user_agent to DRT and webkit_unit_tests
Modified: trunk/Source/WebKit/chromium/public/platform/WebThread.h (101428 => 101429)
--- trunk/Source/WebKit/chromium/public/platform/WebThread.h 2011-11-30 00:19:50 UTC (rev 101428)
+++ trunk/Source/WebKit/chromium/public/platform/WebThread.h 2011-11-30 00:19:58 UTC (rev 101429)
@@ -43,16 +43,8 @@
virtual void run() = 0;
};
- class TaskObserver {
- public:
- virtual ~TaskObserver() { }
- virtual void didProcessTask() = 0;
- };
-
virtual void postTask(Task*) = 0;
virtual void postDelayedTask(Task*, long long delayMs) = 0;
- virtual void addTaskObserver(TaskObserver*) { }
- virtual void removeTaskObserver(TaskObserver*) { }
virtual ~WebThread() { }
};
Modified: trunk/Source/WebKit/chromium/src/WebKit.cpp (101428 => 101429)
--- trunk/Source/WebKit/chromium/src/WebKit.cpp 2011-11-30 00:19:50 UTC (rev 101428)
+++ trunk/Source/WebKit/chromium/src/WebKit.cpp 2011-11-30 00:19:58 UTC (rev 101429)
@@ -39,11 +39,9 @@
#include "Settings.h"
#include "TextEncoding.h"
#include "V8Binding.h"
-#include "WebKitMutationObserver.h"
#include "WebKitPlatformSupport.h"
#include "WebMediaPlayerClientImpl.h"
#include "WebSocket.h"
-#include "WebThread.h"
#include "WorkerContextExecutionProxy.h"
#include "v8.h"
@@ -54,22 +52,6 @@
namespace WebKit {
-#if ENABLE(MUTATION_OBSERVERS)
-namespace {
-
-class EndOfTaskRunner : public WebThread::TaskObserver {
-public:
- virtual void didProcessTask()
- {
- WebCore::WebKitMutationObserver::deliverAllMutations();
- }
-};
-
-} // namespace
-
-static WebThread::TaskObserver* s_endOfTaskRunner = 0;
-#endif // ENABLE(MUTATION_OBSERVERS)
-
// Make sure we are not re-initialized in the same address space.
// Doing so may cause hard to reproduce crashes.
static bool s_webKitInitialized = false;
@@ -93,12 +75,6 @@
v8::V8::SetEntropySource(&generateEntropy);
v8::V8::Initialize();
WebCore::V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
-
-#if ENABLE(MUTATION_OBSERVERS)
- ASSERT(!s_endOfTaskRunner);
- s_endOfTaskRunner = new EndOfTaskRunner;
- webKitPlatformSupport->currentThread()->addTaskObserver(s_endOfTaskRunner);
-#endif
}
void initializeWithoutV8(WebKitPlatformSupport* webKitPlatformSupport)
@@ -131,13 +107,6 @@
{
delete WebCore::CCProxy::mainThread();
WebCore::CCProxy::setMainThread(0);
-#if ENABLE(MUTATION_OBSERVERS)
- if (s_endOfTaskRunner) {
- s_webKitPlatformSupport->currentThread()->removeTaskObserver(s_endOfTaskRunner);
- delete s_endOfTaskRunner;
- s_endOfTaskRunner = 0;
- }
-#endif
s_webKitPlatformSupport = 0;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
