Changeset 209211 in webkit

Timestamp:

Dec 1, 2016 2:24:07 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r209145. rdar://problem/29404231

Location:

branches/safari-602-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/color-input-element-shadow-manipulation-expected.txt (added)
• LayoutTests/fast/shadow-dom/color-input-element-shadow-manipulation.html (added)
• LayoutTests/fast/shadow-dom/file-input-element-shadow-manipulation-expected.txt (added)
• LayoutTests/fast/shadow-dom/file-input-element-shadow-manipulation.html (added)
• LayoutTests/fast/shadow-dom/keygen-shadow-manipulation-expected.txt (added)
• LayoutTests/fast/shadow-dom/keygen-shadow-manipulation.html (added)
• LayoutTests/fast/shadow-dom/media-shadow-manipulation-expected.txt (added)
• LayoutTests/fast/shadow-dom/media-shadow-manipulation.html (added)
• LayoutTests/fast/shadow-dom/range-input-element-shadow-manipulation-expected.txt (added)
• LayoutTests/fast/shadow-dom/range-input-element-shadow-manipulation.html (added)
• LayoutTests/fast/shadow-dom/textarea-shadow-manipulation-expected.txt (added)
• LayoutTests/fast/shadow-dom/textarea-shadow-manipulation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/html/ColorInputType.cpp (modified) (2 diffs)
• Source/WebCore/html/FileInputType.cpp (modified) (5 diffs)
• Source/WebCore/html/HTMLKeygenElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLTextAreaElement.cpp (modified) (3 diffs)
• Source/WebCore/html/RangeInputType.cpp (modified) (2 diffs)
• Source/WebCore/html/shadow/SliderThumbElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGUseElement.cpp (modified) (1 diff)

branches/safari-602-branch/LayoutTests/ChangeLog

@@ +1 @@
+2016-12-01  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r209145. rdar://problem/29404231
+
+    2016-11-30  Brent Fulgham  <bfulgham@apple.com>
+
+            Use 'childOfType' template when retrieving Shadow DOM elements
+            https://bugs.webkit.org/show_bug.cgi?id=165145
+            <rdar://problem/29331830>
+
+            Reviewed by Antti Koivisto.
+
+            * fast/shadow-dom/color-input-element-shadow-manipulation-expected.txt: Added.
+            * fast/shadow-dom/color-input-element-shadow-manipulation.html: Added.
+            * fast/shadow-dom/file-input-element-shadow-manipulation-expected.txt: Added.
+            * fast/shadow-dom/file-input-element-shadow-manipulation.html: Added.
+            * fast/shadow-dom/keygen-shadow-manipulation-expected.txt: Added.
+            * fast/shadow-dom/keygen-shadow-manipulation.html: Added.
+            * fast/shadow-dom/media-shadow-manipulation-expected.txt: Added.
+            * fast/shadow-dom/media-shadow-manipulation.html: Added.
+            * fast/shadow-dom/range-input-element-shadow-manipulation-expected.txt: Added.
+            * fast/shadow-dom/range-input-element-shadow-manipulation.html: Added.
+            * fast/shadow-dom/textarea-shadow-manipulation-expected.txt: Added.
+            * fast/shadow-dom/textarea-shadow-manipulation.html: Added.
+
 2016-12-01  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-01  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r209145. rdar://problem/29404231
+
+    2016-11-30  Brent Fulgham  <bfulgham@apple.com>
+
+            Use 'childOfType' template when retrieving Shadow DOM elements
+            https://bugs.webkit.org/show_bug.cgi?id=165145
+            <rdar://problem/29331830>
+
+            Reviewed by Antti Koivisto.
+
+            Tests: fast/shadow-dom/color-input-element-shadow-manipulation.html
+                   fast/shadow-dom/file-input-element-shadow-manipulation.html
+                   fast/shadow-dom/keygen-shadow-manipulation.html
+                   fast/shadow-dom/media-shadow-manipulation.html
+                   fast/shadow-dom/range-input-element-shadow-manipulation.html
+                   fast/shadow-dom/textarea-shadow-manipulation.html
+
+            Switch to using 'childOfType' when retrieving Shadow DOM elements, rather
+            than relying on expected element positions, as these can be changed by
+            JavaScript.
+
+            Drive by fix: Make more use of is<> and downcast<> templates rather than blindly casting.
+
+            * dom/Element.h:
+            (WebCore::Element::isUploadButton): Added.
+            (WebCore::Element::isSliderContainerElement): Added.
+            * html/ColorInputType.cpp:
+            (WebCore::ColorInputType::shadowColorSwatch): Use 'childOfType' rather than assuming
+            the first child is the one we want.
+            * html/FileInputType.cpp:
+            (isType): Added.
+            (WebCore::FileInputType::disabledAttributeChanged): Use 'childOfType' rather than assuming
+            the first child is the one we want.
+            (WebCore::FileInputType::multipleAttributeChanged): Ditto.
+            * html/HTMLKeygenElement.cpp:
+            (WebCore::HTMLKeygenElement::shadowSelect): Ditto.
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::mediaControls): Ditto.
+            (WebCore::HTMLMediaElement::hasMediaControls): Ditto.
+            * html/HTMLTextAreaElement.cpp:
+            (WebCore::HTMLTextAreaElement::innerTextElement): Ditto.
+            * html/RangeInputType.cpp:
+            (WebCore::RangeInputType::sliderTrackElement): Ditto.
+            * html/shadow/SliderThumbElement.h:
+            (isType): Added.
+            * svg/SVGUseElement.cpp:
+            (WebCore::SVGUseElement::targetClone): Use 'childOfType' rather than assuming
+            the first child is the one we want.
+
 2016-12-01  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602-branch/Source/WebCore/dom/Element.h

@@ -423 +423 @@
     virtual bool isOutOfRange() const { return false; }
     virtual bool isFrameElementBase() const { return false; }
+    virtual bool isUploadButton() const { return false; }
+    virtual bool isSliderContainerElement() const { return false; }
 
     bool canContainRangeEndPoint() const override;

branches/safari-602-branch/Source/WebCore/html/ColorInputType.cpp

@@ -39 +39 @@
 #include "Chrome.h"
 #include "Color.h"
+#include "ElementChildIterator.h"
 #include "HTMLDataListElement.h"
 #include "HTMLDivElement.h"
@@ -205 +206 @@
 {
     ShadowRoot* shadow = element().userAgentShadowRoot();
-    return shadow ? downcast<HTMLElement>(shadow->firstChild()->firstChild()) : nullptr;
+    if (!shadow)
+        return nullptr;
+
+    auto wrapper = childrenOfType<HTMLDivElement>(*shadow).first();
+    if (!wrapper)
+        return nullptr;
+
+    return childrenOfType<HTMLDivElement>(*wrapper).first();
 }
 

branches/safari-602-branch/Source/WebCore/html/FileInputType.cpp

@@ -25 +25 @@
 #include "Chrome.h"
 #include "DragData.h"
+#include "ElementChildIterator.h"
 #include "Event.h"
 #include "File.h"
@@ -40 +41 @@
 #include "ScriptController.h"
 #include "ShadowRoot.h"
+#include <wtf/TypeCasts.h>
 #include <wtf/text/StringBuilder.h>
+
+
+namespace WebCore {
+class UploadButtonElement;
+}
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::UploadButtonElement)
+    static bool isType(const WebCore::Element& element) { return element.isUploadButton(); }
+    static bool isType(const WebCore::Node& node) { return is<WebCore::Element>(node) && isType(downcast<WebCore::Element>(node)); }
+SPECIALIZE_TYPE_TRAITS_END()
 
 namespace WebCore {
@@ -52 +64 @@
 
 private:
+    bool isUploadButton() const override { return true; }
+    
     UploadButtonElement(Document&);
 };
@@ -278 +292 @@
 {
     ASSERT(element().shadowRoot());
-    UploadButtonElement* button = static_cast<UploadButtonElement*>(element().userAgentShadowRoot()->firstChild());
-    if (button)
+
+    ShadowRoot* root = element().userAgentShadowRoot();
+    if (!root)
+        return;
+    
+    if (auto* button = childrenOfType<UploadButtonElement>(*root).first())
         button->setBooleanAttribute(disabledAttr, element().isDisabledFormControl());
 }
@@ -286 +304 @@
 {
     ASSERT(element().shadowRoot());
-    UploadButtonElement* button = static_cast<UploadButtonElement*>(element().userAgentShadowRoot()->firstChild());
-    if (button)
+
+    ShadowRoot* root = element().userAgentShadowRoot();
+    if (!root)
+        return;
+
+    if (auto* button = childrenOfType<UploadButtonElement>(*root).first())
         button->setValue(element().multiple() ? fileButtonChooseMultipleFilesLabel() : fileButtonChooseFileLabel());
 }

branches/safari-602-branch/Source/WebCore/html/HTMLKeygenElement.cpp

@@ -3 +3 @@
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2006, 2010, 2012-2016 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
@@ -28 +28 @@
 #include "Attribute.h"
 #include "Document.h"
+#include "ElementChildIterator.h"
 #include "FormDataList.h"
 #include "HTMLNames.h"
@@ -146 +147 @@
 {
     ShadowRoot* root = userAgentShadowRoot();
-    return root ? downcast<HTMLSelectElement>(root->firstChild()) : nullptr;
+    if (!root)
+        return nullptr;
+
+    return childrenOfType<HTMLSelectElement>(*root).first();
 }
 

branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5966 +5966 @@
 {
 #if ENABLE(MEDIA_CONTROLS_SCRIPT)
-    return 0;
+    return nullptr;
 #else
-    return toMediaControls(userAgentShadowRoot()->firstChild());
+    ShadowRoot* root = userAgentShadowRoot();
+    if (!root)
+        return nullptr;
+    
+    return childrenOfType<MediaControls>(*root).first();
 #endif
 }
@@ -5979 +5983 @@
 
     if (ShadowRoot* userAgent = userAgentShadowRoot()) {
-        Node* node = userAgent->firstChild();
+        Node* node = childrenOfType<MediaControls>(*root).first();
         ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isMediaControls());
         return node;

branches/safari-602-branch/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -3 +3 @@
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2008, 2010, 2014, 2016 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
@@ -31 +31 @@
 #include "Document.h"
 #include "Editor.h"
+#include "ElementChildIterator.h"
 #include "Event.h"
 #include "EventHandler.h"
@@ -325 +326 @@
 TextControlInnerTextElement* HTMLTextAreaElement::innerTextElement() const
 {
-    return downcast<TextControlInnerTextElement>(userAgentShadowRoot()->firstChild());
+    ShadowRoot* root = userAgentShadowRoot();
+    if (!root)
+        return nullptr;
+    
+    return childrenOfType<TextControlInnerTextElement>(*root).first();
 }
 

branches/safari-602-branch/Source/WebCore/html/RangeInputType.cpp

@@ -34 +34 @@
 
 #include "AXObjectCache.h"
+#include "ElementChildIterator.h"
 #include "EventNames.h"
 #include "ExceptionCodePlaceholder.h"
@@ -271 +272 @@
     ASSERT(element().userAgentShadowRoot()->firstChild()->firstChild()); // track
 
-    return downcast<HTMLElement>(element().userAgentShadowRoot()->firstChild()->firstChild());
+    ShadowRoot* root = element().userAgentShadowRoot();
+    if (!root)
+        return nullptr;
+    
+    auto* container = childrenOfType<SliderContainerElement>(*root).first();
+    if (!container)
+        return nullptr;
+
+    return childrenOfType<HTMLElement>(*container).first();
 }
 

branches/safari-602-branch/Source/WebCore/html/shadow/SliderThumbElement.h

@@ -138 +138 @@
     Optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) override;
     const AtomicString& shadowPseudoId() const override;
+    bool isSliderContainerElement() const override { return true; }
 
     AtomicString m_shadowPseudoId;
 };
 
-}
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::SliderContainerElement)
+    static bool isType(const WebCore::Element& element) { return element.isSliderContainerElement(); }
+    static bool isType(const WebCore::Node& node) { return is<WebCore::Element>(node) && isType(downcast<WebCore::Element>(node)); }
+SPECIALIZE_TYPE_TRAITS_END()
 
 #endif

branches/safari-602-branch/Source/WebCore/svg/SVGUseElement.cpp

@@ -262 +262 @@
     if (!root)
         return nullptr;
-    return downcast<SVGElement>(root->firstChild());
+    return childrenOfType<SVGElement>(*root).first();
 }