Title: [187746] trunk/Source/WebCore
- Revision
- 187746
- Author
- za...@apple.com
- Date
- 2015-08-03 11:24:48 -0700 (Mon, 03 Aug 2015)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187745 => 187746)
--- 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)
@@ -1,5 +1,23 @@
2015-08-03 Zalan Bujtas <za...@apple.com>
+ 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 <za...@apple.com>
+
Pass ControlStates& to RenderTheme methods instead of ControlStates*
https://bugs.webkit.org/show_bug.cgi?id=147521
Modified: trunk/Source/WebCore/rendering/RenderFrameBase.cpp (187745 => 187746)
--- 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)
@@ -71,14 +71,14 @@
void RenderFrameBase::peformLayoutWithFlattening(bool hasFixedWidth, bool hasFixedHeight)
{
if (!childRenderView() || !shouldExpandFrame(width(), height(), hasFixedWidth, hasFixedHeight)) {
- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
return;
childView()->layout();
return;
}
// need to update to calculate min/max correctly
- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
return;
// if scrollbars are off, and the width or height are fixed
@@ -95,7 +95,7 @@
ASSERT(childRenderView());
setWidth(std::max(width(), childRenderView()->minPreferredLogicalWidth() + hBorder));
// update again to pass the new width to the child frame
- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
return;
childView()->layout();
}
@@ -107,7 +107,7 @@
if (isScrollable || !hasFixedWidth || childRenderView()->isFrameSet())
setWidth(std::max<LayoutUnit>(width(), childView()->contentsWidth() + hBorder));
- if (updateWidgetPosition() == ChildWidgetState::ChildWidgetIsDestroyed)
+ if (updateWidgetPosition() == ChildWidgetState::Destroyed)
return;
ASSERT(!childView()->layoutPending());
Modified: trunk/Source/WebCore/rendering/RenderWidget.cpp (187745 => 187746)
--- 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)
@@ -306,12 +306,12 @@
RenderWidget::ChildWidgetState RenderWidget::updateWidgetPosition()
{
if (!m_widget)
- return ChildWidgetState::ChildWidgetIsDestroyed;
+ return ChildWidgetState::Destroyed;
WeakPtr<RenderWidget> weakThis = createWeakPtr();
bool widgetSizeChanged = updateWidgetGeometry();
if (!weakThis || !m_widget)
- return ChildWidgetState::ChildWidgetIsDestroyed;
+ return ChildWidgetState::Destroyed;
// if the frame size got changed, or if view needs layout (possibly indicating
// content size is wrong) we have to do a layout to set the right widget size.
@@ -321,7 +321,7 @@
if ((widgetSizeChanged || frameView.needsLayout()) && frameView.frame().page())
frameView.layout();
}
- return ChildWidgetState::ChildWidgetIsValid;
+ return ChildWidgetState::Valid;
}
IntRect RenderWidget::windowClipRect() const
Modified: trunk/Source/WebCore/rendering/RenderWidget.h (187745 => 187746)
--- 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)
@@ -67,7 +67,7 @@
static RenderWidget* find(const Widget*);
- enum class ChildWidgetState { ChildWidgetIsValid, ChildWidgetIsDestroyed };
+ enum class ChildWidgetState { Valid, Destroyed };
ChildWidgetState updateWidgetPosition() WARN_UNUSED_RETURN;
WEBCORE_EXPORT IntRect windowClipRect() const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
