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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebPagePopupImpl.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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 2662 matching lines...) Expand 10 before | Expand all | Expand 10 after
2673 } 2673 }
2674 2674
2675 void WebViewImpl::willCloseLayerTreeView() 2675 void WebViewImpl::willCloseLayerTreeView()
2676 { 2676 {
2677 if (m_linkHighlightsTimeline) { 2677 if (m_linkHighlightsTimeline) {
2678 m_linkHighlights.clear(); 2678 m_linkHighlights.clear();
2679 detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); 2679 detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
2680 m_linkHighlightsTimeline.clear(); 2680 m_linkHighlightsTimeline.clear();
2681 } 2681 }
2682 2682
2683 if (page()) 2683 if (m_layerTreeView)
2684 page()->willCloseLayerTreeView(); 2684 page()->willCloseLayerTreeView(*m_layerTreeView);
2685 2685
2686 setRootGraphicsLayer(nullptr); 2686 setRootGraphicsLayer(nullptr);
2687 m_layerTreeView = nullptr; 2687 m_layerTreeView = nullptr;
2688 } 2688 }
2689 2689
2690 void WebViewImpl::didAcquirePointerLock() 2690 void WebViewImpl::didAcquirePointerLock()
2691 { 2691 {
2692 if (page()) 2692 if (page())
2693 page()->pointerLockController().didAcquirePointerLock(); 2693 page()->pointerLockController().didAcquirePointerLock();
2694 } 2694 }
(...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
4225 { 4225 {
4226 if (m_client) { 4226 if (m_client) {
4227 m_client->initializeLayerTreeView(); 4227 m_client->initializeLayerTreeView();
4228 m_layerTreeView = m_client->layerTreeView(); 4228 m_layerTreeView = m_client->layerTreeView();
4229 } 4229 }
4230 4230
4231 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl()) 4231 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
4232 devTools->layerTreeViewChanged(m_layerTreeView); 4232 devTools->layerTreeViewChanged(m_layerTreeView);
4233 4233
4234 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView); 4234 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView);
4235 if (m_layerTreeView)
4236 m_page->layerTreeViewInitialized(*m_layerTreeView);
4235 4237
4236 // FIXME: only unittests, click to play, Android printing, and printing (for headers and footers) 4238 // FIXME: only unittests, click to play, Android printing, and printing (for headers and footers)
4237 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView. 4239 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView.
4238 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi ew()); 4240 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi ew());
4239 4241
4240 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->isThreadedAnimationEnabled() && m_layerTreeView) { 4242 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->isThreadedAnimationEnabled() && m_layerTreeView) {
4241 ASSERT(Platform::current()->compositorSupport()); 4243 ASSERT(Platform::current()->compositorSupport());
4242 m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSuppo rt()->createAnimationTimeline()); 4244 m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSuppo rt()->createAnimationTimeline());
4243 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); 4245 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
4244 } 4246 }
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
4452 if (m_pageColorOverlay) 4454 if (m_pageColorOverlay)
4453 m_pageColorOverlay->update(); 4455 m_pageColorOverlay->update();
4454 if (InspectorOverlay* overlay = inspectorOverlay()) { 4456 if (InspectorOverlay* overlay = inspectorOverlay()) {
4455 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); 4457 PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
4456 if (inspectorPageOverlay) 4458 if (inspectorPageOverlay)
4457 inspectorPageOverlay->update(); 4459 inspectorPageOverlay->update();
4458 } 4460 }
4459 } 4461 }
4460 4462
4461 } // namespace blink 4463 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebPagePopupImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698