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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 963223002: ui: Pass correct image texture target and one-copy settings to cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: usetexturetarget: exportswitch Created 5 years, 9 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 Boolean key_exists = false; 563 Boolean key_exists = false;
564 Boolean value = CFPreferencesGetAppBooleanValue( 564 Boolean value = CFPreferencesGetAppBooleanValue(
565 key, kCFPreferencesCurrentApplication, &key_exists); 565 key, kCFPreferencesCurrentApplication, &key_exists);
566 if (key_exists && !value) 566 if (key_exists && !value)
567 is_elastic_overscroll_enabled_ = false; 567 is_elastic_overscroll_enabled_ = false;
568 } 568 }
569 #else 569 #else
570 is_elastic_overscroll_enabled_ = false; 570 is_elastic_overscroll_enabled_ = false;
571 #endif 571 #endif
572 572
573 use_image_texture_target_ = GL_TEXTURE_2D; 573 std::string image_texture_target_string =
574 if (command_line.HasSwitch(switches::kUseImageTextureTarget)) { 574 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget);
575 std::string target_string = 575 bool parsed_image_texture_target = base::StringToUint(
576 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget); 576 image_texture_target_string, &use_image_texture_target_);
577 const unsigned targets[] = { 577 DCHECK(parsed_image_texture_target);
578 GL_TEXTURE_RECTANGLE_ARB,
579 GL_TEXTURE_EXTERNAL_OES
580 };
581 for (auto target : targets) {
582 if (target_string == gpu::gles2::GLES2Util::GetStringEnum(target))
583 use_image_texture_target_ = target;
584 }
585 }
586 578
587 if (command_line.HasSwitch(switches::kDisableLCDText)) { 579 if (command_line.HasSwitch(switches::kDisableLCDText)) {
588 is_lcd_text_enabled_ = false; 580 is_lcd_text_enabled_ = false;
589 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { 581 } else if (command_line.HasSwitch(switches::kEnableLCDText)) {
590 is_lcd_text_enabled_ = true; 582 is_lcd_text_enabled_ = true;
591 } else { 583 } else {
592 #if defined(OS_ANDROID) 584 #if defined(OS_ANDROID)
593 is_lcd_text_enabled_ = false; 585 is_lcd_text_enabled_ = false;
594 #else 586 #else
595 is_lcd_text_enabled_ = true; 587 is_lcd_text_enabled_ = true;
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1827 mojo::InterfaceRequest<mojo::ServiceProvider> services, 1819 mojo::InterfaceRequest<mojo::ServiceProvider> services,
1828 mojo::ServiceProviderPtr exposed_services) 1820 mojo::ServiceProviderPtr exposed_services)
1829 : services(services.Pass()), 1821 : services(services.Pass()),
1830 exposed_services(exposed_services.Pass()) { 1822 exposed_services(exposed_services.Pass()) {
1831 } 1823 }
1832 1824
1833 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { 1825 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() {
1834 } 1826 }
1835 1827
1836 } // namespace content 1828 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.h ('k') | content/renderer/render_thread_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698