[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 13:28:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6cac38eabebb660912019d8b7cd186460297e68c
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 16 19:09:36 2010 +0000
BlobData should be copied for it to be used cross-thread in ThreadableBlobRegistry.
https://bugs.webkit.org/show_bug.cgi?id=45909
Reviewed by David Levin.
WebCore:
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::BlobRegistryContext::BlobRegistryContext):
LayoutTests:
Also fix a test issue that we do not calculate the right position to move
mouse to on some platform.
* fast/files/apply-blob-url-to-img.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67646 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 934b056..208943d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-16 Jian Li <jianli at chromium.org>
+
+ Reviewed by David Levin.
+
+ BlobData should be copied for it to be used cross-thread in ThreadableBlobRegistry.
+ https://bugs.webkit.org/show_bug.cgi?id=45909
+
+ Also fix a test issue that we do not calculate the right position to move
+ mouse to on some platform.
+
+ * fast/files/apply-blob-url-to-img.html:
+
2010-09-16 Zhenyao Mo <zmo at google.com>
Unreviewed, TAG fix for two webgl tests in Linux/Win.
diff --git a/LayoutTests/fast/files/apply-blob-url-to-img.html b/LayoutTests/fast/files/apply-blob-url-to-img.html
index e81a95f..e1edaee 100644
--- a/LayoutTests/fast/files/apply-blob-url-to-img.html
+++ b/LayoutTests/fast/files/apply-blob-url-to-img.html
@@ -29,10 +29,17 @@ function onImgLoad()
layoutTestController.notifyDone();
}
+function moveMouseToCenterOfElement(element)
+{
+ var centerX = element.offsetLeft + element.offsetWidth / 2;
+ var centerY = element.offsetTop + element.offsetHeight / 2;
+ eventSender.mouseMoveTo(centerX, centerY);
+}
+
function runTests()
{
eventSender.beginDragWithFiles(['resources/abe.png']);
- eventSender.mouseMoveTo(10, 10);
+ moveMouseToCenterOfElement(document.getElementById('file'));
eventSender.mouseUp();
}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b45c3f4..0763542 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-16 Jian Li <jianli at chromium.org>
+
+ Reviewed by David Levin.
+
+ BlobData should be copied for it to be used cross-thread in ThreadableBlobRegistry.
+ https://bugs.webkit.org/show_bug.cgi?id=45909
+
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::BlobRegistryContext::BlobRegistryContext):
+
2010-09-16 Daniel Cheng <dcheng at chromium.org>
Reviewed by Simon Fraser.
diff --git a/WebCore/fileapi/ThreadableBlobRegistry.cpp b/WebCore/fileapi/ThreadableBlobRegistry.cpp
index 7e0745f..f74c680 100644
--- a/WebCore/fileapi/ThreadableBlobRegistry.cpp
+++ b/WebCore/fileapi/ThreadableBlobRegistry.cpp
@@ -41,7 +41,7 @@ namespace WebCore {
struct BlobRegistryContext {
BlobRegistryContext(const KURL& url, PassOwnPtr<BlobData> blobData)
: url(url.copy())
- , blobData(blobData)
+ , blobData(blobData->copy())
{
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list