[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 11:22:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9c37e0f1054287b6ee2bc499ecfcba1b086a7a7f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 21 00:26:09 2010 +0000
2010-07-20 Gavin Peters <gavinp at chromium.org>
Reviewed by Adam Barth.
prefetch categorization is exactly wrong
https://bugs.webkit.org/show_bug.cgi?id=42651
The miscategorization caused onloads to issue early, so you see x,
y as 0, 0 in the buggy version.
* fast/dom/HTMLLinkElement/onload-completion-test-expected.txt: Added.
* fast/dom/HTMLLinkElement/onload-completion-test.html: Added.
* fast/dom/HTMLLinkElement/resources: Added.
* fast/dom/HTMLLinkElement/resources/nick.jpg: Added.
2010-07-20 Gavin Peters <gavinp at chromium.org>
Reviewed by Adam Barth.
prefetch categorization is exactly wrong
https://bugs.webkit.org/show_bug.cgi?id=42651
While I was in the area, I saw that CachedResource::schedule() was dead, so I have removed it.
Test: fast/dom/HTMLLinkElement/onload-completion-test.html
* loader/CachedCSSStyleSheet.h:
* loader/CachedFont.h:
* loader/CachedImage.h:
* loader/CachedResource.cpp:
* loader/CachedResource.h:
(WebCore::CachedResource::isPrefetch):
* loader/CachedScript.h:
* loader/CachedXBLDocument.h:
* loader/CachedXSLStyleSheet.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63792 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e2d18d9..bbeb6b0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20 Gavin Peters <gavinp at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ prefetch categorization is exactly wrong
+ https://bugs.webkit.org/show_bug.cgi?id=42651
+
+ The miscategorization caused onloads to issue early, so you see x,
+ y as 0, 0 in the buggy version.
+
+ * fast/dom/HTMLLinkElement/onload-completion-test-expected.txt: Added.
+ * fast/dom/HTMLLinkElement/onload-completion-test.html: Added.
+ * fast/dom/HTMLLinkElement/resources: Added.
+ * fast/dom/HTMLLinkElement/resources/nick.jpg: Added.
+
2010-07-20 Brian Weinstein <bweinstein at apple.com>
Rubber-stamped by Adam Roben.
diff --git a/LayoutTests/fast/dom/HTMLLinkElement/onload-completion-test-expected.txt b/LayoutTests/fast/dom/HTMLLinkElement/onload-completion-test-expected.txt
new file mode 100644
index 0000000..bc6cf74
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLLinkElement/onload-completion-test-expected.txt
@@ -0,0 +1,4 @@
+This test verifies that at the time a body onload function is called that the subresources of this page (in particular the image) are already loaded. The page verifies that the image has the expected dimensions at the time of the onload event, and prints its result based on that. This is a regression test for a bug introduced by the patch for bug 3652.
+
+
+SUCCESS.
diff --git a/LayoutTests/fast/dom/HTMLLinkElement/onload-completion-test.html b/LayoutTests/fast/dom/HTMLLinkElement/onload-completion-test.html
new file mode 100644
index 0000000..6e24184
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLLinkElement/onload-completion-test.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<script text="text/javascript">
+function runtest()
+{
+var nick=document.getElementById('nick');
+var row=document.getElementById('the_table').insertRow(-1);
+var result=row.insertCell(0);
+if (nick.naturalWidth == 320 && nick.naturalHeight == 240)
+ result.innerHTML = "SUCCESS.";
+else
+ result.innerHTML = "FAILURE!";
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+}
+</script>
+<body onload="runtest()">
+<p>This test verifies that at the time a body onload function is
+called that the subresources of this page (in particular the image)
+are already loaded. The page verifies that the image has the expected
+dimensions at the time of the onload event, and prints its result
+based on that. This is a regression test for a bug introduced by the
+patch for bug 3652.</p>
+<img id=nick src="resources/nick.jpg">
+<table id="the_table" border="1">
+<tr><td></td></tr>
+</table>
+</body>
diff --git a/LayoutTests/fast/dom/HTMLLinkElement/resources/nick.jpg b/LayoutTests/fast/dom/HTMLLinkElement/resources/nick.jpg
new file mode 100644
index 0000000..3d9fb57
Binary files /dev/null and b/LayoutTests/fast/dom/HTMLLinkElement/resources/nick.jpg differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c8d510c..eed894f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-07-20 Gavin Peters <gavinp at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ prefetch categorization is exactly wrong
+ https://bugs.webkit.org/show_bug.cgi?id=42651
+
+ While I was in the area, I saw that CachedResource::schedule() was dead, so I have removed it.
+
+ Test: fast/dom/HTMLLinkElement/onload-completion-test.html
+
+ * loader/CachedCSSStyleSheet.h:
+ * loader/CachedFont.h:
+ * loader/CachedImage.h:
+ * loader/CachedResource.cpp:
+ * loader/CachedResource.h:
+ (WebCore::CachedResource::isPrefetch):
+ * loader/CachedScript.h:
+ * loader/CachedXBLDocument.h:
+ * loader/CachedXSLStyleSheet.h:
+
2010-07-16 James Hawkins <jhawkins at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/loader/CachedCSSStyleSheet.h b/WebCore/loader/CachedCSSStyleSheet.h
index 908c4c0..f5bf042 100644
--- a/WebCore/loader/CachedCSSStyleSheet.h
+++ b/WebCore/loader/CachedCSSStyleSheet.h
@@ -51,8 +51,6 @@ namespace WebCore {
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
virtual void error();
- virtual bool schedule() const { return true; }
-
void checkNotify();
private:
diff --git a/WebCore/loader/CachedFont.h b/WebCore/loader/CachedFont.h
index 05b28f3..01c8c9c 100644
--- a/WebCore/loader/CachedFont.h
+++ b/WebCore/loader/CachedFont.h
@@ -57,8 +57,6 @@ public:
virtual void allClientsRemoved();
- virtual bool schedule() const { return true; }
-
void checkNotify();
void beginLoadIfNeeded(DocLoader* dl);
diff --git a/WebCore/loader/CachedImage.h b/WebCore/loader/CachedImage.h
index b4a032a..eb55955 100644
--- a/WebCore/loader/CachedImage.h
+++ b/WebCore/loader/CachedImage.h
@@ -70,8 +70,6 @@ public:
virtual void httpStatusCodeError() { m_httpStatusCodeErrorOccurred = true; }
bool httpStatusCodeErrorOccurred() const { return m_httpStatusCodeErrorOccurred; }
- virtual bool schedule() const { return true; }
-
void checkNotify();
virtual bool isImage() const { return true; }
diff --git a/WebCore/loader/CachedResource.cpp b/WebCore/loader/CachedResource.cpp
index bde5da5..887b0b5 100644
--- a/WebCore/loader/CachedResource.cpp
+++ b/WebCore/loader/CachedResource.cpp
@@ -102,7 +102,7 @@ CachedResource::~CachedResource()
if (m_docLoader)
m_docLoader->removeCachedResource(this);
}
-
+
void CachedResource::load(DocLoader* docLoader, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks)
{
m_sendResourceLoadCallbacks = sendResourceLoadCallbacks;
diff --git a/WebCore/loader/CachedResource.h b/WebCore/loader/CachedResource.h
index d5bb97e..4b83a8e 100644
--- a/WebCore/loader/CachedResource.h
+++ b/WebCore/loader/CachedResource.h
@@ -125,11 +125,14 @@ public:
void setLoading(bool b) { m_loading = b; }
virtual bool isImage() const { return false; }
+ bool isPrefetch() const
+ {
#if ENABLE(LINK_PREFETCH)
- virtual bool isPrefetch() const { return type() != LinkPrefetch; }
+ return type() == LinkPrefetch;
#else
- virtual bool isPrefetch() const { return false; }
+ return false;
#endif
+ }
unsigned accessCount() const { return m_accessCount; }
void increaseAccessCount() { m_accessCount++; }
@@ -170,8 +173,6 @@ public:
bool isExpired() const;
- virtual bool schedule() const { return isPrefetch(); }
-
// List of acceptable MIME types separated by ",".
// A MIME type may contain a wildcard, e.g. "text/*".
String accept() const { return m_accept; }
diff --git a/WebCore/loader/CachedScript.h b/WebCore/loader/CachedScript.h
index 6b81fda..beab508 100644
--- a/WebCore/loader/CachedScript.h
+++ b/WebCore/loader/CachedScript.h
@@ -48,8 +48,6 @@ namespace WebCore {
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
virtual void error();
- virtual bool schedule() const { return false; }
-
void checkNotify();
virtual void destroyDecodedData();
diff --git a/WebCore/loader/CachedXBLDocument.h b/WebCore/loader/CachedXBLDocument.h
index b92a255..9a8d366 100644
--- a/WebCore/loader/CachedXBLDocument.h
+++ b/WebCore/loader/CachedXBLDocument.h
@@ -51,8 +51,6 @@ namespace WebCore {
virtual void data(Vector<char>&, bool allDataReceived);
virtual void error();
- virtual bool schedule() const { return true; }
-
void checkNotify();
protected:
diff --git a/WebCore/loader/CachedXSLStyleSheet.h b/WebCore/loader/CachedXSLStyleSheet.h
index b6b0585..a0b5477 100644
--- a/WebCore/loader/CachedXSLStyleSheet.h
+++ b/WebCore/loader/CachedXSLStyleSheet.h
@@ -48,8 +48,6 @@ namespace WebCore {
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
virtual void error();
- virtual bool schedule() const { return true; }
-
void checkNotify();
protected:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list