Changeset 232044 in webkit

Timestamp:

May 21, 2018 8:11:30 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Remove dead exception in MediaList.appendMedium
​https://bugs.webkit.org/show_bug.cgi?id=185278

Patch by Chris Nardi <​cnardi@chromium.org> on 2018-05-21
Reviewed by Chris Dumez.

Source/WebCore:

MediaList.appendMedium was able to throw an exception, but MediaQuerySet::add() always
returned true, making it impossible for that exception to be thrown. This matched the
spec, as |appendMedium| is not specified to throw an exception. Remove the dead code
surrounding the exception, and make MediaQuerySet::add() return false if the medium is
not added.

No new/modified tests as there should be no functional changes.

• css/MediaList.cpp:

(WebCore::MediaQuerySet::add):
(WebCore::MediaList::appendMedium):

• css/MediaList.h:
• css/MediaList.idl:

Source/WebKit:

Remove code pertaining to an exception being thrown by appendMedium().

• WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp:

(webkit_dom_media_list_append_medium):

Source/WebKitLegacy/mac:

Remove code pertaining to an exception being thrown by appendMedium().

• DOM/DOMMediaList.mm:

(-[DOMMediaList appendMedium:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/MediaList.cpp (modified) (3 diffs)
• WebCore/css/MediaList.h (modified) (1 diff)
• WebCore/css/MediaList.idl (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/DOM/DOMMediaList.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-21  Chris Nardi  <cnardi@chromium.org>
+
+        Remove dead exception in MediaList.appendMedium
+        https://bugs.webkit.org/show_bug.cgi?id=185278
+
+        Reviewed by Chris Dumez.
+
+        MediaList.appendMedium was able to throw an exception, but MediaQuerySet::add() always
+        returned true, making it impossible for that exception to be thrown. This matched the
+        spec, as |appendMedium| is not specified to throw an exception. Remove the dead code
+        surrounding the exception, and make MediaQuerySet::add() return false if the medium is
+        not added.
+
+        No new/modified tests as there should be no functional changes.
+
+        * css/MediaList.cpp:
+        (WebCore::MediaQuerySet::add):
+        (WebCore::MediaList::appendMedium):
+        * css/MediaList.h:
+        * css/MediaList.idl:
+
 2018-05-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/css/MediaList.cpp

@@ -97 +97 @@
     // Only continue if exactly one media query is found, as described above.
     if (result->m_queries.size() != 1)
-        return true;
+        return false;
     
     // If comparing with any of the media queries in the collection of media
@@ -103 +103 @@
     for (size_t i = 0; i < m_queries.size(); ++i) {
         if (m_queries[i] == result->m_queries[0])
-            return true;
+            return false;
     }
     
@@ -205 +205 @@
 }
 
-ExceptionOr<void> MediaList::appendMedium(const String& medium)
+void MediaList::appendMedium(const String& medium)
 {
     CSSStyleSheet::RuleMutationScope mutationScope(m_parentRule);
 
-    bool success = m_mediaQueries->add(medium);
-    if (!success) {
-        // FIXME: Should this really be InvalidCharacterError?
-        return Exception { InvalidCharacterError };
-    }
+    if (!m_mediaQueries->add(medium))
+        return;
     if (m_parentStyleSheet)
         m_parentStyleSheet->didMutate();
-    return { };
 }
 

trunk/Source/WebCore/css/MediaList.h

@@ -91 +91 @@
     WEBCORE_EXPORT String item(unsigned index) const;
     WEBCORE_EXPORT ExceptionOr<void> deleteMedium(const String& oldMedium);
-    WEBCORE_EXPORT ExceptionOr<void> appendMedium(const String& newMedium);
+    WEBCORE_EXPORT void appendMedium(const String& newMedium);
 
     String mediaText() const { return m_mediaQueries->mediaText(); }

trunk/Source/WebCore/css/MediaList.idl

@@ -36 +36 @@
 
     [MayThrowException] void deleteMedium(DOMString oldMedium);
-    [MayThrowException] void appendMedium(DOMString newMedium);
+    void appendMedium(DOMString newMedium);
 };

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-21  Chris Nardi  <cnardi@chromium.org>
+
+        Remove dead exception in MediaList.appendMedium
+        https://bugs.webkit.org/show_bug.cgi?id=185278
+
+        Reviewed by Chris Dumez.
+
+        Remove code pertaining to an exception being thrown by appendMedium().
+
+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp:
+        (webkit_dom_media_list_append_medium):
+
 2018-05-21  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp

@@ -195 +195 @@
     WebCore::MediaList* item = WebKit::core(self);
     WTF::String convertedNewMedium = WTF::String::fromUTF8(newMedium);
-    auto result = item->appendMedium(convertedNewMedium);
-    if (result.hasException()) {
-        auto description = WebCore::DOMException::description(result.releaseException().code());
-        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), description.legacyCode, description.name);
-    }
+    item->appendMedium(convertedNewMedium);
 }
 

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-05-21  Chris Nardi  <cnardi@chromium.org>
+
+        Remove dead exception in MediaList.appendMedium
+        https://bugs.webkit.org/show_bug.cgi?id=185278
+
+        Reviewed by Chris Dumez.
+
+        Remove code pertaining to an exception being thrown by appendMedium().
+
+        * DOM/DOMMediaList.mm:
+        (-[DOMMediaList appendMedium:]):
+
 2018-05-21  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKitLegacy/mac/DOM/DOMMediaList.mm

@@ -86 +86 @@
 {
     WebCore::JSMainThreadNullState state;
-    raiseOnDOMError(IMPL->appendMedium(newMedium));
+    IMPL->appendMedium(newMedium);
 }