[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jianli at chromium.org
jianli at chromium.org
Wed Dec 22 12:01:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d2525bb702071584361073c291f7fc24d5a35fab
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 12 22:32:58 2010 +0000
Fix qt build break.
* html/ThreadableBlobRegistry.cpp:
(WebCore::postTaskToMainThread):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bc7fd7e..5e393c0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2010-08-12 Jian Li <jianli at chromium.org>
+ Fix qt build break.
+
+ * html/ThreadableBlobRegistry.cpp:
+ (WebCore::postTaskToMainThread):
+
+2010-08-12 Jian Li <jianli at chromium.org>
+
Reviewed by David Levin.
Add ThreadableBlobRegistry to support calling BlobRegistry methods in
diff --git a/WebCore/html/ThreadableBlobRegistry.cpp b/WebCore/html/ThreadableBlobRegistry.cpp
index fde70fb..1df290d 100644
--- a/WebCore/html/ThreadableBlobRegistry.cpp
+++ b/WebCore/html/ThreadableBlobRegistry.cpp
@@ -35,6 +35,7 @@
#include "BlobData.h"
#include "BlobRegistry.h"
#include "CrossThreadTask.h"
+#include "NotImplemented.h"
#include "ScriptExecutionContext.h"
#include "WorkerContext.h"
#include "WorkerLoaderProxy.h"
@@ -44,9 +45,13 @@ namespace WebCore {
static void postTaskToMainThread(ScriptExecutionContext* scriptExecutionContext, PassOwnPtr<ScriptExecutionContext::Task> task)
{
+#if ENABLE(WORKERS)
ASSERT(scriptExecutionContext->isWorkerContext());
WorkerLoaderProxy& proxy = static_cast<WorkerContext*>(scriptExecutionContext)->thread()->workerLoaderProxy();
proxy.postTaskToLoader(task);
+#else
+ notImplemented();
+#endif
}
static void registerBlobURLTask(ScriptExecutionContext*, const KURL& url, PassOwnPtr<BlobData> blobData)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list