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

Side by Side Diff: Source/WebCore/page/FrameView.cpp

Issue 13771002: Recalc styles on resize if we have viewport units. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Created 7 years, 8 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
« no previous file with comments | « Source/WebCore/dom/DocumentStyleSheetCollection.cpp ('k') | no next file » | 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 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 m_inSynchronousPostLayout = true; 1101 m_inSynchronousPostLayout = true;
1102 performPostLayoutTasks(); 1102 performPostLayoutTasks();
1103 m_inSynchronousPostLayout = false; 1103 m_inSynchronousPostLayout = false;
1104 } 1104 }
1105 1105
1106 // Viewport-dependent media queries may cause us to need completely diff erent style information. 1106 // Viewport-dependent media queries may cause us to need completely diff erent style information.
1107 // Check that here. 1107 // Check that here.
1108 if (document->styleResolver()->affectedByViewportChange()) { 1108 if (document->styleResolver()->affectedByViewportChange()) {
1109 document->styleResolverChanged(RecalcStyleImmediately); 1109 document->styleResolverChanged(RecalcStyleImmediately);
1110 InspectorInstrumentation::mediaQueryResultChanged(document); 1110 InspectorInstrumentation::mediaQueryResultChanged(document);
1111 } else 1111 } else {
1112 document->evaluateMediaQueryList(); 1112 document->evaluateMediaQueryList();
1113 if (document->styleSheetCollection()->usesViewportUnits()) {
1114 document->styleResolver()->invalidateMatchedPropertiesCache();
1115 document->scheduleForcedStyleRecalc();
esprehn 2013/04/09 08:20:27 This is a big hammer. It's going to mean pretty cr
1116 }
1117 }
1113 1118
1114 // If there is any pagination to apply, it will affect the RenderView's style, so we should 1119 // If there is any pagination to apply, it will affect the RenderView's style, so we should
1115 // take care of that now. 1120 // take care of that now.
1116 applyPaginationToViewport(); 1121 applyPaginationToViewport();
1117 1122
1118 // Always ensure our style info is up-to-date. This can happen in situat ions where 1123 // Always ensure our style info is up-to-date. This can happen in situat ions where
1119 // the layout beats any sort of style recalc update that needs to occur. 1124 // the layout beats any sort of style recalc update that needs to occur, and if we
esprehn 2013/04/09 08:20:27 "or if" is probably more clear. I had to read this
1125 // have to recalc due to the presence of viewport units.
1120 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutSt yleUpdate, true); 1126 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutSt yleUpdate, true);
1121 document->updateStyleIfNeeded(); 1127 document->updateStyleIfNeeded();
1122 1128
1123 subtree = m_layoutRoot; 1129 subtree = m_layoutRoot;
1124 1130
1125 // If there is only one ref to this view left, then its going to be dest royed as soon as we exit, 1131 // If there is only one ref to this view left, then its going to be dest royed as soon as we exit,
1126 // so there's no point to continuing to layout 1132 // so there's no point to continuing to layout
1127 if (protector->hasOneRef()) 1133 if (protector->hasOneRef())
1128 return; 1134 return;
1129 1135
(...skipping 2692 matching lines...) Expand 10 before | Expand all | Expand 10 after
3822 if (frame() && frame()->document()) 3828 if (frame() && frame()->document())
3823 return frame()->document()->existingAXObjectCache(); 3829 return frame()->document()->existingAXObjectCache();
3824 return 0; 3830 return 0;
3825 } 3831 }
3826 3832
3827 void FrameView::setScrollingPerformanceLoggingEnabled(bool) 3833 void FrameView::setScrollingPerformanceLoggingEnabled(bool)
3828 { 3834 {
3829 } 3835 }
3830 3836
3831 } // namespace WebCore 3837 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/DocumentStyleSheetCollection.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698