Title: [153417] branches/safari-537-branch
- Revision
- 153417
- Author
- [email protected]
- Date
- 2013-07-28 21:37:24 -0700 (Sun, 28 Jul 2013)
Log Message
Merged r153399. <rdar://problem/14549536>
Modified Paths
Added Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (153416 => 153417)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-29 04:27:26 UTC (rev 153416)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-29 04:37:24 UTC (rev 153417)
@@ -1,3 +1,17 @@
+2013-07-28 Lucas Forschler <[email protected]>
+
+ Merge r153399
+
+ 2013-07-27 Sam Weinig <[email protected]>
+
+ Stop pretending to support <string> for text-align.
+ https://bugs.webkit.org/show_bug.cgi?id=119107
+
+ Reviewed by Andreas Kling.
+
+ * fast/css/text-align-string-crash-expected.txt: Added.
+ * fast/css/text-align-string-crash.html: Added.
+
2013-07-26 Lucas Forschler <[email protected]>
Merge r153366
Copied: branches/safari-537-branch/LayoutTests/fast/css/text-align-string-crash-expected.txt (from rev 153399, trunk/LayoutTests/fast/css/text-align-string-crash-expected.txt) (0 => 153417)
--- branches/safari-537-branch/LayoutTests/fast/css/text-align-string-crash-expected.txt (rev 0)
+++ branches/safari-537-branch/LayoutTests/fast/css/text-align-string-crash-expected.txt 2013-07-29 04:37:24 UTC (rev 153417)
@@ -0,0 +1,4 @@
+This test passes if it doesn't crash.
+
+
+
Copied: branches/safari-537-branch/LayoutTests/fast/css/text-align-string-crash.html (from rev 153399, trunk/LayoutTests/fast/css/text-align-string-crash.html) (0 => 153417)
--- branches/safari-537-branch/LayoutTests/fast/css/text-align-string-crash.html (rev 0)
+++ branches/safari-537-branch/LayoutTests/fast/css/text-align-string-crash.html 2013-07-29 04:37:24 UTC (rev 153417)
@@ -0,0 +1,20 @@
+<strike align="''">
+<html>
+ <head>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function test()
+ {
+ var sel = window.getSelection();
+ sel.setPosition(document.getElementById('dv'), 0);
+ document.execCommand("Delete");
+ }
+ </script>
+ </head>
+ <body _onload_="test()">
+ <p>This test passes if it doesn't crash.</p>
+ <div contenteditable>X<div id="dv"></div></div>
+ </body>
+</html>
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153416 => 153417)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-29 04:27:26 UTC (rev 153416)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-29 04:37:24 UTC (rev 153417)
@@ -1,3 +1,24 @@
+2013-07-28 Lucas Forschler <[email protected]>
+
+ Merge r153399
+
+ 2013-07-26 Sam Weinig <[email protected]>
+
+ Stop pretending to support <string> for text-align.
+ https://bugs.webkit.org/show_bug.cgi?id=119107
+
+ Reviewed by Andreas Kling.
+
+ Test: fast/css/text-align-string-crash.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ Stop pretending to support <string> for text-align.
+
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyTextAlign::applyValue):
+ ASSERT that only value IDs get passed.
+
2013-07-26 Lucas Forschler <[email protected]>
Merge r153378
Modified: branches/safari-537-branch/Source/WebCore/css/CSSParser.cpp (153416 => 153417)
--- branches/safari-537-branch/Source/WebCore/css/CSSParser.cpp 2013-07-29 04:27:26 UTC (rev 153416)
+++ branches/safari-537-branch/Source/WebCore/css/CSSParser.cpp 2013-07-29 04:37:24 UTC (rev 153417)
@@ -1940,9 +1940,9 @@
case CSSPropertyTextAlign:
// left | right | center | justify | -webkit-left | -webkit-right | -webkit-center | -webkit-match-parent
- // | start | end | <string> | inherit | -webkit-auto (converted to start)
- if ((id >= CSSValueWebkitAuto && id <= CSSValueWebkitMatchParent) || id == CSSValueStart || id == CSSValueEnd
- || value->unit == CSSPrimitiveValue::CSS_STRING)
+ // | start | end | inherit | -webkit-auto (converted to start)
+ // NOTE: <string> is not supported.
+ if ((id >= CSSValueWebkitAuto && id <= CSSValueWebkitMatchParent) || id == CSSValueStart || id == CSSValueEnd)
validPrimitive = true;
break;
Modified: branches/safari-537-branch/Source/WebCore/css/DeprecatedStyleBuilder.cpp (153416 => 153417)
--- branches/safari-537-branch/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2013-07-29 04:27:26 UTC (rev 153416)
+++ branches/safari-537-branch/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2013-07-29 04:37:24 UTC (rev 153417)
@@ -1218,6 +1218,7 @@
return;
CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
+ ASSERT(primitiveValue->isIdent());
if (primitiveValue->getIdent() != CSSValueWebkitMatchParent)
styleResolver->style()->setTextAlign(*primitiveValue);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes