Title: [174686] trunk/Source/WebCore
- Revision
- 174686
- Author
- [email protected]
- Date
- 2014-10-14 10:31:59 -0700 (Tue, 14 Oct 2014)
Log Message
Use is<>() / downcast<>() for RenderFrame / RenderFrameSet
https://bugs.webkit.org/show_bug.cgi?id=137696
Reviewed by Darin Adler.
Use is<>() / downcast<>() for RenderFrame / RenderFrameSet.
No new tests, no behavior change.
* html/HTMLFrameSetElement.cpp:
(WebCore::HTMLFrameSetElement::defaultEventHandler):
* rendering/RenderFrame.cpp:
(WebCore::RenderFrame::updateFromElement):
* rendering/RenderFrame.h:
* rendering/RenderFrameSet.cpp:
(WebCore::RenderFrameSet::computeEdgeInfo):
(WebCore::RenderFrameSet::positionFramesWithFlattening):
* rendering/RenderFrameSet.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174685 => 174686)
--- trunk/Source/WebCore/ChangeLog 2014-10-14 17:18:36 UTC (rev 174685)
+++ trunk/Source/WebCore/ChangeLog 2014-10-14 17:31:59 UTC (rev 174686)
@@ -1,3 +1,24 @@
+2014-10-14 Chris Dumez <[email protected]>
+
+ Use is<>() / downcast<>() for RenderFrame / RenderFrameSet
+ https://bugs.webkit.org/show_bug.cgi?id=137696
+
+ Reviewed by Darin Adler.
+
+ Use is<>() / downcast<>() for RenderFrame / RenderFrameSet.
+
+ No new tests, no behavior change.
+
+ * html/HTMLFrameSetElement.cpp:
+ (WebCore::HTMLFrameSetElement::defaultEventHandler):
+ * rendering/RenderFrame.cpp:
+ (WebCore::RenderFrame::updateFromElement):
+ * rendering/RenderFrame.h:
+ * rendering/RenderFrameSet.cpp:
+ (WebCore::RenderFrameSet::computeEdgeInfo):
+ (WebCore::RenderFrameSet::positionFramesWithFlattening):
+ * rendering/RenderFrameSet.h:
+
2014-10-14 Youenn Fablet <[email protected]>
[XHR] Abort method execution when m_loader->cancel() in internalAbort() caused reentry
Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.cpp (174685 => 174686)
--- trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2014-10-14 17:18:36 UTC (rev 174685)
+++ trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2014-10-14 17:31:59 UTC (rev 174686)
@@ -190,8 +190,8 @@
void HTMLFrameSetElement::defaultEventHandler(Event* event)
{
ASSERT(event);
- if (is<MouseEvent>(*event) && !m_noresize && renderer() && renderer()->isFrameSet()) {
- if (toRenderFrameSet(renderer())->userResize(downcast<MouseEvent>(event))) {
+ if (is<MouseEvent>(*event) && !m_noresize && is<RenderFrameSet>(renderer())) {
+ if (downcast<RenderFrameSet>(*renderer()).userResize(downcast<MouseEvent>(event))) {
event->setDefaultHandled();
return;
}
Modified: trunk/Source/WebCore/rendering/RenderFrame.cpp (174685 => 174686)
--- trunk/Source/WebCore/rendering/RenderFrame.cpp 2014-10-14 17:18:36 UTC (rev 174685)
+++ trunk/Source/WebCore/rendering/RenderFrame.cpp 2014-10-14 17:31:59 UTC (rev 174686)
@@ -45,8 +45,8 @@
void RenderFrame::updateFromElement()
{
- if (parent() && parent()->isFrameSet())
- toRenderFrameSet(parent())->notifyFrameEdgeInfoChanged();
+ if (is<RenderFrameSet>(parent()))
+ downcast<RenderFrameSet>(*parent()).notifyFrameEdgeInfoChanged();
}
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderFrame.h (174685 => 174686)
--- trunk/Source/WebCore/rendering/RenderFrame.h 2014-10-14 17:18:36 UTC (rev 174685)
+++ trunk/Source/WebCore/rendering/RenderFrame.h 2014-10-14 17:31:59 UTC (rev 174686)
@@ -46,8 +46,6 @@
virtual void updateFromElement() override;
};
-RENDER_OBJECT_TYPE_CASTS(RenderFrame, isFrame())
-
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFrame, isFrame())
Modified: trunk/Source/WebCore/rendering/RenderFrameSet.cpp (174685 => 174686)
--- trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2014-10-14 17:18:36 UTC (rev 174685)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2014-10-14 17:31:59 UTC (rev 174686)
@@ -409,10 +409,10 @@
for (size_t r = 0; r < rows; ++r) {
for (size_t c = 0; c < cols; ++c) {
FrameEdgeInfo edgeInfo;
- if (child->isFrameSet())
- edgeInfo = toRenderFrameSet(child)->edgeInfo();
+ if (is<RenderFrameSet>(*child))
+ edgeInfo = downcast<RenderFrameSet>(*child).edgeInfo();
else
- edgeInfo = toRenderFrame(child)->edgeInfo();
+ edgeInfo = downcast<RenderFrame>(*child).edgeInfo();
fillFromEdgeInfo(edgeInfo, r, c);
child = child->nextSibling();
if (!child)
@@ -554,11 +554,11 @@
// calculate frameset height based on actual content height to eliminate scrolling
bool out = false;
- for (int r = 0; r < rows && !out; r++) {
+ for (int r = 0; r < rows && !out; ++r) {
int extra = 0;
int height = m_rows.m_sizes[r];
- for (int c = 0; c < cols; c++) {
+ for (int c = 0; c < cols; ++c) {
IntRect oldFrameRect = snappedIntRect(child->frameRect());
int width = m_cols.m_sizes[c];
@@ -575,10 +575,10 @@
child->setNeedsLayout();
- if (child->isFrameSet())
- toRenderFrameSet(child)->layout();
+ if (is<RenderFrameSet>(*child))
+ downcast<RenderFrameSet>(*child).layout();
else
- toRenderFrame(child)->layoutWithFlattening(fixedWidth, fixedHeight);
+ downcast<RenderFrame>(*child).layoutWithFlattening(fixedWidth, fixedHeight);
if (child->height() > m_rows.m_sizes[r])
m_rows.m_sizes[r] = child->height();
@@ -603,9 +603,9 @@
int yPos = 0;
out = false;
child = firstChildBox();
- for (int r = 0; r < rows && !out; r++) {
+ for (int r = 0; r < rows && !out; ++r) {
xPos = 0;
- for (int c = 0; c < cols; c++) {
+ for (int c = 0; c < cols; ++c) {
// ensure the rows and columns are filled
IntRect oldRect = snappedIntRect(child->frameRect());
@@ -618,10 +618,10 @@
// update to final size
child->setNeedsLayout();
- if (child->isFrameSet())
- toRenderFrameSet(child)->layout();
+ if (is<RenderFrameSet>(*child))
+ downcast<RenderFrameSet>(*child).layout();
else
- toRenderFrame(child)->layoutWithFlattening(true, true);
+ downcast<RenderFrame>(*child).layoutWithFlattening(true, true);
}
xPos += m_cols.m_sizes[c] + borderThickness;
Modified: trunk/Source/WebCore/rendering/RenderFrameSet.h (174685 => 174686)
--- trunk/Source/WebCore/rendering/RenderFrameSet.h 2014-10-14 17:18:36 UTC (rev 174685)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.h 2014-10-14 17:31:59 UTC (rev 174686)
@@ -126,8 +126,6 @@
bool m_isChildResizing;
};
-RENDER_OBJECT_TYPE_CASTS(RenderFrameSet, isFrameSet())
-
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFrameSet, isFrameSet())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
