- Revision
- 152889
- Author
- [email protected]
- Date
- 2013-07-19 02:10:33 -0700 (Fri, 19 Jul 2013)
Log Message
Use explicit HTMLFrameElementBase cast and introduce toHTMLFrameElementBase
https://bugs.webkit.org/show_bug.cgi?id=118873
Reviewed by Ryosuke Niwa.
It should be HTMLFrameElementBase that embraces both HTMLFrameElement and HTMLIFrameElement.
This also makes correct toFooElement possible.
Next, to avoid direct use of static_cast, this patch introduces toHTMLFrameElementBase for code cleanup.
* editing/FrameSelection.cpp:
(WebCore::scanForForm):
* html/HTMLBodyElement.cpp:
(WebCore::HTMLBodyElement::didNotifySubtreeInsertions):
* html/HTMLFrameElementBase.h:
(WebCore::toHTMLFrameElementBase):
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::loadSubframe):
* page/EventHandler.cpp:
(WebCore::targetIsFrame):
* page/FrameView.cpp:
(WebCore::FrameView::init):
* rendering/RenderFrameBase.cpp:
(WebCore::RenderFrameBase::layoutWithFlattening):
* rendering/RenderLayer.cpp:
(WebCore::frameElementAndViewPermitScroll):
(WebCore::RenderLayer::scrollRectToVisible):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152888 => 152889)
--- trunk/Source/WebCore/ChangeLog 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/ChangeLog 2013-07-19 09:10:33 UTC (rev 152889)
@@ -1,3 +1,32 @@
+2013-07-19 Kangil Han <[email protected]>
+
+ Use explicit HTMLFrameElementBase cast and introduce toHTMLFrameElementBase
+ https://bugs.webkit.org/show_bug.cgi?id=118873
+
+ Reviewed by Ryosuke Niwa.
+
+ It should be HTMLFrameElementBase that embraces both HTMLFrameElement and HTMLIFrameElement.
+ This also makes correct toFooElement possible.
+ Next, to avoid direct use of static_cast, this patch introduces toHTMLFrameElementBase for code cleanup.
+
+ * editing/FrameSelection.cpp:
+ (WebCore::scanForForm):
+ * html/HTMLBodyElement.cpp:
+ (WebCore::HTMLBodyElement::didNotifySubtreeInsertions):
+ * html/HTMLFrameElementBase.h:
+ (WebCore::toHTMLFrameElementBase):
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::loadSubframe):
+ * page/EventHandler.cpp:
+ (WebCore::targetIsFrame):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::init):
+ * rendering/RenderFrameBase.cpp:
+ (WebCore::RenderFrameBase::layoutWithFlattening):
+ * rendering/RenderLayer.cpp:
+ (WebCore::frameElementAndViewPermitScroll):
+ (WebCore::RenderLayer::scrollRectToVisible):
+
2013-07-18 Christophe Dumez <[email protected]>
Bindings generation tests are failing
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (152888 => 152889)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-07-19 09:10:33 UTC (rev 152889)
@@ -1974,11 +1974,9 @@
return toHTMLFormElement(element);
if (element->isHTMLElement() && toHTMLElement(element)->isFormControlElement())
return static_cast<HTMLFormControlElement*>(element)->form();
- if (element->hasTagName(frameTag) || element->hasTagName(iframeTag)) {
- Node* childDocument = static_cast<HTMLFrameElementBase*>(element)->contentDocument();
- if (HTMLFormElement* frameResult = scanForForm(childDocument))
+ if (element->hasTagName(frameTag) || element->hasTagName(iframeTag))
+ if (HTMLFormElement* frameResult = scanForForm(toHTMLFrameElementBase(element)->contentDocument()))
return frameResult;
- }
}
return 0;
}
Modified: trunk/Source/WebCore/html/HTMLBodyElement.cpp (152888 => 152889)
--- trunk/Source/WebCore/html/HTMLBodyElement.cpp 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/html/HTMLBodyElement.cpp 2013-07-19 09:10:33 UTC (rev 152889)
@@ -172,7 +172,7 @@
// FIXME: Perhaps this code should be in attach() instead of here.
Element* ownerElement = document()->ownerElement();
if (ownerElement && (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag))) {
- HTMLFrameElementBase* ownerFrameElement = static_cast<HTMLFrameElementBase*>(ownerElement);
+ HTMLFrameElementBase* ownerFrameElement = toHTMLFrameElementBase(ownerElement);
int marginWidth = ownerFrameElement->marginWidth();
if (marginWidth != -1)
setAttribute(marginwidthAttr, String::number(marginWidth));
Modified: trunk/Source/WebCore/html/HTMLFrameElementBase.h (152888 => 152889)
--- trunk/Source/WebCore/html/HTMLFrameElementBase.h 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/html/HTMLFrameElementBase.h 2013-07-19 09:10:33 UTC (rev 152889)
@@ -81,6 +81,12 @@
bool m_viewSource;
};
+inline HTMLFrameElementBase* toHTMLFrameElementBase(Node* node)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(HTMLNames::frameTag) || node->hasTagName(HTMLNames::iframeTag));
+ return static_cast<HTMLFrameElementBase*>(node);
+}
+
} // namespace WebCore
#endif // HTMLFrameElementBase_h
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (152888 => 152889)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2013-07-19 09:10:33 UTC (rev 152889)
@@ -353,10 +353,10 @@
int marginWidth = -1;
int marginHeight = -1;
if (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag)) {
- HTMLFrameElementBase* o = static_cast<HTMLFrameElementBase*>(ownerElement);
- allowsScrolling = o->scrollingMode() != ScrollbarAlwaysOff;
- marginWidth = o->marginWidth();
- marginHeight = o->marginHeight();
+ HTMLFrameElementBase* frameElementBase = toHTMLFrameElementBase(ownerElement);
+ allowsScrolling = frameElementBase->scrollingMode() != ScrollbarAlwaysOff;
+ marginWidth = frameElementBase->marginWidth();
+ marginHeight = frameElementBase->marginHeight();
}
if (!ownerElement->document()->securityOrigin()->canDisplay(url)) {
Modified: trunk/Source/WebCore/page/EventHandler.cpp (152888 => 152889)
--- trunk/Source/WebCore/page/EventHandler.cpp 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2013-07-19 09:10:33 UTC (rev 152889)
@@ -2003,7 +2003,7 @@
if (!target->hasTagName(frameTag) && !target->hasTagName(iframeTag))
return false;
- frame = static_cast<HTMLFrameElementBase*>(target)->contentFrame();
+ frame = toHTMLFrameElementBase(target)->contentFrame();
return true;
}
Modified: trunk/Source/WebCore/page/FrameView.cpp (152888 => 152889)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-07-19 09:10:33 UTC (rev 152889)
@@ -347,7 +347,7 @@
// Propagate the marginwidth/height and scrolling modes to the view.
Element* ownerElement = m_frame ? m_frame->ownerElement() : 0;
if (ownerElement && (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag))) {
- HTMLFrameElementBase* frameElt = static_cast<HTMLFrameElementBase*>(ownerElement);
+ HTMLFrameElementBase* frameElt = toHTMLFrameElementBase(ownerElement);
if (frameElt->scrollingMode() == ScrollbarAlwaysOff)
setCanHaveScrollbars(false);
LayoutUnit marginWidth = frameElt->marginWidth();
Modified: trunk/Source/WebCore/rendering/RenderFrameBase.cpp (152888 => 152889)
--- trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2013-07-19 09:10:33 UTC (rev 152889)
@@ -72,8 +72,7 @@
// we obey them and do not expand. With frame flattening
// no subframe much ever become scrollable.
- HTMLFrameElementBase* element = static_cast<HTMLFrameElementBase*>(node());
- bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;
+ bool isScrollable = toHTMLFrameElementBase(node())->scrollingMode() != ScrollbarAlwaysOff;
// consider iframe inset border
int hBorder = borderLeft() + borderRight();
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (152888 => 152889)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-07-19 08:36:41 UTC (rev 152888)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-07-19 09:10:33 UTC (rev 152889)
@@ -2264,10 +2264,10 @@
frame->loader()->client()->didChangeScrollOffset();
}
-static inline bool frameElementAndViewPermitScroll(HTMLFrameElement* frameElement, FrameView* frameView)
+static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameElementBase, FrameView* frameView)
{
// If scrollbars aren't explicitly forbidden, permit scrolling.
- if (frameElement && frameElement->scrollingMode() != ScrollbarAlwaysOff)
+ if (frameElementBase && frameElementBase->scrollingMode() != ScrollbarAlwaysOff)
return true;
// If scrollbars are forbidden, user initiated scrolls should obviously be ignored.
@@ -2320,12 +2320,12 @@
ownerElement = renderer()->document()->ownerElement();
if (ownerElement && ownerElement->renderer()) {
- HTMLFrameElement* frameElement = 0;
+ HTMLFrameElementBase* frameElementBase = 0;
if (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag))
- frameElement = static_cast<HTMLFrameElement*>(ownerElement);
+ frameElementBase = toHTMLFrameElementBase(ownerElement);
- if (frameElementAndViewPermitScroll(frameElement, frameView)) {
+ if (frameElementAndViewPermitScroll(frameElementBase, frameView)) {
LayoutRect viewRect = frameView->visibleContentRect();
LayoutRect exposeRect = getRectToExpose(viewRect, viewRect, rect, alignX, alignY);