Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: Source/core/rendering/RenderIFrame.cpp

Issue 149653003: Avoid requiring a recalc to update compositing state for iframes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaseline. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 { 51 {
52 return isInline(); 52 return isInline();
53 } 53 }
54 54
55 LayerType RenderIFrame::layerTypeRequired() const 55 LayerType RenderIFrame::layerTypeRequired() const
56 { 56 {
57 LayerType type = RenderPart::layerTypeRequired(); 57 LayerType type = RenderPart::layerTypeRequired();
58 if (type != NoLayer) 58 if (type != NoLayer)
59 return type; 59 return type;
60 60
61 if (style()->resize() != RESIZE_NONE) 61 return NormalLayer;
62 return NormalLayer;
63
64 return NoLayer;
65 } 62 }
66 63
67 RenderView* RenderIFrame::contentRootRenderer() const 64 RenderView* RenderIFrame::contentRootRenderer() const
68 { 65 {
69 // FIXME: Is this always a valid cast? What about plugins? 66 // FIXME: Is this always a valid cast? What about plugins?
70 ASSERT(!widget() || widget()->isFrameView()); 67 ASSERT(!widget() || widget()->isFrameView());
71 FrameView* childFrameView = toFrameView(widget()); 68 FrameView* childFrameView = toFrameView(widget());
72 return childFrameView ? childFrameView->frame().contentRenderer() : 0; 69 return childFrameView ? childFrameView->frame().contentRenderer() : 0;
73 } 70 }
74 71
75 void RenderIFrame::layout() 72 void RenderIFrame::layout()
76 { 73 {
77 ASSERT(needsLayout()); 74 ASSERT(needsLayout());
78 75
79 LayoutRectRecorder recorder(*this); 76 LayoutRectRecorder recorder(*this);
80 updateLogicalWidth(); 77 updateLogicalWidth();
81 // No kids to layout as a replaced element. 78 // No kids to layout as a replaced element.
82 updateLogicalHeight(); 79 updateLogicalHeight();
83 80
84 m_overflow.clear(); 81 m_overflow.clear();
85 addVisualEffectOverflow(); 82 addVisualEffectOverflow();
86 updateLayerTransform(); 83 updateLayerTransform();
87 84
88 clearNeedsLayout(); 85 clearNeedsLayout();
89 } 86 }
90 87
91 } 88 }
OLDNEW
« no previous file with comments | « LayoutTests/tables/mozilla/bugs/bug50695-2-expected.txt ('k') | Source/core/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698