Title: [152676] branches/safari-537-branch/Source/WebCore
- Revision
- 152676
- Author
- lforsch...@apple.com
- Date
- 2013-07-15 16:47:51 -0700 (Mon, 15 Jul 2013)
Log Message
Merged r152568. <rdar://problem/14421170>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152675 => 152676)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-15 23:47:32 UTC (rev 152675)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-15 23:47:51 UTC (rev 152676)
@@ -1,5 +1,23 @@
2013-07-15 Lucas Forschler <lforsch...@apple.com>
+ Merge r152568
+
+ 2013-07-11 Andreas Kling <akl...@apple.com>
+
+ Revert r149313: Don't check for @media rules affected by viewport changes in every layout.
+ <rdar://problem/14277905>
+
+ Rubber-stamped by Antti Koivisto.
+
+ This changed caused more harm than good. setFrameRect() is not the only path in FrameView
+ that can cause media queries to need invalidation.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setFrameRect):
+ (WebCore::FrameView::layout):
+
+2013-07-15 Lucas Forschler <lforsch...@apple.com>
+
Merge r152554
2013-07-10 Sam Weinig <s...@webkit.org>
Modified: branches/safari-537-branch/Source/WebCore/page/FrameView.cpp (152675 => 152676)
--- branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-15 23:47:32 UTC (rev 152675)
+++ branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-15 23:47:51 UTC (rev 152676)
@@ -480,18 +480,6 @@
}
#endif
- // Viewport-dependent media queries may cause us to need completely different style information.
- if (m_frame) {
- if (Document* document = m_frame->document()) {
- if (StyleResolver* resolver = document->styleResolverIfExists()) {
- if (resolver->affectedByViewportChange()) {
- document->styleResolverChanged(DeferRecalcStyle);
- InspectorInstrumentation::mediaQueryResultChanged(document);
- }
- }
- }
- }
-
sendResizeEventIfNeeded();
}
@@ -1199,7 +1187,12 @@
m_inSynchronousPostLayout = false;
}
- document->evaluateMediaQueryList();
+ // Viewport-dependent media queries may cause us to need completely different style information.
+ if (document->ensureStyleResolver()->affectedByViewportChange()) {
+ document->styleResolverChanged(DeferRecalcStyle);
+ InspectorInstrumentation::mediaQueryResultChanged(document);
+ } else
+ document->evaluateMediaQueryList();
// If there is any pagination to apply, it will affect the RenderView's style, so we should
// take care of that now.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
