Unreviewed, rolling out r185470.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jun 2015 00:21:01 +0000 (00:21 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jun 2015 00:21:01 +0000 (00:21 +0000)
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

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

12 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/css/appearance-airplay-expected.txt [deleted file]
LayoutTests/fast/css/appearance-airplay.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPrimitiveValueMappings.h
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/platform/ThemeTypes.h
Source/WebCore/rendering/RenderTheme.cpp
Source/WebCore/rendering/RenderTheme.h
Source/WebCore/rendering/RenderThemeMac.h
Source/WebCore/rendering/RenderThemeMac.mm

index ae9bbd7..7f9bb25 100644 (file)
@@ -1,3 +1,17 @@
+2015-06-11  Commit Queue  <commit-queue@webkit.org>
+
+        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  <beidson@apple.com>
 
         IndexedDB onupgradeneeded event has incorrect value for oldVersion.
diff --git a/LayoutTests/fast/css/appearance-airplay-expected.txt b/LayoutTests/fast/css/appearance-airplay-expected.txt
deleted file mode 100644 (file)
index 92c7225..0000000
+++ /dev/null
@@ -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
-
diff --git a/LayoutTests/fast/css/appearance-airplay.html b/LayoutTests/fast/css/appearance-airplay.html
deleted file mode 100644 (file)
index e3a2886..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE>
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-<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="../../resources/js-test-post.js"></script>
-</body>
-</html>
index 31c36f1..491ef0c 100644 (file)
@@ -1,3 +1,17 @@
+2015-06-11  Commit Queue  <commit-queue@webkit.org>
+
+        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  <beidson@apple.com>
 
         IndexedDB onupgradeneeded event has incorrect value for oldVersion.
index 6ded950..584c0c5 100644 (file)
@@ -12830,11 +12830,7 @@ static CSSValueID cssValueKeywordID(const CharacterType* valueKeyword, unsigned
         // 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;
index 3b91a4e..3348aac 100644 (file)
@@ -616,9 +616,6 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ControlPart e)
         m_value.valueID = CSSValueImageControlsButton;
         break;
 #endif
-    case WirelessPlaybackIconPart:
-        m_value.valueID = CSSValueAppleAirplay;
-        break;
     }
 }
 
index 79e1ea8..1beb134 100644 (file)
@@ -760,7 +760,6 @@ relevancy-level-indicator
 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
index 6f5d96a..5ff8542 100644 (file)
@@ -46,7 +46,6 @@ enum ControlPart {
     SearchFieldResultsDecorationPart, SearchFieldResultsButtonPart,
     SearchFieldCancelButtonPart, SnapshottedPluginOverlayPart, TextFieldPart,
     RelevancyLevelIndicatorPart, ContinuousCapacityLevelIndicatorPart, DiscreteCapacityLevelIndicatorPart, RatingLevelIndicatorPart,
-    WirelessPlaybackIconPart,
 #if ENABLE(SERVICE_CONTROLS)
     ImageControlsButtonPart,
 #endif
index 0b6145c..8014082 100644 (file)
@@ -257,8 +257,6 @@ void RenderTheme::adjustStyle(StyleResolver& styleResolver, RenderStyle& style,
     case AttachmentPart:
         return adjustAttachmentStyle(styleResolver, style, element);
 #endif
-    case WirelessPlaybackIconPart:
-        return adjustWirelessPlaybackIconStyle(styleResolver, style, element);
     default:
         break;
     }
@@ -401,8 +399,6 @@ bool RenderTheme::paint(const RenderObject& o, ControlStates* controlStates, con
     case AttachmentPart:
         return paintAttachment(o, paintInfo, integralSnappedRect);
 #endif
-    case WirelessPlaybackIconPart:
-        return paintWirelessPlaybackIcon(o, paintInfo, integralSnappedRect);
     default:
         break;
     }
@@ -999,15 +995,6 @@ bool RenderTheme::paintAttachment(const RenderObject&, const PaintInfo&, const I
 }
 #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
 {
index 824e172..92246f5 100644 (file)
@@ -326,9 +326,6 @@ protected:
     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; }
 
index 6f63b0d..e05b87a 100644 (file)
@@ -173,9 +173,6 @@ protected:
     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;
 
index f89c7e9..4a7ccb2 100644 (file)
@@ -2613,15 +2613,6 @@ bool RenderThemeMac::paintAttachment(const RenderObject& renderer, const PaintIn
 
 #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)