Title: [123443] trunk/Source/WebCore
Revision
123443
Author
[email protected]
Date
2012-07-24 02:17:30 -0700 (Tue, 24 Jul 2012)

Log Message

Replace some callsites of shadowAncestorNode() with shadowHost()
https://bugs.webkit.org/show_bug.cgi?id=92060

Reviewed by Hajime Morita.

shadowAncestorNode() is deprecated.

No new tests. This shouldn't change behaviors.

* html/shadow/MediaControlElements.cpp:
(WebCore::toParentMediaElement):
* html/shadow/TextControlInnerElements.h:
(WebCore::SpinButtonElement::isEnabledFormControl):
(WebCore::SpinButtonElement::isReadOnlyFormControl):
* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::paintMediaFullscreenButton):
(WebCore::RenderThemeEfl::paintMediaMuteButton):
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::getMediaElementFromRenderObject):
(WebCore::centerRectVerticallyInParentInputElement):
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::paintSearchFieldCancelButton):
(WebCore::RenderThemeQt::paintMediaSliderThumb):
Removed an ASSERT() because nullness of o->node() is already asserted.
* rendering/RenderInputSpeech.cpp:
(WebCore::RenderInputSpeech::paintInputFieldSpeechButton):
* rendering/RenderMediaControlsChromium.cpp:
(WebCore::paintMediaSliderThumb):
Passing shadowHost() to toParentMediaElement(), which accepts 0 and will return 0.
(WebCore::paintMediaVolumeSliderThumb): ditto.
* rendering/RenderThemeChromiumSkia.cpp:
(WebCore::RenderThemeChromiumSkia::paintSearchFieldCancelButton):
(WebCore::RenderThemeChromiumSkia::paintSearchFieldResultsDecoration):
(WebCore::RenderThemeChromiumSkia::paintSearchFieldResultsButton):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
Remove an ASSERT(input) because input never be null unless o->node() is
null. If o->node() is null, this function crashes.
(WebCore::RenderThemeMac::paintSearchFieldResultsDecoration):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):
(WebCore::RenderThemeMac::paintMediaMuteButton):
It's ok to ignore "node is a media element" case because this function
works only if node->isMediaControlElement().
(WebCore::RenderThemeMac::paintMediaPlayButton): ditto.
(WebCore::RenderThemeMac::paintMediaSliderTrack): ditto.
* rendering/RenderThemeSafari.cpp:
(WebCore::RenderThemeSafari::paintSearchFieldCancelButton):
Remove an ASSERT(input) because input never be null unless o->node() is
null. If o->node() is null, this function crashes.
(WebCore::RenderThemeSafari::paintSearchFieldResultsDecoration): ditto.
(WebCore::RenderThemeSafari::paintSearchFieldResultsButton): ditto.
* rendering/RenderThemeWinCE.cpp:
(WebCore::mediaElementParent):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123442 => 123443)


--- trunk/Source/WebCore/ChangeLog	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/ChangeLog	2012-07-24 09:17:30 UTC (rev 123443)
@@ -1,3 +1,59 @@
+2012-07-24  Kent Tamura  <[email protected]>
+
+        Replace some callsites of shadowAncestorNode() with shadowHost()
+        https://bugs.webkit.org/show_bug.cgi?id=92060
+
+        Reviewed by Hajime Morita.
+
+        shadowAncestorNode() is deprecated.
+
+        No new tests. This shouldn't change behaviors.
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::toParentMediaElement):
+        * html/shadow/TextControlInnerElements.h:
+        (WebCore::SpinButtonElement::isEnabledFormControl):
+        (WebCore::SpinButtonElement::isReadOnlyFormControl):
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::paintMediaFullscreenButton):
+        (WebCore::RenderThemeEfl::paintMediaMuteButton):
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::getMediaElementFromRenderObject):
+        (WebCore::centerRectVerticallyInParentInputElement):
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::paintSearchFieldCancelButton):
+        (WebCore::RenderThemeQt::paintMediaSliderThumb):
+        Removed an ASSERT() because nullness of o->node() is already asserted.
+        * rendering/RenderInputSpeech.cpp:
+        (WebCore::RenderInputSpeech::paintInputFieldSpeechButton):
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaSliderThumb):
+        Passing shadowHost() to toParentMediaElement(), which accepts 0 and will return 0.
+        (WebCore::paintMediaVolumeSliderThumb): ditto.
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::paintSearchFieldCancelButton):
+        (WebCore::RenderThemeChromiumSkia::paintSearchFieldResultsDecoration):
+        (WebCore::RenderThemeChromiumSkia::paintSearchFieldResultsButton):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+        Remove an ASSERT(input) because input never be null unless o->node() is
+        null. If o->node() is null, this function crashes.
+        (WebCore::RenderThemeMac::paintSearchFieldResultsDecoration):
+        (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+        (WebCore::RenderThemeMac::paintMediaMuteButton):
+        It's ok to ignore "node is a media element" case because this function
+        works only if node->isMediaControlElement().
+        (WebCore::RenderThemeMac::paintMediaPlayButton): ditto.
+        (WebCore::RenderThemeMac::paintMediaSliderTrack): ditto.
+        * rendering/RenderThemeSafari.cpp:
+        (WebCore::RenderThemeSafari::paintSearchFieldCancelButton):
+        Remove an ASSERT(input) because input never be null unless o->node() is
+        null. If o->node() is null, this function crashes.
+        (WebCore::RenderThemeSafari::paintSearchFieldResultsDecoration): ditto.
+        (WebCore::RenderThemeSafari::paintSearchFieldResultsButton): ditto.
+        * rendering/RenderThemeWinCE.cpp:
+        (WebCore::mediaElementParent):
+
 2012-07-24  Peter Beverloo  <[email protected]>
 
         [Chromium] Build fix for Android after r123424

Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (123442 => 123443)


--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -68,7 +68,11 @@
 
 HTMLMediaElement* toParentMediaElement(Node* node)
 {
-    Node* mediaNode = node ? node->shadowAncestorNode() : 0;
+    if (!node)
+        return 0;
+    Node* mediaNode = node->shadowHost();
+    if (!mediaNode)
+        mediaNode = node;
     if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return 0;
 

Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.h (123442 => 123443)


--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.h	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.h	2012-07-24 09:17:30 UTC (rev 123443)
@@ -119,8 +119,8 @@
     virtual const AtomicString& shadowPseudoId() const;
     virtual void detach();
     virtual bool isSpinButtonElement() const { return true; }
-    virtual bool isEnabledFormControl() const { return static_cast<Element*>(shadowAncestorNode())->isEnabledFormControl(); }
-    virtual bool isReadOnlyFormControl() const { return static_cast<Element*>(shadowAncestorNode())->isReadOnlyFormControl(); }
+    virtual bool isEnabledFormControl() const { return shadowHost()->isEnabledFormControl(); }
+    virtual bool isReadOnlyFormControl() const { return shadowHost()->isReadOnlyFormControl(); }
     virtual void defaultEventHandler(Event*);
     void doStepAction(int);
     void startRepeatingTimer();

Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (123442 => 123443)


--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -1105,7 +1105,9 @@
 
 bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
-    Node* mediaNode = object->node() ? object->node()->shadowAncestorNode() : 0;
+    Node* mediaNode = object->node() ? object->node()->shadowHost() : 0;
+    if (!mediaNode)
+        mediaNode = object->node();
     if (!mediaNode || (!mediaNode->hasTagName(videoTag)))
         return false;
 
@@ -1117,7 +1119,9 @@
 
 bool RenderThemeEfl::paintMediaMuteButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
-    Node* mediaNode = object->node() ? object->node()->shadowAncestorNode() : 0;
+    Node* mediaNode = object->node() ? object->node()->shadowHost() : 0;
+    if (!mediaNode)
+        mediaNode = object->node();
     if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return false;
 

Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (123442 => 123443)


--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -64,7 +64,9 @@
 static HTMLMediaElement* getMediaElementFromRenderObject(RenderObject* o)
 {
     Node* node = o->node();
-    Node* mediaNode = node ? node->shadowAncestorNode() : 0;
+    Node* mediaNode = node ? node->shadowHost() : 0;
+    if (!mediaNode)
+        mediaNode = node;
     if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return 0;
 
@@ -313,7 +315,9 @@
 static IntRect centerRectVerticallyInParentInputElement(RenderObject* renderObject, const IntRect& rect)
 {
     // Get the renderer of <input> element.
-    Node* input = renderObject->node()->shadowAncestorNode();
+    Node* input = renderObject->node()->shadowHost();
+    if (!input)
+        input = renderObject->node();
     if (!input->renderer()->isBox())
         return IntRect();
 

Modified: trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp (123442 => 123443)


--- trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -455,7 +455,9 @@
     // Logic copied from RenderThemeChromium.cpp.
 
     // Get the renderer of <input> element.
-    Node* input = o->node()->shadowAncestorNode();
+    Node* input = o->node()->shadowHost();
+    if (!input)
+        input = o->node();
     if (!input->renderer()->isBox())
         return false;
     RenderBox* inputRenderBox = toRenderBox(input->renderer());
@@ -805,8 +807,9 @@
 bool RenderThemeQt::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     ASSERT(o->node());
-    Node* hostNode = o->node()->shadowAncestorNode();
-    ASSERT(hostNode);
+    Node* hostNode = o->node()->shadowHost();
+    if (!hostNode)
+        hostNode = o->node();
     HTMLMediaElement* mediaElement = toParentMediaElement(hostNode);
     if (!mediaElement)
         return false;

Modified: trunk/Source/WebCore/rendering/RenderInputSpeech.cpp (123442 => 123443)


--- trunk/Source/WebCore/rendering/RenderInputSpeech.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/rendering/RenderInputSpeech.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -62,7 +62,7 @@
         return false;
 
     // Get the renderer of <input> element.
-    Node* input = object->node()->shadowAncestorNode();
+    Node* input = object->node()->shadowHost();
     if (!input->renderer()->isBox())
         return false;
     RenderBox* inputRenderBox = toRenderBox(input->renderer());

Modified: trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp (123442 => 123443)


--- trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -240,9 +240,7 @@
 static bool paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     ASSERT(object->node());
-    Node* hostNode = object->node()->shadowAncestorNode();
-    ASSERT(hostNode);
-    HTMLMediaElement* mediaElement = toParentMediaElement(hostNode);
+    HTMLMediaElement* mediaElement = toParentMediaElement(object->node()->shadowHost());
     if (!mediaElement)
         return false;
 
@@ -295,9 +293,7 @@
 static bool paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     ASSERT(object->node());
-    Node* hostNode = object->node()->shadowAncestorNode();
-    ASSERT(hostNode);
-    HTMLMediaElement* mediaElement = toParentMediaElement(hostNode);
+    HTMLMediaElement* mediaElement = toParentMediaElement(object->node()->shadowHost());
     if (!mediaElement)
         return false;
 

Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (123442 => 123443)


--- trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -281,10 +281,11 @@
 bool RenderThemeChromiumSkia::paintSearchFieldCancelButton(RenderObject* cancelButtonObject, const PaintInfo& paintInfo, const IntRect& r)
 {
     // Get the renderer of <input> element.
-    Node* input = cancelButtonObject->node()->shadowAncestorNode();
-    if (!input->renderer()->isBox())
+    Node* input = cancelButtonObject->node()->shadowHost();
+    RenderObject* baseRenderer = input ? input->renderer() : cancelButtonObject;
+    if (!baseRenderer->isBox())
         return false;
-    RenderBox* inputRenderBox = toRenderBox(input->renderer());
+    RenderBox* inputRenderBox = toRenderBox(baseRenderer);
     LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
 
     // Make sure the scaled button stays square and will fit in its parent's box.
@@ -324,10 +325,11 @@
 bool RenderThemeChromiumSkia::paintSearchFieldResultsDecoration(RenderObject* magnifierObject, const PaintInfo& paintInfo, const IntRect& r)
 {
     // Get the renderer of <input> element.
-    Node* input = magnifierObject->node()->shadowAncestorNode();
-    if (!input->renderer()->isBox())
+    Node* input = magnifierObject->node()->shadowHost();
+    RenderObject* baseRenderer = input ? input->renderer() : magnifierObject;
+    if (!baseRenderer->isBox())
         return false;
-    RenderBox* inputRenderBox = toRenderBox(input->renderer());
+    RenderBox* inputRenderBox = toRenderBox(baseRenderer);
     LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
 
     // Make sure the scaled decoration stays square and will fit in its parent's box.
@@ -359,10 +361,11 @@
 bool RenderThemeChromiumSkia::paintSearchFieldResultsButton(RenderObject* magnifierObject, const PaintInfo& paintInfo, const IntRect& r)
 {
     // Get the renderer of <input> element.
-    Node* input = magnifierObject->node()->shadowAncestorNode();
-    if (!input->renderer()->isBox())
+    Node* input = magnifierObject->node()->shadowHost();
+    RenderObject* baseRenderer = input ? input->renderer() : magnifierObject;
+    if (!baseRenderer->isBox())
         return false;
-    RenderBox* inputRenderBox = toRenderBox(input->renderer());
+    RenderBox* inputRenderBox = toRenderBox(baseRenderer);
     LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
 
     // Make sure the scaled decoration will fit in its parent's box.

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (123442 => 123443)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-07-24 09:17:30 UTC (rev 123443)
@@ -1559,8 +1559,9 @@
 
 bool RenderThemeMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
-    Element* input = toElement(o->node()->shadowAncestorNode());
-    ASSERT(input);
+    Element* input = o->node()->shadowHost();
+    if (!input)
+        input = toElement(o->node());
 
     if (!input->renderer()->isBox())
         return false;
@@ -1652,7 +1653,9 @@
 
 bool RenderThemeMac::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
-    Node* input = o->node()->shadowAncestorNode();
+    Node* input = o->node()->shadowHost();
+    if (!input)
+        input = o->node();
     if (!input->renderer()->isBox())
         return false;
 
@@ -1685,7 +1688,9 @@
 
 bool RenderThemeMac::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
-    Node* input = o->node()->shadowAncestorNode();
+    Node* input = o->node()->shadowHost();
+    if (!input)
+        input = o->node();
     if (!input->renderer()->isBox())
         return false;
 
@@ -1859,7 +1864,7 @@
 bool RenderThemeMac::paintMediaMuteButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     Node* node = o->node();
-    Node* mediaNode = node ? node->shadowAncestorNode() : 0;
+    Node* mediaNode = node ? node->shadowHost() : 0;
     if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
         return false;
 
@@ -1873,7 +1878,7 @@
 bool RenderThemeMac::paintMediaPlayButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     Node* node = o->node();
-    Node* mediaNode = node ? node->shadowAncestorNode() : 0;
+    Node* mediaNode = node ? node->shadowHost() : 0;
     if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
         return false;
 
@@ -1909,8 +1914,8 @@
 bool RenderThemeMac::paintMediaSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     Node* node = o->node();
-    Node* mediaNode = node ? node->shadowAncestorNode() : 0;
-    if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
+    Element* mediaNode = node ? node->shadowHost() : 0;
+    if (!mediaNode || !mediaNode->isMediaElement())
         return false;
 
     HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);

Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (123442 => 123443)


--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -1075,8 +1075,9 @@
 {
     ASSERT(SafariThemeLibrary());
 
-    Node* input = o->node()->shadowAncestorNode();
-    ASSERT(input);
+    Node* input = o->node()->shadowHost();
+    if (!input)
+        input = o->node();
     RenderObject* renderer = input->renderer();
     ASSERT(renderer);
 
@@ -1129,8 +1130,9 @@
 {
     ASSERT(SafariThemeLibrary());
 
-    Node* input = o->node()->shadowAncestorNode();
-    ASSERT(input);
+    Node* input = o->node()->shadowHost();
+    if (!input)
+        input = o->node();
     RenderObject* renderer = input->renderer();
     ASSERT(renderer);
 
@@ -1152,8 +1154,9 @@
 {
     ASSERT(SafariThemeLibrary());
 
-    Node* input = o->node()->shadowAncestorNode();
-    ASSERT(input);
+    Node* input = o->node()->shadowHost();
+    if (!input)
+        input = o->node();
     RenderObject* renderer = input->renderer();
     ASSERT(renderer);
 

Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (123442 => 123443)


--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp	2012-07-24 09:13:23 UTC (rev 123442)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp	2012-07-24 09:17:30 UTC (rev 123443)
@@ -478,7 +478,9 @@
 {
     if (!node)
         return 0;
-    Node* mediaNode = node->shadowAncestorNode();
+    Node* mediaNode = node->shadowHost();
+    if (!mediaNode)
+        mediaNode = node;
     if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return 0;
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to