[webkit-changes] [171268] branches/safari-537.78-branch

Sat, 19 Jul 2014 15:57:07 -0700

Title: [171268] branches/safari-537.78-branch

Diff

Modified: branches/safari-537.78-branch/LayoutTests/ChangeLog (171267 => 171268)


--- branches/safari-537.78-branch/LayoutTests/ChangeLog	2014-07-19 22:50:59 UTC (rev 171267)
+++ branches/safari-537.78-branch/LayoutTests/ChangeLog	2014-07-19 22:56:54 UTC (rev 171268)
@@ -1,3 +1,18 @@
+2014-07-19  Lucas Forschler  <[email protected]>
+
+        Merge r169848
+
+    2014-06-11  David Kilzer  <[email protected]>
+
+            Viewport arguments should ignore invalid characters in values
+            <http://webkit.org/b/133555>
+            <rdar://problem/17179650>
+
+            Reviewed by Daniel Bates.
+
+            * fast/viewport/viewport-warnings-7-expected.txt: Added.
+            * fast/viewport/viewport-warnings-7.html: Added.
+
 2014-07-18  Dana Burkart  <[email protected]>
 
         Merge r169318

Copied: branches/safari-537.78-branch/LayoutTests/fast/viewport/viewport-warnings-7-expected.txt (from rev 169848, trunk/LayoutTests/fast/viewport/viewport-warnings-7-expected.txt) (0 => 171268)


--- branches/safari-537.78-branch/LayoutTests/fast/viewport/viewport-warnings-7-expected.txt	                        (rev 0)
+++ branches/safari-537.78-branch/LayoutTests/fast/viewport/viewport-warnings-7-expected.txt	2014-07-19 22:56:54 UTC (rev 171268)
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 5: Viewport argument value "123i̇" for key "width" was truncated to its numeric prefix.
+ALERT: viewport size 123x135.3 scale 2.60163 with limits [2.60163, 5] and userScalable true
+

Copied: branches/safari-537.78-branch/LayoutTests/fast/viewport/viewport-warnings-7.html (from rev 169848, trunk/LayoutTests/fast/viewport/viewport-warnings-7.html) (0 => 171268)


--- branches/safari-537.78-branch/LayoutTests/fast/viewport/viewport-warnings-7.html	                        (rev 0)
+++ branches/safari-537.78-branch/LayoutTests/fast/viewport/viewport-warnings-7.html	2014-07-19 22:56:54 UTC (rev 171268)
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Invalid value should be truncated.</title>
+    <meta name="viewport" content="width=123&#x0130;">
+    <script>
+        function test() {
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                alert(internals.configurationForViewport(1, 320, 480, 320, 352));
+            }
+        }
+    </script>
+</head>
+<body _onload_="test();">
+</body>
+</html>

Modified: branches/safari-537.78-branch/Source/WebCore/ChangeLog (171267 => 171268)


--- branches/safari-537.78-branch/Source/WebCore/ChangeLog	2014-07-19 22:50:59 UTC (rev 171267)
+++ branches/safari-537.78-branch/Source/WebCore/ChangeLog	2014-07-19 22:56:54 UTC (rev 171268)
@@ -1,5 +1,25 @@
 2014-07-19  Lucas Forschler  <[email protected]>
 
+        Merge r169848
+
+    2014-06-11  David Kilzer  <[email protected]>
+
+            Viewport arguments should ignore invalid characters in values
+            <http://webkit.org/b/133555>
+            <rdar://problem/17179650>
+
+            Reviewed by Daniel Bates.
+
+            Test: fast/viewport/viewport-warnings-7.html
+
+            * dom/Document.cpp:
+            (WebCore::Document::processArguments): Set |length| based on
+            |buffer|, not |features|.  Switch to using a for loop.  Switch
+            to unsigned types since we are working with positive offsets
+            into a String.
+
+2014-07-19  Lucas Forschler  <[email protected]>
+
         Merge r169726
 
     2014-06-09  Alexey Proskuryakov  <[email protected]>

Modified: branches/safari-537.78-branch/Source/WebCore/dom/Document.cpp (171267 => 171268)


--- branches/safari-537.78-branch/Source/WebCore/dom/Document.cpp	2014-07-19 22:50:59 UTC (rev 171267)
+++ branches/safari-537.78-branch/Source/WebCore/dom/Document.cpp	2014-07-19 22:56:54 UTC (rev 171268)
@@ -2884,13 +2884,12 @@
 void Document::processArguments(const String& features, void* data, ArgumentsCallback callback)
 {
     // Tread lightly in this code -- it was specifically designed to mimic Win IE's parsing behavior.
-    int keyBegin, keyEnd;
-    int valueBegin, valueEnd;
+    unsigned keyBegin, keyEnd;
+    unsigned valueBegin, valueEnd;
 
-    int i = 0;
-    int length = features.length();
     String buffer = features.lower();
-    while (i < length) {
+    unsigned length = buffer.length();
+    for (unsigned i = 0; i < length; ) {
         // skip to first non-separator, but don't skip past the end of the string
         while (isSeparator(buffer[i])) {
             if (i >= length)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to