Title: [190460] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 190460
- Author
- [email protected]
- Date
- 2015-10-02 00:56:56 -0700 (Fri, 02 Oct 2015)
Log Message
Merged r187994. rdar://problem/22707482
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190459 => 190460)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-02 07:55:56 UTC (rev 190459)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-02 07:56:56 UTC (rev 190460)
@@ -1,5 +1,21 @@
2015-10-02 Babak Shafiei <[email protected]>
+ Merge r187994.
+
+ 2015-08-05 Zalan Bujtas <[email protected]>
+
+ [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-10-02 Babak Shafiei <[email protected]>
+
Merge r187921.
2015-08-04 Chris Dumez <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderFrameBase.cpp (190459 => 190460)
--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderFrameBase.cpp 2015-10-02 07:55:56 UTC (rev 190459)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderFrameBase.cpp 2015-10-02 07:56:56 UTC (rev 190460)
@@ -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::ChildWidgetIsDestroyed)
return;
childView()->layout();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
