Diff
Modified: trunk/LayoutTests/ChangeLog (185480 => 185481)
--- trunk/LayoutTests/ChangeLog 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/LayoutTests/ChangeLog 2015-06-12 00:21:01 UTC (rev 185481)
@@ -1,3 +1,17 @@
+2015-06-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r185470.
+ https://bugs.webkit.org/show_bug.cgi?id=145902
+
+ Caused ASan violations (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Add an appearance keyword for wireless playback / airplay
+ icon"
+ https://bugs.webkit.org/show_bug.cgi?id=145892
+ http://trac.webkit.org/changeset/185470
+
2015-06-11 Brady Eidson <[email protected]>
IndexedDB onupgradeneeded event has incorrect value for oldVersion.
Deleted: trunk/LayoutTests/fast/css/appearance-airplay-expected.txt (185480 => 185481)
--- trunk/LayoutTests/fast/css/appearance-airplay-expected.txt 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/LayoutTests/fast/css/appearance-airplay-expected.txt 2015-06-12 00:21:01 UTC (rev 185481)
@@ -1,10 +0,0 @@
-Test the -apple-airplay appearance keyword value.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS filterStyle is '-apple-airplay'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/css/appearance-airplay.html (185480 => 185481)
--- trunk/LayoutTests/fast/css/appearance-airplay.html 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/LayoutTests/fast/css/appearance-airplay.html 2015-06-12 00:21:01 UTC (rev 185481)
@@ -1,28 +0,0 @@
-<!DOCTYPE>
-<html>
-<head>
-<script src=""
-<style>
-#target {
- -webkit-appearance: -apple-airplay;
-}
-</style>
-</head>
-<body>
-<div id="target"></div>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-
-description("Test the -apple-airplay appearance keyword value.");
-
-var target = document.getElementById("target");
-var filterStyle = window.getComputedStyle(target).getPropertyValue('-webkit-appearance');
-shouldBe('filterStyle', "'-apple-airplay'");
-
-successfullyParsed = true;
-
-</script>
-<script src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (185480 => 185481)
--- trunk/Source/WebCore/ChangeLog 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/ChangeLog 2015-06-12 00:21:01 UTC (rev 185481)
@@ -1,3 +1,17 @@
+2015-06-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r185470.
+ https://bugs.webkit.org/show_bug.cgi?id=145902
+
+ Caused ASan violations (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Add an appearance keyword for wireless playback / airplay
+ icon"
+ https://bugs.webkit.org/show_bug.cgi?id=145892
+ http://trac.webkit.org/changeset/185470
+
2015-06-11 Brady Eidson <[email protected]>
IndexedDB onupgradeneeded event has incorrect value for oldVersion.
Modified: trunk/Source/WebCore/css/CSSParser.cpp (185480 => 185481)
--- trunk/Source/WebCore/css/CSSParser.cpp 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-06-12 00:21:01 UTC (rev 185481)
@@ -12830,11 +12830,7 @@
// This makes the string one character longer.
// On iOS we don't want to change values starting with -apple-system to -webkit-system.
// FIXME: Remove this mangling without breaking the web.
- // FIXME: The better way to do this would be to mark up CSSValueKeywords.in with
- // commands that indicate if the keyword should support a translation.
- // https://bugs.webkit.org/show_bug.cgi?id=145883
-
- if ((hasPrefix(buffer, length, "-apple-") && !hasPrefix(buffer, length, "-apple-system") && memcmp(buffer, "-apple-airplay", length)) || hasPrefix(buffer, length, "-khtml-")) {
+ if ((hasPrefix(buffer, length, "-apple-") && !hasPrefix(buffer, length, "-apple-system")) || hasPrefix(buffer, length, "-khtml-")) {
memmove(buffer + 7, buffer + 6, length + 1 - 6);
memcpy(buffer, "-webkit", 7);
++length;
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (185480 => 185481)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-06-12 00:21:01 UTC (rev 185481)
@@ -616,9 +616,6 @@
m_value.valueID = CSSValueImageControlsButton;
break;
#endif
- case WirelessPlaybackIconPart:
- m_value.valueID = CSSValueAppleAirplay;
- break;
}
}
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (185480 => 185481)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2015-06-12 00:21:01 UTC (rev 185481)
@@ -760,7 +760,6 @@
continuous-capacity-level-indicator
discrete-capacity-level-indicator
rating-level-indicator
--apple-airplay
#if defined(ENABLE_SERVICE_CONTROLS) && ENABLE_SERVICE_CONTROLS
image-controls-button
#endif
Modified: trunk/Source/WebCore/platform/ThemeTypes.h (185480 => 185481)
--- trunk/Source/WebCore/platform/ThemeTypes.h 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/platform/ThemeTypes.h 2015-06-12 00:21:01 UTC (rev 185481)
@@ -46,7 +46,6 @@
SearchFieldResultsDecorationPart, SearchFieldResultsButtonPart,
SearchFieldCancelButtonPart, SnapshottedPluginOverlayPart, TextFieldPart,
RelevancyLevelIndicatorPart, ContinuousCapacityLevelIndicatorPart, DiscreteCapacityLevelIndicatorPart, RatingLevelIndicatorPart,
- WirelessPlaybackIconPart,
#if ENABLE(SERVICE_CONTROLS)
ImageControlsButtonPart,
#endif
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (185480 => 185481)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-06-12 00:21:01 UTC (rev 185481)
@@ -257,8 +257,6 @@
case AttachmentPart:
return adjustAttachmentStyle(styleResolver, style, element);
#endif
- case WirelessPlaybackIconPart:
- return adjustWirelessPlaybackIconStyle(styleResolver, style, element);
default:
break;
}
@@ -401,8 +399,6 @@
case AttachmentPart:
return paintAttachment(o, paintInfo, integralSnappedRect);
#endif
- case WirelessPlaybackIconPart:
- return paintWirelessPlaybackIcon(o, paintInfo, integralSnappedRect);
default:
break;
}
@@ -999,15 +995,6 @@
}
#endif
-void RenderTheme::adjustWirelessPlaybackIconStyle(StyleResolver&, RenderStyle&, Element*) const
-{
-}
-
-bool RenderTheme::paintWirelessPlaybackIcon(const RenderObject&, const PaintInfo&, const IntRect&)
-{
- return false;
-}
-
#if ENABLE(DATALIST_ELEMENT)
LayoutUnit RenderTheme::sliderTickSnappingThreshold() const
{
Modified: trunk/Source/WebCore/rendering/RenderTheme.h (185480 => 185481)
--- trunk/Source/WebCore/rendering/RenderTheme.h 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2015-06-12 00:21:01 UTC (rev 185481)
@@ -326,9 +326,6 @@
virtual bool paintAttachment(const RenderObject&, const PaintInfo&, const IntRect&);
#endif
- virtual void adjustWirelessPlaybackIconStyle(StyleResolver&, RenderStyle&, Element*) const;
- virtual bool paintWirelessPlaybackIcon(const RenderObject&, const PaintInfo&, const IntRect&);
-
virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element*) const;
virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (185480 => 185481)
--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-06-12 00:21:01 UTC (rev 185481)
@@ -173,9 +173,6 @@
virtual bool paintAttachment(const RenderObject&, const PaintInfo&, const IntRect&) override;
#endif
- virtual void adjustWirelessPlaybackIconStyle(StyleResolver&, RenderStyle&, Element*) const override;
- virtual bool paintWirelessPlaybackIcon(const RenderObject&, const PaintInfo&, const IntRect&) override;
-
private:
virtual String fileListNameForWidth(const FileList*, const FontCascade&, int width, bool multipleFilesAllowed) const override;
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (185480 => 185481)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-06-12 00:17:32 UTC (rev 185480)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-06-12 00:21:01 UTC (rev 185481)
@@ -2613,15 +2613,6 @@
#endif // ENABLE(ATTACHMENT_ELEMENT)
-void RenderThemeMac::adjustWirelessPlaybackIconStyle(StyleResolver&, RenderStyle&, Element*) const
-{
-}
-
-bool RenderThemeMac::paintWirelessPlaybackIcon(const RenderObject&, const PaintInfo&, const IntRect&)
-{
- return false;
-}
-
} // namespace WebCore
#endif // !PLATFORM(IOS)
