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

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

Issue 2121373002: Move allowsBrokenNullLayerTreeView calls from WebViewClient to WebWidgetClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adds override in RenderViewImpl to make sure we use the correct client Created 4 years, 5 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
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 4267 matching lines...) Expand 10 before | Expand all | Expand 10 after
4278 4278
4279 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl()) 4279 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
4280 devTools->layerTreeViewChanged(m_layerTreeView); 4280 devTools->layerTreeViewChanged(m_layerTreeView);
4281 4281
4282 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView); 4282 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView);
4283 if (m_layerTreeView) 4283 if (m_layerTreeView)
4284 m_page->layerTreeViewInitialized(*m_layerTreeView); 4284 m_page->layerTreeViewInitialized(*m_layerTreeView);
4285 4285
4286 // FIXME: only unittests, click to play, Android printing, and printing (for headers and footers) 4286 // FIXME: only unittests, click to play, Android printing, and printing (for headers and footers)
4287 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView. 4287 // make this assert necessary. We should make them not hit this code and the n delete allowsBrokenNullLayerTreeView.
4288 DCHECK(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi ew()); 4288 DCHECK(m_layerTreeView || !m_client || m_client->widgetClient()->allowsBroke nNullLayerTreeView());
4289 4289
4290 if (Platform::current()->isThreadedAnimationEnabled() && m_layerTreeView) { 4290 if (Platform::current()->isThreadedAnimationEnabled() && m_layerTreeView) {
4291 m_linkHighlightsTimeline = CompositorAnimationTimeline::create(); 4291 m_linkHighlightsTimeline = CompositorAnimationTimeline::create();
4292 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); 4292 attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
4293 } 4293 }
4294 4294
4295 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) 4295 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
4296 attachPaintArtifactCompositor(); 4296 attachPaintArtifactCompositor();
4297 } 4297 }
4298 4298
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
4533 { 4533 {
4534 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than 4534 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than
4535 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. 4535 // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
4536 if (!page()) 4536 if (!page())
4537 return 1; 4537 return 1;
4538 4538
4539 return page()->deviceScaleFactor(); 4539 return page()->deviceScaleFactor();
4540 } 4540 }
4541 4541
4542 } // namespace blink 4542 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698