<!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>[187746] 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/187746">187746</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-03 11:24:48 -0700 (Mon, 03 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ChildWidgetState::ChildWidgetIs* naming is redundant.
https://bugs.webkit.org/show_bug.cgi?id=147565
Reviewed by Simon Fraser.
Since strongly typed enum requires to write out 'ChildWidgetState::ChildWidgetIsDestroyed',
the enumerator list names can be shortened.
No change in behaviour.
* rendering/RenderFrameBase.cpp:
(WebCore::RenderFrameBase::peformLayoutWithFlattening):
* rendering/RenderWidget.cpp:
(WebCore::RenderWidget::updateWidgetPosition):
* rendering/RenderWidget.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFrameBasecpp">trunk/Source/WebCore/rendering/RenderFrameBase.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderWidgetcpp">trunk/Source/WebCore/rendering/RenderWidget.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderWidgeth">trunk/Source/WebCore/rendering/RenderWidget.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187745 => 187746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-03 17:59:31 UTC (rev 187745)
+++ trunk/Source/WebCore/ChangeLog 2015-08-03 18:24:48 UTC (rev 187746)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-08-03 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ ChildWidgetState::ChildWidgetIs* naming is redundant.
+ https://bugs.webkit.org/show_bug.cgi?id=147565
+
+ Reviewed by Simon Fraser.
+
+ Since strongly typed enum requires to write out 'ChildWidgetState::ChildWidgetIsDestroyed',
+ the enumerator list names can be shortened.
+
+ No change in behaviour.
+
+ * rendering/RenderFrameBase.cpp:
+ (WebCore::RenderFrameBase::peformLayoutWithFlattening):
+ * rendering/RenderWidget.cpp:
+ (WebCore::RenderWidget::updateWidgetPosition):
+ * rendering/RenderWidget.h:
+
+2015-08-03 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Pass ControlStates& to RenderTheme methods instead of ControlStates*
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147521
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFrameBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrameBase.cpp (187745 => 187746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2015-08-03 17:59:31 UTC (rev 187745)
+++ trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2015-08-03 18:24:48 UTC (rev 187746)
</span><span class="lines">@@ -71,14 +71,14 @@
</span><span class="cx"> void RenderFrameBase::peformLayoutWithFlattening(bool hasFixedWidth, bool hasFixedHeight)
</span><span class="cx"> {
</span><span class="cx"> if (!childRenderView() || !shouldExpandFrame(width(), height(), hasFixedWidth, hasFixedHeight)) {
</span><del>- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
</del><ins>+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
</ins><span class="cx"> return;
</span><span class="cx"> childView()->layout();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // need to update to calculate min/max correctly
</span><del>- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
</del><ins>+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // if scrollbars are off, and the width or height are fixed
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> ASSERT(childRenderView());
</span><span class="cx"> setWidth(std::max(width(), childRenderView()->minPreferredLogicalWidth() + hBorder));
</span><span class="cx"> // update again to pass the new width to the child frame
</span><del>- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
</del><ins>+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
</ins><span class="cx"> return;
</span><span class="cx"> childView()->layout();
</span><span class="cx"> }
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> if (isScrollable || !hasFixedWidth || childRenderView()->isFrameSet())
</span><span class="cx"> setWidth(std::max<LayoutUnit>(width(), childView()->contentsWidth() + hBorder));
</span><span class="cx">
</span><del>- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
</del><ins>+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(!childView()->layoutPending());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderWidgetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderWidget.cpp (187745 => 187746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderWidget.cpp 2015-08-03 17:59:31 UTC (rev 187745)
+++ trunk/Source/WebCore/rendering/RenderWidget.cpp 2015-08-03 18:24:48 UTC (rev 187746)
</span><span class="lines">@@ -306,12 +306,12 @@
</span><span class="cx"> RenderWidget::ChildWidgetState RenderWidget::updateWidgetPosition()
</span><span class="cx"> {
</span><span class="cx"> if (!m_widget)
</span><del>- return ChildWidgetState::ChildWidgetIsDestroyed;
</del><ins>+ return ChildWidgetState::Destroyed;
</ins><span class="cx">
</span><span class="cx"> WeakPtr<RenderWidget> weakThis = createWeakPtr();
</span><span class="cx"> bool widgetSizeChanged = updateWidgetGeometry();
</span><span class="cx"> if (!weakThis || !m_widget)
</span><del>- return ChildWidgetState::ChildWidgetIsDestroyed;
</del><ins>+ return ChildWidgetState::Destroyed;
</ins><span class="cx">
</span><span class="cx"> // if the frame size got changed, or if view needs layout (possibly indicating
</span><span class="cx"> // content size is wrong) we have to do a layout to set the right widget size.
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> if ((widgetSizeChanged || frameView.needsLayout()) && frameView.frame().page())
</span><span class="cx"> frameView.layout();
</span><span class="cx"> }
</span><del>- return ChildWidgetState::ChildWidgetIsValid;
</del><ins>+ return ChildWidgetState::Valid;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect RenderWidget::windowClipRect() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderWidgeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderWidget.h (187745 => 187746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderWidget.h 2015-08-03 17:59:31 UTC (rev 187745)
+++ trunk/Source/WebCore/rendering/RenderWidget.h 2015-08-03 18:24:48 UTC (rev 187746)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> static RenderWidget* find(const Widget*);
</span><span class="cx">
</span><del>- enum class ChildWidgetState { ChildWidgetIsValid, ChildWidgetIsDestroyed };
</del><ins>+ enum class ChildWidgetState { Valid, Destroyed };
</ins><span class="cx"> ChildWidgetState updateWidgetPosition() WARN_UNUSED_RETURN;
</span><span class="cx"> WEBCORE_EXPORT IntRect windowClipRect() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>