Diff
Modified: trunk/LayoutTests/ChangeLog (198254 => 198255)
--- trunk/LayoutTests/ChangeLog 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/ChangeLog 2016-03-16 01:51:12 UTC (rev 198255)
@@ -1,3 +1,17 @@
+2016-03-15 Zalan Bujtas <[email protected]>
+
+ Remove overflow: -webkit-marquee
+ https://bugs.webkit.org/show_bug.cgi?id=155517
+ <rdar://problem/25028481>
+
+ Reviewed by Simon Fraser.
+
+ This patch is based on Blink patch from [email protected] (https://src.chromium.org/viewvc/blink?revision=151756&view=revision)
+
+ * fast/css/getPropertyValue-webkit-marquee.html:
+ * fast/css/webkit-marquee-anonymous-node-crash-expected.txt: Removed.
+ * fast/css/webkit-marquee-anonymous-node-crash.html: Removed.
+
2016-03-15 Joanmarie Diggs <[email protected]>
AX: Expose pointers to SVG elements referenced by aria-labelledby
Modified: trunk/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html (198254 => 198255)
--- trunk/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html 2016-03-16 01:51:12 UTC (rev 198255)
@@ -7,7 +7,6 @@
display: inline-block;
height: 5em;
width: 10em;
- overflow-x: -webkit-marquee;
}
</style>
<script src=""
@@ -17,20 +16,20 @@
</script>
</head>
<body>
- <div id="marquee1" class="test" style="-webkit-marquee: forwards medium 10 slide normal;"></div>
- <div id="marquee2" class="test" style="-webkit-marquee: auto large 10 slide;"></div>
- <div id="marquee3" class="test" style="-webkit-marquee: forwards infinite slide normal;"></div>
- <div id="marquee4" class="test" style="-webkit-marquee: forwards medium slide normal;"></div>
- <div id="marquee5" class="test" style="-webkit-marquee: medium 10 slide normal;"></div>
- <div id="marquee6" class="test" style="-webkit-marquee: forwards small normal;"></div>
- <div id="marquee7" class="test" style="-webkit-marquee: forwards medium infinite;"></div>
- <div id="marquee8" class="test" style="-webkit-marquee: slide fast;"></div>
- <div id="marquee9" class="test" style="-webkit-marquee: forwards;"></div>
- <div id="marquee10" class="test" style="-webkit-marquee: alternate;"></div>
- <div id="marquee11" class="test" style="-webkit-marquee: infinite;"></div>
- <div id="marquee12" class="test" style="-webkit-marquee: foo;"></div>
- <div id="marquee13" class="test" style="-webkit-marquee-direction: forwards; -webkit-marquee-speed: fast;"></div>
- <div id="marquee14" class="test" style="-webkit-marquee-repetition: infinite; -webkit-marquee-style: none;"></div>
+ <marquee id="marquee1" class="test" style="-webkit-marquee: forwards medium 10 slide normal;"></<marquee>
+ <marquee id="marquee2" class="test" style="-webkit-marquee: auto large 10 slide;"></marquee>
+ <marquee id="marquee3" class="test" style="-webkit-marquee: forwards infinite slide normal;"></marquee>
+ <marquee id="marquee4" class="test" style="-webkit-marquee: forwards medium slide normal;"></marquee>
+ <marquee id="marquee5" class="test" style="-webkit-marquee: medium 10 slide normal;"></marquee>
+ <marquee id="marquee6" class="test" style="-webkit-marquee: forwards small normal;"></marquee>
+ <marquee id="marquee7" class="test" style="-webkit-marquee: forwards medium infinite;"></marquee>
+ <marquee id="marquee8" class="test" style="-webkit-marquee: slide fast;"></marquee>
+ <marquee id="marquee9" class="test" style="-webkit-marquee: forwards;"></marquee>
+ <marquee id="marquee10" class="test" style="-webkit-marquee: alternate;"></marquee>
+ <marquee id="marquee11" class="test" style="-webkit-marquee: infinite;"></marquee>
+ <marquee id="marquee12" class="test" style="-webkit-marquee: foo;"></marquee>
+ <marquee id="marquee13" class="test" style="-webkit-marquee-direction: forwards; -webkit-marquee-speed: fast;"></marquee>
+ <marquee id="marquee14" class="test" style="-webkit-marquee-repetition: infinite; -webkit-marquee-style: none;"></marquee>
<script>
description("<a href="" 110816: getPropertyValue for -webkit-marquee returns null, should compute the shorthand value</a>");
Deleted: trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash-expected.txt (198254 => 198255)
--- trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash-expected.txt 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash-expected.txt 2016-03-16 01:51:12 UTC (rev 198255)
@@ -1 +0,0 @@
-Should not crash
Deleted: trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash.html (198254 => 198255)
--- trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash.html 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash.html 2016-03-16 01:51:12 UTC (rev 198255)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<style>p:first-letter { overflow: -webkit-marquee; float: left; }</style>
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-<body>
- <p>Should not crash</p>
-</body>
Modified: trunk/Source/WebCore/ChangeLog (198254 => 198255)
--- trunk/Source/WebCore/ChangeLog 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/ChangeLog 2016-03-16 01:51:12 UTC (rev 198255)
@@ -1,3 +1,33 @@
+2016-03-15 Zalan Bujtas <[email protected]>
+
+ Remove overflow: -webkit-marquee
+ https://bugs.webkit.org/show_bug.cgi?id=155517
+ <rdar://problem/25028481>
+
+ Reviewed by Simon Fraser.
+
+ This patch is based on Blink patch from [email protected] (https://src.chromium.org/viewvc/blink?revision=151756&view=revision)
+
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted.
+ (WebCore::CSSPrimitiveValue::operator EOverflow): Deleted.
+ * css/CSSValueKeywords.in:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle):
+ * css/html.css:
+ (marquee): Deleted.
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::sizesLogicalWidthToFitContent):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollTo):
+ (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayer.h:
+ * rendering/RenderMarquee.h:
+ * rendering/style/RenderStyleConstants.h:
+
2016-03-15 Joanmarie Diggs <[email protected]>
AX: Expose pointers to SVG elements referenced by aria-labelledby
Modified: trunk/Source/WebCore/css/CSSParser.cpp (198254 => 198255)
--- trunk/Source/WebCore/css/CSSParser.cpp 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-03-16 01:51:12 UTC (rev 198255)
@@ -731,12 +731,12 @@
return true;
break;
#endif
- case CSSPropertyOverflowX: // visible | hidden | scroll | auto | marquee | overlay | inherit
- if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitMarquee)
+ case CSSPropertyOverflowX: // visible | hidden | scroll | auto | overlay | inherit
+ if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay)
return true;
break;
- case CSSPropertyOverflowY: // visible | hidden | scroll | auto | marquee | overlay | inherit | -webkit-paged-x | -webkit-paged-y
- if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitMarquee || valueID == CSSValueWebkitPagedX || valueID == CSSValueWebkitPagedY)
+ case CSSPropertyOverflowY: // visible | hidden | scroll | auto | overlay | inherit | -webkit-paged-x | -webkit-paged-y
+ if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitPagedX || valueID == CSSValueWebkitPagedY)
return true;
break;
case CSSPropertyPageBreakAfter: // auto | always | avoid | left | right | inherit
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (198254 => 198255)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-03-16 01:51:12 UTC (rev 198255)
@@ -2180,9 +2180,6 @@
case OAUTO:
m_value.valueID = CSSValueAuto;
break;
- case OMARQUEE:
- m_value.valueID = CSSValueWebkitMarquee;
- break;
case OOVERLAY:
m_value.valueID = CSSValueOverlay;
break;
@@ -2208,8 +2205,6 @@
return OSCROLL;
case CSSValueAuto:
return OAUTO;
- case CSSValueWebkitMarquee:
- return OMARQUEE;
case CSSValueOverlay:
return OOVERLAY;
case CSSValueWebkitPagedX:
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (198254 => 198255)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-03-16 01:51:12 UTC (rev 198255)
@@ -522,7 +522,6 @@
local
loud
lower
--webkit-marquee
mix
no-close-quote
no-open-quote
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (198254 => 198255)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-03-16 01:51:12 UTC (rev 198255)
@@ -888,12 +888,14 @@
else
style.addToTextDecorationsInEffect(style.textDecoration());
+ // For now, <marquee> requires an overflow clip to work properly.
+ if (is<HTMLMarqueeElement>(e)) {
+ style.setOverflowX(OHIDDEN);
+ style.setOverflowY(OHIDDEN);
+ }
+
// If either overflow value is not visible, change to auto.
- if (style.overflowX() == OMARQUEE && style.overflowY() != OMARQUEE)
- style.setOverflowY(OMARQUEE);
- else if (style.overflowY() == OMARQUEE && style.overflowX() != OMARQUEE)
- style.setOverflowX(OMARQUEE);
- else if (style.overflowX() == OVISIBLE && style.overflowY() != OVISIBLE) {
+ if (style.overflowX() == OVISIBLE && style.overflowY() != OVISIBLE) {
// FIXME: Once we implement pagination controls, overflow-x should default to hidden
// if overflow-y is set to -webkit-paged-x or -webkit-page-y. For now, we'll let it
// default to auto so we can at least scroll through the pages.
Modified: trunk/Source/WebCore/css/html.css (198254 => 198255)
--- trunk/Source/WebCore/css/html.css 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/html.css 2016-03-16 01:51:12 UTC (rev 198255)
@@ -53,7 +53,6 @@
marquee {
display: inline-block;
- overflow: -webkit-marquee;
}
blockquote {
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (198254 => 198255)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-03-16 01:51:12 UTC (rev 198255)
@@ -2572,7 +2572,7 @@
// FIXME: Think about block-flow here. Need to find out how marquee direction relates to
// block-flow (as well as how marquee overflow should relate to block flow).
// https://bugs.webkit.org/show_bug.cgi?id=46472
- if (parent()->style().overflowX() == OMARQUEE) {
+ if (parent()->isHTMLMarquee()) {
EMarqueeDirection dir = parent()->style().marqueeDirection();
if (dir == MAUTO || dir == MFORWARD || dir == MBACKWARD || dir == MLEFT || dir == MRIGHT)
return true;
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (198254 => 198255)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-03-16 01:51:12 UTC (rev 198255)
@@ -2347,7 +2347,7 @@
return;
ScrollPosition newPosition = position;
- if (box->style().overflowX() != OMARQUEE) {
+ if (!box->isHTMLMarquee()) {
// Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
if (m_scrollDimensionsDirty)
computeScrollDimensions();
@@ -3495,7 +3495,7 @@
updateSnapOffsets();
#endif
- if (box->style().overflowX() != OMARQUEE && !isRubberBandInProgress()) {
+ if (!box->isHTMLMarquee() && !isRubberBandInProgress()) {
// Layout may cause us to be at an invalid scroll position. In this case we need
// to pull our scroll offsets back to the max (or push them up to the min).
ScrollOffset clampedScrollOffset = clampScrollOffset(scrollOffset());
@@ -6675,7 +6675,7 @@
dirtyStackingContainerZOrderLists();
}
- if (renderer().style().overflowX() == OMARQUEE && renderer().style().marqueeBehavior() != MNONE && renderer().isBox()) {
+ if (renderer().isHTMLMarquee() && renderer().style().marqueeBehavior() != MNONE && renderer().isBox()) {
if (!m_marquee)
m_marquee = std::make_unique<RenderMarquee>(this);
m_marquee->updateMarqueeStyle();
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (198254 => 198255)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-03-16 01:51:12 UTC (rev 198255)
@@ -1122,7 +1122,7 @@
IntPoint m_cachedOverlayScrollbarOffset;
- std::unique_ptr<RenderMarquee> m_marquee; // Used by layers with overflow:marquee
+ std::unique_ptr<RenderMarquee> m_marquee; // Used for <marquee>.
// Cached normal flow values for absolute positioned elements with static left/top values.
LayoutUnit m_staticInlinePosition;
Modified: trunk/Source/WebCore/rendering/RenderMarquee.h (198254 => 198255)
--- trunk/Source/WebCore/rendering/RenderMarquee.h 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderMarquee.h 2016-03-16 01:51:12 UTC (rev 198255)
@@ -52,7 +52,7 @@
class RenderLayer;
-// This class handles the auto-scrolling of layers with overflow: marquee.
+// This class handles the auto-scrolling for <marquee>
class RenderMarquee final {
WTF_MAKE_NONCOPYABLE(RenderMarquee); WTF_MAKE_FAST_ALLOCATED;
public:
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (198254 => 198255)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-03-16 01:51:12 UTC (rev 198255)
@@ -191,7 +191,7 @@
// Random visual rendering model attributes. Not inherited.
enum EOverflow {
- OVISIBLE, OHIDDEN, OSCROLL, OAUTO, OOVERLAY, OMARQUEE, OPAGEDX, OPAGEDY
+ OVISIBLE, OHIDDEN, OSCROLL, OAUTO, OOVERLAY, OPAGEDX, OPAGEDY
};
enum EVerticalAlign {
