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

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: Plumb it for WebPagePopup. 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
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 2668 matching lines...) Expand 10 before | Expand all | Expand 10 after
2679 } 2679 }
2680 2680
2681 void WebViewImpl::willCloseLayerTreeView() 2681 void WebViewImpl::willCloseLayerTreeView()
2682 { 2682 {
2683 if (m_linkHighlightsTimeline) { 2683 if (m_linkHighlightsTimeline) {
2684 m_linkHighlights.clear(); 2684 m_linkHighlights.clear();
2685 detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); 2685 detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
2686 m_linkHighlightsTimeline.clear(); 2686 m_linkHighlightsTimeline.clear();
2687 } 2687 }
2688 2688
2689 if (page()) 2689 if (page() && m_layerTreeView)
2690 page()->willCloseLayerTreeView(); 2690 page()->willCloseLayerTreeView(*m_layerTreeView);
2691 2691
2692 setRootGraphicsLayer(nullptr); 2692 setRootGraphicsLayer(nullptr);
2693 m_layerTreeView = nullptr; 2693 m_layerTreeView = nullptr;
2694 } 2694 }
2695 2695
2696 void WebViewImpl::didAcquirePointerLock() 2696 void WebViewImpl::didAcquirePointerLock()
2697 { 2697 {
2698 if (page()) 2698 if (page())
2699 page()->pointerLockController().didAcquirePointerLock(); 2699 page()->pointerLockController().didAcquirePointerLock();
2700 } 2700 }
(...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
4231 { 4231 {
4232 if (m_client) { 4232 if (m_client) {
4233 m_client->initializeLayerTreeView(); 4233 m_client->initializeLayerTreeView();
4234 m_layerTreeView = m_client->layerTreeView(); 4234 m_layerTreeView = m_client->layerTreeView();
4235 } 4235 }
4236 4236
4237 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl()) 4237 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
4238 devTools->layerTreeViewChanged(m_layerTreeView); 4238 devTools->layerTreeViewChanged(m_layerTreeView);
4239 4239
4240 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView); 4240 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView);
4241 if (m_layerTreeView)
4242 m_page->layerTreeViewInitialized(*m_layerTreeView);
4241 4243
4242 // FIXME: only unittests, click to play, Android printing, and printing (for headers and footers) 4244 // FIXME: only unittests, click to play, Android printing, and printing (for headers and footers)
4243 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView. 4245 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView.
4244 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi ew()); 4246 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi ew());
4245 4247
4246 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->isThreadedAnimationEnabled() && m_layerTreeView) { 4248 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->isThreadedAnimationEnabled() && m_layerTreeView) {
4247 ASSERT(Platform::current()->compositorSupport()); 4249 ASSERT(Platform::current()->compositorSupport());
4248 m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSuppo rt()->createAnimationTimeline()); 4250 m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSuppo rt()->createAnimationTimeline());
4249 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); 4251 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
4250 } 4252 }
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
4458 if (m_pageColorOverlay) 4460 if (m_pageColorOverlay)
4459 m_pageColorOverlay->update(); 4461 m_pageColorOverlay->update();
4460 if (InspectorOverlay* overlay = inspectorOverlay()) { 4462 if (InspectorOverlay* overlay = inspectorOverlay()) {
4461 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); 4463 PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
4462 if (inspectorPageOverlay) 4464 if (inspectorPageOverlay)
4463 inspectorPageOverlay->update(); 4465 inspectorPageOverlay->update();
4464 } 4466 }
4465 } 4467 }
4466 4468
4467 } // namespace blink 4469 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698