[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:25:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b0754e9eec4054b88abd052eb1a8763c3e72cd6b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 15 03:47:06 2010 +0000
2010-09-14 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r67503.
http://trac.webkit.org/changeset/67503
https://bugs.webkit.org/show_bug.cgi?id=45802
This patch broke GTK builds (Requested by jianli_ on #webkit).
* fast/files/apply-blob-url-to-img.html:
* platform/mac/Skipped:
2010-09-14 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r67503.
http://trac.webkit.org/changeset/67503
https://bugs.webkit.org/show_bug.cgi?id=45802
This patch broke GTK builds (Requested by jianli_ on #webkit).
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::BlobRegistryContext::BlobRegistryContext):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::resourceData):
(WebCore::ResourceLoader::addData):
* platform/network/BlobResourceHandle.cpp:
* platform/network/BlobResourceHandle.h:
* platform/network/ResourceHandle.h:
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::bufferedData):
2010-09-14 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r67503.
http://trac.webkit.org/changeset/67503
https://bugs.webkit.org/show_bug.cgi?id=45802
This patch broke GTK builds (Requested by jianli_ on #webkit).
* src/ResourceHandle.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67532 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 01dd726..5723ff0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-14 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r67503.
+ http://trac.webkit.org/changeset/67503
+ https://bugs.webkit.org/show_bug.cgi?id=45802
+
+ This patch broke GTK builds (Requested by jianli_ on #webkit).
+
+ * fast/files/apply-blob-url-to-img.html:
+ * platform/mac/Skipped:
+
2010-09-14 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
diff --git a/LayoutTests/fast/files/apply-blob-url-to-img.html b/LayoutTests/fast/files/apply-blob-url-to-img.html
index 8654d3d..e81a95f 100644
--- a/LayoutTests/fast/files/apply-blob-url-to-img.html
+++ b/LayoutTests/fast/files/apply-blob-url-to-img.html
@@ -29,18 +29,10 @@ 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']);
- var fileInput = document.getElementById('file');
- moveMouseToCenterOfElement(fileInput);
+ eventSender.mouseMoveTo(10, 10);
eventSender.mouseUp();
}
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index eb69a52..b8ca528 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -300,6 +300,10 @@ inspector/dom-breakpoints.html
# https://bugs.webkit.org/show_bug.cgi?id=43960
scrollbars/custom-scrollbar-with-incomplete-style.html
+# Timeout on Leopard only.
+# https://bugs.webkit.org/show_bug.cgi?id=45576
+fast/files/apply-blob-url-to-img.html
+
# Crash due to r66850.
# https://bugs.webkit.org/show_bug.cgi?id=45575
fast/files/workers
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 62be6a6..db70b64 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-14 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r67503.
+ http://trac.webkit.org/changeset/67503
+ https://bugs.webkit.org/show_bug.cgi?id=45802
+
+ This patch broke GTK builds (Requested by jianli_ on #webkit).
+
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::BlobRegistryContext::BlobRegistryContext):
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::resourceData):
+ (WebCore::ResourceLoader::addData):
+ * platform/network/BlobResourceHandle.cpp:
+ * platform/network/BlobResourceHandle.h:
+ * platform/network/ResourceHandle.h:
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::bufferedData):
+
2010-09-14 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/fileapi/ThreadableBlobRegistry.cpp b/WebCore/fileapi/ThreadableBlobRegistry.cpp
index f74c680..7e0745f 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->copy())
+ , blobData(blobData)
{
}
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp
index 5e770cb..e1d331e 100644
--- a/WebCore/loader/ResourceLoader.cpp
+++ b/WebCore/loader/ResourceLoader.cpp
@@ -51,7 +51,7 @@ PassRefPtr<SharedBuffer> ResourceLoader::resourceData()
if (m_resourceData)
return m_resourceData;
- if (m_handle && m_handle->supportsBufferedData())
+ if (ResourceHandle::supportsBufferedData() && m_handle)
return m_handle->bufferedData();
return 0;
@@ -188,7 +188,7 @@ void ResourceLoader::addData(const char* data, int length, bool allAtOnce)
return;
}
- if (m_handle && m_handle->supportsBufferedData()) {
+ if (ResourceHandle::supportsBufferedData()) {
// Buffer data only if the connection has handed us the data because is has stopped buffering it.
if (m_resourceData)
m_resourceData->append(data, length);
diff --git a/WebCore/platform/network/BlobResourceHandle.cpp b/WebCore/platform/network/BlobResourceHandle.cpp
index e6d3294..8767b55 100644
--- a/WebCore/platform/network/BlobResourceHandle.cpp
+++ b/WebCore/platform/network/BlobResourceHandle.cpp
@@ -189,11 +189,6 @@ void BlobResourceHandle::cancel()
m_aborted = true;
}
-bool BlobResourceHandle::supportsBufferedData()
-{
- return false;
-}
-
void BlobResourceHandle::start()
{
// Do not continue if the request is aborted or an error occurs.
diff --git a/WebCore/platform/network/BlobResourceHandle.h b/WebCore/platform/network/BlobResourceHandle.h
index df99cc5..63e8578 100644
--- a/WebCore/platform/network/BlobResourceHandle.h
+++ b/WebCore/platform/network/BlobResourceHandle.h
@@ -64,7 +64,6 @@ public:
// ResourceHandle methods.
virtual void cancel();
- virtual bool supportsBufferedData();
void start();
int readSync(char*, int);
diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h
index c8102fb..17d1472 100644
--- a/WebCore/platform/network/ResourceHandle.h
+++ b/WebCore/platform/network/ResourceHandle.h
@@ -160,7 +160,7 @@ public:
#endif
PassRefPtr<SharedBuffer> bufferedData();
- virtual bool supportsBufferedData();
+ static bool supportsBufferedData();
bool shouldContentSniff() const;
static bool shouldContentSniffURL(const KURL&);
diff --git a/WebCore/platform/network/mac/ResourceHandleMac.mm b/WebCore/platform/network/mac/ResourceHandleMac.mm
index c0c18ad..6db9350 100644
--- a/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -410,7 +410,7 @@ bool ResourceHandle::supportsBufferedData()
PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
{
- if (supportsBufferedData())
+ if (ResourceHandle::supportsBufferedData())
return SharedBuffer::wrapNSData([d->m_connection.get() _bufferedData]);
return 0;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 57c8e93..b2b9214 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-14 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r67503.
+ http://trac.webkit.org/changeset/67503
+ https://bugs.webkit.org/show_bug.cgi?id=45802
+
+ This patch broke GTK builds (Requested by jianli_ on #webkit).
+
+ * src/ResourceHandle.cpp:
+
2010-09-14 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/src/ResourceHandle.cpp b/WebKit/chromium/src/ResourceHandle.cpp
index 77bd2e9..27bfe7f 100644
--- a/WebKit/chromium/src/ResourceHandle.cpp
+++ b/WebKit/chromium/src/ResourceHandle.cpp
@@ -281,6 +281,7 @@ bool ResourceHandle::loadsBlocked()
return false; // This seems to be related to sync XMLHttpRequest...
}
+// static
bool ResourceHandle::supportsBufferedData()
{
return false; // The loader will buffer manually if it needs to.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list