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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 1323913002: Composited Animations: Support --disable-threaded-animation in new animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « Source/web/LinkHighlightImpl.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 4170 matching lines...) Expand 10 before | Expand all | Expand 10 after
4181 4181
4182 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl()) 4182 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
4183 devTools->layerTreeViewChanged(m_layerTreeView); 4183 devTools->layerTreeViewChanged(m_layerTreeView);
4184 4184
4185 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0); 4185 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0);
4186 4186
4187 // FIXME: only unittests, click to play, Android priting, and printing (for headers and footers) 4187 // FIXME: only unittests, click to play, Android priting, and printing (for headers and footers)
4188 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView. 4188 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView.
4189 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi ew()); 4189 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi ew());
4190 4190
4191 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && m_layer TreeView) { 4191 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->isThreadedAnimationEnabled() && m_layerTreeView) {
4192 ASSERT(Platform::current()->compositorSupport()); 4192 ASSERT(Platform::current()->compositorSupport());
4193 m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSuppo rt()->createAnimationTimeline()); 4193 m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSuppo rt()->createAnimationTimeline());
4194 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); 4194 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
4195 } 4195 }
4196 } 4196 }
4197 4197
4198 void WebViewImpl::applyViewportDeltas( 4198 void WebViewImpl::applyViewportDeltas(
4199 const WebFloatSize& visualViewportDelta, 4199 const WebFloatSize& visualViewportDelta,
4200 const WebFloatSize& layoutViewportDelta, 4200 const WebFloatSize& layoutViewportDelta,
4201 const WebFloatSize& elasticOverscrollDelta, 4201 const WebFloatSize& elasticOverscrollDelta,
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
4416 if (m_pageColorOverlay) 4416 if (m_pageColorOverlay)
4417 m_pageColorOverlay->update(); 4417 m_pageColorOverlay->update();
4418 if (m_inspectorOverlay) { 4418 if (m_inspectorOverlay) {
4419 PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay(); 4419 PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay();
4420 if (inspectorPageOverlay) 4420 if (inspectorPageOverlay)
4421 inspectorPageOverlay->update(); 4421 inspectorPageOverlay->update();
4422 } 4422 }
4423 } 4423 }
4424 4424
4425 } // namespace blink 4425 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/LinkHighlightImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698