Title: [187994] trunk/Source/WebCore
- Revision
- 187994
- Author
- za...@apple.com
- Date
- 2015-08-05 15:39:09 -0700 (Wed, 05 Aug 2015)
Log Message
[Frame flattening] Return early when child RenderView is not available.
https://bugs.webkit.org/show_bug.cgi?id=147697
Reviewed by Simon Fraser.
No change in functionality.
* rendering/RenderFrameBase.cpp:
(WebCore::RenderFrameBase::peformLayoutWithFlattening):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187993 => 187994)
--- trunk/Source/WebCore/ChangeLog 2015-08-05 22:33:34 UTC (rev 187993)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 22:39:09 UTC (rev 187994)
@@ -1,3 +1,15 @@
+2015-08-05 Zalan Bujtas <za...@apple.com>
+
+ [Frame flattening] Return early when child RenderView is not available.
+ https://bugs.webkit.org/show_bug.cgi?id=147697
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/RenderFrameBase.cpp:
+ (WebCore::RenderFrameBase::peformLayoutWithFlattening):
+
2015-08-05 Anders Carlsson <ander...@apple.com>
Remove more dead database code
Modified: trunk/Source/WebCore/rendering/RenderFrameBase.cpp (187993 => 187994)
--- trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2015-08-05 22:33:34 UTC (rev 187993)
+++ trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2015-08-05 22:39:09 UTC (rev 187994)
@@ -70,7 +70,10 @@
void RenderFrameBase::peformLayoutWithFlattening(bool hasFixedWidth, bool hasFixedHeight)
{
- if (!childRenderView() || !shouldExpandFrame(width(), height(), hasFixedWidth, hasFixedHeight)) {
+ if (!childRenderView())
+ return;
+
+ if (!shouldExpandFrame(width(), height(), hasFixedWidth, hasFixedHeight)) {
if (updateWidgetPosition() == ChildWidgetState::Destroyed)
return;
childView()->layout();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
