<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174686] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174686">174686</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-14 10:31:59 -0700 (Tue, 14 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameSetElementcpp">trunk/Source/WebCore/html/HTMLFrameSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFramecpp">trunk/Source/WebCore/rendering/RenderFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFrameh">trunk/Source/WebCore/rendering/RenderFrame.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFrameSetcpp">trunk/Source/WebCore/rendering/RenderFrameSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFrameSeth">trunk/Source/WebCore/rendering/RenderFrameSet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174685 => 174686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-10-14 Chris Dumez <cdumez@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-10-14 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> [XHR] Abort method execution when m_loader->cancel() in internalAbort() caused reentry
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.cpp (174685 => 174686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> void HTMLFrameSetElement::defaultEventHandler(Event* event)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(event);
</span><del>- if (is<MouseEvent>(*event) && !m_noresize && renderer() && renderer()->isFrameSet()) {
- if (toRenderFrameSet(renderer())->userResize(downcast<MouseEvent>(event))) {
</del><ins>+ if (is<MouseEvent>(*event) && !m_noresize && is<RenderFrameSet>(renderer())) {
+ if (downcast<RenderFrameSet>(*renderer()).userResize(downcast<MouseEvent>(event))) {
</ins><span class="cx"> event->setDefaultHandled();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrame.cpp (174685 => 174686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderFrame::updateFromElement()
</span><span class="cx"> {
</span><del>- if (parent() && parent()->isFrameSet())
- toRenderFrameSet(parent())->notifyFrameEdgeInfoChanged();
</del><ins>+ if (is<RenderFrameSet>(parent()))
+ downcast<RenderFrameSet>(*parent()).notifyFrameEdgeInfoChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrame.h (174685 => 174686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,8 +46,6 @@
</span><span class="cx"> virtual void updateFromElement() override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-RENDER_OBJECT_TYPE_CASTS(RenderFrame, isFrame())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFrame, isFrame())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFrameSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrameSet.cpp (174685 => 174686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -409,10 +409,10 @@
</span><span class="cx"> for (size_t r = 0; r < rows; ++r) {
</span><span class="cx"> for (size_t c = 0; c < cols; ++c) {
</span><span class="cx"> FrameEdgeInfo edgeInfo;
</span><del>- if (child->isFrameSet())
- edgeInfo = toRenderFrameSet(child)->edgeInfo();
</del><ins>+ if (is<RenderFrameSet>(*child))
+ edgeInfo = downcast<RenderFrameSet>(*child).edgeInfo();
</ins><span class="cx"> else
</span><del>- edgeInfo = toRenderFrame(child)->edgeInfo();
</del><ins>+ edgeInfo = downcast<RenderFrame>(*child).edgeInfo();
</ins><span class="cx"> fillFromEdgeInfo(edgeInfo, r, c);
</span><span class="cx"> child = child->nextSibling();
</span><span class="cx"> if (!child)
</span><span class="lines">@@ -554,11 +554,11 @@
</span><span class="cx">
</span><span class="cx"> // calculate frameset height based on actual content height to eliminate scrolling
</span><span class="cx"> bool out = false;
</span><del>- for (int r = 0; r < rows && !out; r++) {
</del><ins>+ for (int r = 0; r < rows && !out; ++r) {
</ins><span class="cx"> int extra = 0;
</span><span class="cx"> int height = m_rows.m_sizes[r];
</span><span class="cx">
</span><del>- for (int c = 0; c < cols; c++) {
</del><ins>+ for (int c = 0; c < cols; ++c) {
</ins><span class="cx"> IntRect oldFrameRect = snappedIntRect(child->frameRect());
</span><span class="cx">
</span><span class="cx"> int width = m_cols.m_sizes[c];
</span><span class="lines">@@ -575,10 +575,10 @@
</span><span class="cx">
</span><span class="cx"> child->setNeedsLayout();
</span><span class="cx">
</span><del>- if (child->isFrameSet())
- toRenderFrameSet(child)->layout();
</del><ins>+ if (is<RenderFrameSet>(*child))
+ downcast<RenderFrameSet>(*child).layout();
</ins><span class="cx"> else
</span><del>- toRenderFrame(child)->layoutWithFlattening(fixedWidth, fixedHeight);
</del><ins>+ downcast<RenderFrame>(*child).layoutWithFlattening(fixedWidth, fixedHeight);
</ins><span class="cx">
</span><span class="cx"> if (child->height() > m_rows.m_sizes[r])
</span><span class="cx"> m_rows.m_sizes[r] = child->height();
</span><span class="lines">@@ -603,9 +603,9 @@
</span><span class="cx"> int yPos = 0;
</span><span class="cx"> out = false;
</span><span class="cx"> child = firstChildBox();
</span><del>- for (int r = 0; r < rows && !out; r++) {
</del><ins>+ for (int r = 0; r < rows && !out; ++r) {
</ins><span class="cx"> xPos = 0;
</span><del>- for (int c = 0; c < cols; c++) {
</del><ins>+ for (int c = 0; c < cols; ++c) {
</ins><span class="cx"> // ensure the rows and columns are filled
</span><span class="cx"> IntRect oldRect = snappedIntRect(child->frameRect());
</span><span class="cx">
</span><span class="lines">@@ -618,10 +618,10 @@
</span><span class="cx">
</span><span class="cx"> // update to final size
</span><span class="cx"> child->setNeedsLayout();
</span><del>- if (child->isFrameSet())
- toRenderFrameSet(child)->layout();
</del><ins>+ if (is<RenderFrameSet>(*child))
+ downcast<RenderFrameSet>(*child).layout();
</ins><span class="cx"> else
</span><del>- toRenderFrame(child)->layoutWithFlattening(true, true);
</del><ins>+ downcast<RenderFrame>(*child).layoutWithFlattening(true, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> xPos += m_cols.m_sizes[c] + borderThickness;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFrameSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrameSet.h (174685 => 174686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -126,8 +126,6 @@
</span><span class="cx"> bool m_isChildResizing;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-RENDER_OBJECT_TYPE_CASTS(RenderFrameSet, isFrameSet())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFrameSet, isFrameSet())
</span></span></pre>
</div>
</div>
</body>
</html>