Eliminate a useless comparison in srcset's candidate selection algorithm

https://bugs.webkit.org/show_bug.cgi?id=120235

Source/WebCore:

There is no point in comparing the last item in the candidates vector to the DPR, since it will be returned anyway. Therefore, the
iteration on the candidates vector now skips the last candidate.

Patch by Yoav Weiss <yoav@yoav.ws> on 2013-08-24
Reviewed by Andreas Kling.

* html/parser/HTMLParserIdioms.cpp:
(WebCore::bestFitSourceForImageAttributes):

LayoutTests:

Removed MIME types from the test's output, since they're irrelevant for the test, and make it fragile.

Patch by Yoav Weiss <yoav@yoav.ws> on 2013-08-24
Reviewed by Andreas Kling.

* fast/hidpi/image-srcset-fraction-expected.txt:
* fast/hidpi/image-srcset-fraction.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 64752c29fd6840c5d6f98f9e8587326a8ae76ce5..68844c05cca2d38a71e2415690f3841eaaf62eea 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2013-08-24  Yoav Weiss  <yoav@yoav.ws>
+
+        Eliminate a useless comparison in srcset's candidate selection algorithm
+        https://bugs.webkit.org/show_bug.cgi?id=120235
+
+        Removed MIME types from the test's output, since they're irrelevant for the test, and make it fragile.
+
+        Reviewed by Andreas Kling.
+
+        * fast/hidpi/image-srcset-fraction-expected.txt:
+        * fast/hidpi/image-srcset-fraction.html:
+
 2013-08-23  Ryosuke Niwa  <rniwa@webkit.org>
 
         Rebaseline after r154518.  Also fix the test to expect "0" instead of "-0".

diff --git a/LayoutTests/fast/hidpi/image-srcset-fraction-expected.txt b/LayoutTests/fast/hidpi/image-srcset-fraction-expected.txt
index 7a2b7eea088d27a139c299dbbc983a8a1e715358..23d2c3960385ec13da83bd8e9082b725833e37bc 100644 (file)
--- a/LayoutTests/fast/hidpi/image-srcset-fraction-expected.txt
+++ b/LayoutTests/fast/hidpi/image-srcset-fraction-expected.txt
@@ -1,8 +1,3 @@
-blue-100-px-square.png has MIME type image/png
-image-srcset-fraction.html has MIME type text/html
-srcset-helper.js has MIME type text/javascript
-js-test-pre.js has MIME type text/javascript
-green-200-px-square.png has MIME type image/png
 PASS document.getElementById("testimg").clientWidth==200 is true
 This test passes if the srcset resource is loaded and displayed as the image
 

diff --git a/LayoutTests/fast/hidpi/image-srcset-fraction.html b/LayoutTests/fast/hidpi/image-srcset-fraction.html
index 0beb23027b4864422099277880c712e7fc85da52..e979bef923a4e5f812340cfce1735694c4aab1dc 100644 (file)
--- a/LayoutTests/fast/hidpi/image-srcset-fraction.html
+++ b/LayoutTests/fast/hidpi/image-srcset-fraction.html
@@ -8,7 +8,6 @@
 <script>
     if (window.testRunner) {
         testRunner.dumpAsText();
-        testRunner.dumpResourceResponseMIMETypes();
     }
 
     addEventListener("load", function() {

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 21abb60b5e7062dd34f390d0be0d7d5a35d8855f..cfa40b8f177f0d0a2a209548992f3700d9107437 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2013-08-24  Yoav Weiss  <yoav@yoav.ws>
+
+        Eliminate a useless comparison in srcset's candidate selection algorithm
+        https://bugs.webkit.org/show_bug.cgi?id=120235
+
+        There is no point in comparing the last item in the candidates vector to the DPR, since it will be returned anyway. Therefore, the
+        iteration on the candidates vector now skips the last candidate.
+
+        Reviewed by Andreas Kling.
+
+        * html/parser/HTMLParserIdioms.cpp:
+        (WebCore::bestFitSourceForImageAttributes):
+
 2013-08-24  Andreas Kling  <akling@apple.com>
 
         RenderObject::view() should return a reference.

diff --git a/Source/WebCore/html/parser/HTMLParserIdioms.cpp b/Source/WebCore/html/parser/HTMLParserIdioms.cpp
index baa7ce8abd888c0adb62a94a1fde87fba8148c5a..3d26942fc7424306fcf9ecd8b28358efa70a90ad 100644 (file)
--- a/Source/WebCore/html/parser/HTMLParserIdioms.cpp
+++ b/Source/WebCore/html/parser/HTMLParserIdioms.cpp
@@ -362,7 +362,7 @@ String bestFitSourceForImageAttributes(float deviceScaleFactor, const String& sr
 
     std::stable_sort(imageCandidates.begin(), imageCandidates.end(), compareByScaleFactor);
 
-    for (size_t i = 0; i < imageCandidates.size(); ++i) {
+    for (size_t i = 0; i < imageCandidates.size() - 1; ++i) {
         if (imageCandidates[i].scaleFactor >= deviceScaleFactor)
             return imageCandidates[i].imageURL;
     }