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

Side by Side Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 15029006: Make it possible for the scroll offset delegate to intercept fling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reactivate the patch! Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/public/common/content_switches.cc ('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 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/gpu/render_widget_compositor.h" 5 #include "content/renderer/gpu/render_widget_compositor.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 settings.can_use_lcd_text = false; 272 settings.can_use_lcd_text = false;
273 settings.max_partial_texture_updates = 0; 273 settings.max_partial_texture_updates = 0;
274 settings.use_linear_fade_scrollbar_animator = true; 274 settings.use_linear_fade_scrollbar_animator = true;
275 settings.solid_color_scrollbars = true; 275 settings.solid_color_scrollbars = true;
276 settings.solid_color_scrollbar_color = 276 settings.solid_color_scrollbar_color =
277 cmd->HasSwitch(switches::kHideScrollbars) 277 cmd->HasSwitch(switches::kHideScrollbars)
278 ? SK_ColorTRANSPARENT 278 ? SK_ColorTRANSPARENT
279 : SkColorSetARGB(128, 128, 128, 128); 279 : SkColorSetARGB(128, 128, 128, 128);
280 settings.solid_color_scrollbar_thickness_dip = 3; 280 settings.solid_color_scrollbar_thickness_dip = 3;
281 settings.highp_threshold_min = 2048; 281 settings.highp_threshold_min = 2048;
282 settings.ignore_root_layer_flings =
283 cmd->HasSwitch(switches::kIgnoreRootLayerFlings);
282 #endif 284 #endif
283 285
284 if (!compositor->initialize(settings)) 286 if (!compositor->initialize(settings))
285 return scoped_ptr<RenderWidgetCompositor>(); 287 return scoped_ptr<RenderWidgetCompositor>();
286 288
287 return compositor.Pass(); 289 return compositor.Pass();
288 } 290 }
289 291
290 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget, 292 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget,
291 bool threaded) 293 bool threaded)
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); 575 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
574 } 576 }
575 577
576 scoped_refptr<cc::ContextProvider> 578 scoped_refptr<cc::ContextProvider>
577 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { 579 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
578 return RenderThreadImpl::current()-> 580 return RenderThreadImpl::current()->
579 OffscreenContextProviderForCompositorThread(); 581 OffscreenContextProviderForCompositorThread();
580 } 582 }
581 583
582 } // namespace content 584 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698