third_party/WebKit/Source/core/frame/FrameView.cpp - Issue 1913833002: Current work-in-progress crbug.com/567021

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1913833002: Current work-in-progress crbug.com/567021 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More assert fixes Created 4 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollectionTest.cpp ('k') | third_party/WebKit/Source/core/html/HTMLLinkElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/FrameView.cpp

diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp

index f881a6042a874b94b9ee6295408a6c25b0d0dcb8..e8ea9aba228d2e9cbb17aa3d1c2561e49ea91749 100644

--- a/third_party/WebKit/Source/core/frame/FrameView.cpp

+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp

@@ -29,7 +29,6 @@

#include "core/HTMLNames.h"

#include "core/MediaTypeNames.h"

#include "core/css/FontFaceSet.h"

-#include "core/css/resolver/StyleResolver.h"

#include "core/dom/AXObjectCache.h"

#include "core/dom/Fullscreen.h"

#include "core/dom/IntersectionObserverController.h"

@@ -791,9 +790,8 @@ void FrameView::performPreLayoutTasks()

document->notifyResizeForViewportUnits();

// Viewport-dependent or device-dependent media queries may cause us to need completely different style information.

- if (!document->styleResolver()

- || (wasResized && document->styleResolver()->mediaQueryAffectedByViewportChange())

- || (wasResized && m_frame->settings() && m_frame->settings()->resizeIsDeviceSizeChange() && document->styleResolver()->mediaQueryAffectedByDeviceChange())) {

+ if ((wasResized && document->styleEngine().mediaQueryAffectedByViewportChange())

+ || (wasResized && m_frame->settings() && m_frame->settings()->resizeIsDeviceSizeChange() && document->styleEngine().mediaQueryAffectedByDeviceChange())) {

document->mediaQueryAffectingValueChanged();

} else if (wasResized) {

document->evaluateMediaQueryList();