Title: [153620] branches/safari-537-branch/Source/WebCore
- Revision
- 153620
- Author
- [email protected]
- Date
- 2013-08-01 15:42:39 -0700 (Thu, 01 Aug 2013)
Log Message
Merged r153595. <rdar://problem/14615802>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153619 => 153620)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-01 22:40:31 UTC (rev 153619)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-01 22:42:39 UTC (rev 153620)
@@ -1,5 +1,24 @@
2013-08-01 Lucas Forschler <[email protected]>
+ Merge r153595
+
+ 2013-08-01 Andreas Kling <[email protected]>
+
+ Layout should force a StyleResolver rebuild if there isn't one at all.
+ <http://webkit.org/b/119378>
+
+ Reviewed by Antti Koivisto.
+
+ We can't tell if viewport-dependent media queries have been invalidated at layout,
+ unless we have a StyleResolver to ask about this.
+ In case there isn't one, take the same path as we would with an invalidated query
+ instead of relying on ensureStyleResolver() to build it.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+
+2013-08-01 Lucas Forschler <[email protected]>
+
Merge r153553
2013-07-31 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/page/FrameView.cpp (153619 => 153620)
--- branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-08-01 22:40:31 UTC (rev 153619)
+++ branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-08-01 22:42:39 UTC (rev 153620)
@@ -1189,8 +1189,10 @@
}
// Viewport-dependent media queries may cause us to need completely different style information.
- if (document->ensureStyleResolver()->affectedByViewportChange()) {
+ if (!document->styleResolverIfExists() || document->styleResolverIfExists()->affectedByViewportChange()) {
document->styleResolverChanged(DeferRecalcStyle);
+ // FIXME: This instrumentation event is not strictly accurate since cached media query results
+ // do not persist across StyleResolver rebuilds.
InspectorInstrumentation::mediaQueryResultChanged(document);
} else
document->evaluateMediaQueryList();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
