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

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

Issue 1139903005: Add PERSISTENT_MAP usage for GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: persistentmap: fixmandolinebetter Created 5 years, 7 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 Boolean key_exists = false; 585 Boolean key_exists = false;
586 Boolean value = CFPreferencesGetAppBooleanValue( 586 Boolean value = CFPreferencesGetAppBooleanValue(
587 key, kCFPreferencesCurrentApplication, &key_exists); 587 key, kCFPreferencesCurrentApplication, &key_exists);
588 if (key_exists && !value) 588 if (key_exists && !value)
589 is_elastic_overscroll_enabled_ = false; 589 is_elastic_overscroll_enabled_ = false;
590 } 590 }
591 #else 591 #else
592 is_elastic_overscroll_enabled_ = false; 592 is_elastic_overscroll_enabled_ = false;
593 #endif 593 #endif
594 594
595 std::string image_texture_target_string = 595 std::string map_image_texture_target_string =
596 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget); 596 command_line.GetSwitchValueASCII(switches::kMapImageTextureTarget);
597 bool parsed_image_texture_target = base::StringToUint( 597 bool parsed_map_image_texture_target = base::StringToUint(
598 image_texture_target_string, &use_image_texture_target_); 598 map_image_texture_target_string, &map_image_texture_target_);
599 DCHECK(parsed_image_texture_target); 599 DCHECK(parsed_map_image_texture_target);
600
601 std::string persistent_map_image_texture_target_string =
602 command_line.GetSwitchValueASCII(
603 switches::kPersistentMapImageTextureTarget);
604 bool parsed_persistent_map_image_texture_target =
605 base::StringToUint(persistent_map_image_texture_target_string,
606 &persistent_map_image_texture_target_);
607 DCHECK(parsed_persistent_map_image_texture_target);
600 608
601 if (command_line.HasSwitch(switches::kDisableLCDText)) { 609 if (command_line.HasSwitch(switches::kDisableLCDText)) {
602 is_lcd_text_enabled_ = false; 610 is_lcd_text_enabled_ = false;
603 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { 611 } else if (command_line.HasSwitch(switches::kEnableLCDText)) {
604 is_lcd_text_enabled_ = true; 612 is_lcd_text_enabled_ = true;
605 } else { 613 } else {
606 #if defined(OS_ANDROID) 614 #if defined(OS_ANDROID)
607 is_lcd_text_enabled_ = false; 615 is_lcd_text_enabled_ = false;
608 #else 616 #else
609 is_lcd_text_enabled_ = true; 617 is_lcd_text_enabled_ = true;
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 bool RenderThreadImpl::IsElasticOverscrollEnabled() { 1421 bool RenderThreadImpl::IsElasticOverscrollEnabled() {
1414 return is_elastic_overscroll_enabled_; 1422 return is_elastic_overscroll_enabled_;
1415 } 1423 }
1416 1424
1417 bool RenderThreadImpl::UseSingleThreadScheduler() { 1425 bool RenderThreadImpl::UseSingleThreadScheduler() {
1418 // TODO(enne): using the scheduler introduces additional composite steps 1426 // TODO(enne): using the scheduler introduces additional composite steps
1419 // that create flakiness. This should go away eventually. 1427 // that create flakiness. This should go away eventually.
1420 return !layout_test_mode_; 1428 return !layout_test_mode_;
1421 } 1429 }
1422 1430
1423 uint32 RenderThreadImpl::GetImageTextureTarget() { 1431 uint32 RenderThreadImpl::GetMapImageTextureTarget() {
1424 return use_image_texture_target_; 1432 return map_image_texture_target_;
1433 }
1434
1435 uint32 RenderThreadImpl::GetPersistentMapImageTextureTarget() {
1436 return persistent_map_image_texture_target_;
1425 } 1437 }
1426 1438
1427 scoped_refptr<base::SingleThreadTaskRunner> 1439 scoped_refptr<base::SingleThreadTaskRunner>
1428 RenderThreadImpl::GetCompositorMainThreadTaskRunner() { 1440 RenderThreadImpl::GetCompositorMainThreadTaskRunner() {
1429 return main_thread_compositor_task_runner_; 1441 return main_thread_compositor_task_runner_;
1430 } 1442 }
1431 1443
1432 scoped_refptr<base::SingleThreadTaskRunner> 1444 scoped_refptr<base::SingleThreadTaskRunner>
1433 RenderThreadImpl::GetCompositorImplThreadTaskRunner() { 1445 RenderThreadImpl::GetCompositorImplThreadTaskRunner() {
1434 return compositor_message_loop_proxy_; 1446 return compositor_message_loop_proxy_;
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1885 } 1897 }
1886 1898
1887 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 1899 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
1888 size_t erased = 1900 size_t erased =
1889 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 1901 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
1890 routing_id_); 1902 routing_id_);
1891 DCHECK_EQ(1u, erased); 1903 DCHECK_EQ(1u, erased);
1892 } 1904 }
1893 1905
1894 } // namespace content 1906 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698