OLD | NEW |
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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 LOG(WARNING) << "Bad number of raster threads: " << | 132 LOG(WARNING) << "Bad number of raster threads: " << |
133 num_raster_threads; | 133 num_raster_threads; |
134 } | 134 } |
135 } | 135 } |
136 | 136 |
137 #if defined(OS_ANDROID) | 137 #if defined(OS_ANDROID) |
138 // TODO(danakj): Move these to the android code. | 138 // TODO(danakj): Move these to the android code. |
139 settings.canUseLCDText = false; | 139 settings.canUseLCDText = false; |
140 settings.maxPartialTextureUpdates = 0; | 140 settings.maxPartialTextureUpdates = 0; |
141 settings.useLinearFadeScrollbarAnimator = true; | 141 settings.useLinearFadeScrollbarAnimator = true; |
| 142 settings.solidColorScrollbars = true; |
| 143 settings.solidColorScrollbarColor = SkColorSetARGB(128, 128, 128, 128); |
| 144 settings.solidColorScrollbarThicknessDIP = 3; |
142 #endif | 145 #endif |
143 | 146 |
144 if (!comp->initialize(settings)) | 147 if (!comp->initialize(settings)) |
145 return scoped_ptr<RenderWidgetCompositor>(); | 148 return scoped_ptr<RenderWidgetCompositor>(); |
146 | 149 |
147 return comp.Pass(); | 150 return comp.Pass(); |
148 } | 151 } |
149 | 152 |
150 RenderWidgetCompositor::RenderWidgetCompositor( | 153 RenderWidgetCompositor::RenderWidgetCompositor( |
151 RenderWidget* widget, WebKit::WebLayerTreeViewClient* client) | 154 RenderWidget* widget, WebKit::WebLayerTreeViewClient* client) |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 widget_->didCompleteSwapBuffers(); | 373 widget_->didCompleteSwapBuffers(); |
371 } | 374 } |
372 | 375 |
373 // TODO(jamesr): This goes through WebViewImpl just to do suppression, refactor | 376 // TODO(jamesr): This goes through WebViewImpl just to do suppression, refactor |
374 // that piece out. | 377 // that piece out. |
375 void RenderWidgetCompositor::scheduleComposite() { | 378 void RenderWidgetCompositor::scheduleComposite() { |
376 client_->scheduleComposite(); | 379 client_->scheduleComposite(); |
377 } | 380 } |
378 | 381 |
379 } // namespace content | 382 } // namespace content |
OLD | NEW |