third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp - Issue 1459023002: Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp

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/web/WebFrameWidgetImpl.cpp

Issue 1459023002: Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Check if m_page is null in WebPagePopupImpl. Created 5 years 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/page/scrolling/ScrollingCoordinator.cpp ('k') | third_party/WebKit/Source/web/WebPagePopupImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

index c8c83ee97ed269bf35badb1874def1fbe770b4e6..09fc1bba8afa552e52bf2ce879f963e94a544dc2 100644

--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

@@ -604,6 +604,9 @@ bool WebFrameWidgetImpl::isAcceleratedCompositingActive() const

void WebFrameWidgetImpl::willCloseLayerTreeView()

{

+ if (m_layerTreeView)

+ page()->willCloseLayerTreeView(*m_layerTreeView);

setIsAcceleratedCompositingActive(false);

m_layerTreeView = nullptr;

m_layerTreeViewClosed = true;

@@ -978,6 +981,8 @@ void WebFrameWidgetImpl::initializeLayerTreeView()

devTools->layerTreeViewChanged(m_layerTreeView);

page()->settings().setAcceleratedCompositingEnabled(m_layerTreeView);

+ if (m_layerTreeView)

+ page()->layerTreeViewInitialized(*m_layerTreeView);

// FIXME: only unittests, click to play, Android priting, and printing (for headers and footers)

// make this assert necessary. We should make them not hit this code and then delete allowsBrokenNullLayerTreeView.