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

Side by Side Diff: sky/engine/core/frame/FrameView.cpp

Issue 737523002: Sky: Move iframe geometry updates to FrameView::updateLayout instead of (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: compile Created 6 years, 1 month 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
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderIFrame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 959
960 updateLayoutAndStyleIfNeededRecursive(); 960 updateLayoutAndStyleIfNeededRecursive();
961 961
962 if (RenderView* view = renderView()) { 962 if (RenderView* view = renderView()) {
963 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up dateLayerTree", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()); 963 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up dateLayerTree", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get());
964 view->compositor()->updateIfNeededRecursive(); 964 view->compositor()->updateIfNeededRecursive();
965 965
966 updateCompositedSelectionBoundsIfNeeded(); 966 updateCompositedSelectionBoundsIfNeeded();
967 967
968 invalidateTreeIfNeededRecursive(); 968 invalidateTreeIfNeededRecursive();
969
970 view->updateIFramesAfterLayout();
969 } 971 }
970 972
971 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); 973 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
972 } 974 }
973 975
974 void FrameView::updateLayoutAndStyleIfNeededRecursive() 976 void FrameView::updateLayoutAndStyleIfNeededRecursive()
975 { 977 {
976 // We have to crawl our entire tree looking for any FrameViews that need 978 // We have to crawl our entire tree looking for any FrameViews that need
977 // layout and make sure they are up to date. 979 // layout and make sure they are up to date.
978 // Mac actually tests for intersection with the dirty region and tries not t o 980 // Mac actually tests for intersection with the dirty region and tries not t o
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 void FrameView::setLayoutSizeInternal(const IntSize& size) 1114 void FrameView::setLayoutSizeInternal(const IntSize& size)
1113 { 1115 {
1114 if (m_layoutSize == size) 1116 if (m_layoutSize == size)
1115 return; 1117 return;
1116 1118
1117 m_layoutSize = size; 1119 m_layoutSize = size;
1118 contentsResized(); 1120 contentsResized();
1119 } 1121 }
1120 1122
1121 } // namespace blink 1123 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderIFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698