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

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

Issue 766663005: cc: zero/one-copy based on shared memory on IOS uses GL_TEXTURE_2D, not GL_TEXTURE_RECTANGLE_ARB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use GLES2Util::GetStringEnum instead of kImageTextureExternal Created 6 years 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
« no previous file with comments | « content/renderer/render_thread_impl.h ('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) 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #include "content/renderer/p2p/socket_dispatcher.h" 95 #include "content/renderer/p2p/socket_dispatcher.h"
96 #include "content/renderer/render_frame_proxy.h" 96 #include "content/renderer/render_frame_proxy.h"
97 #include "content/renderer/render_process_impl.h" 97 #include "content/renderer/render_process_impl.h"
98 #include "content/renderer/render_view_impl.h" 98 #include "content/renderer/render_view_impl.h"
99 #include "content/renderer/renderer_blink_platform_impl.h" 99 #include "content/renderer/renderer_blink_platform_impl.h"
100 #include "content/renderer/scheduler/renderer_scheduler.h" 100 #include "content/renderer/scheduler/renderer_scheduler.h"
101 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h" 101 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h"
102 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" 102 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
103 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" 103 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
104 #include "gin/public/debug.h" 104 #include "gin/public/debug.h"
105 #include "gpu/GLES2/gl2extchromium.h"
106 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
105 #include "ipc/ipc_channel_handle.h" 107 #include "ipc/ipc_channel_handle.h"
106 #include "ipc/ipc_platform_file.h" 108 #include "ipc/ipc_platform_file.h"
107 #include "ipc/mojo/ipc_channel_mojo.h" 109 #include "ipc/mojo/ipc_channel_mojo.h"
108 #include "media/base/audio_hardware_config.h" 110 #include "media/base/audio_hardware_config.h"
109 #include "media/base/media.h" 111 #include "media/base/media.h"
110 #include "media/filters/gpu_video_accelerator_factories.h" 112 #include "media/filters/gpu_video_accelerator_factories.h"
111 #include "mojo/common/common_type_converters.h" 113 #include "mojo/common/common_type_converters.h"
112 #include "net/base/net_errors.h" 114 #include "net/base/net_errors.h"
113 #include "net/base/net_util.h" 115 #include "net/base/net_util.h"
114 #include "skia/ext/event_tracer_impl.h" 116 #include "skia/ext/event_tracer_impl.h"
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 516
515 #if defined(OS_MACOSX) || defined(OS_ANDROID) 517 #if defined(OS_MACOSX) || defined(OS_ANDROID)
516 // TODO(danakj): If changing these also update NumberOfRendererRasterThreads 518 // TODO(danakj): If changing these also update NumberOfRendererRasterThreads
517 // in compositor_util.cc. We should be using methods from compositor_util here 519 // in compositor_util.cc. We should be using methods from compositor_util here
518 // instead of inspecting flags. 520 // instead of inspecting flags.
519 is_one_copy_enabled_ = command_line.HasSwitch(switches::kEnableOneCopy); 521 is_one_copy_enabled_ = command_line.HasSwitch(switches::kEnableOneCopy);
520 #else 522 #else
521 is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy); 523 is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy);
522 #endif 524 #endif
523 525
524 use_image_external_ = command_line.HasSwitch(switches::kUseImageExternal); 526 use_image_texture_target_ = GL_TEXTURE_2D;
527 if (command_line.HasSwitch(switches::kUseImageTextureTarget)) {
528 std::string texture_target =
529 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget);
530 if (texture_target ==
531 gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_RECTANGLE_ARB)) {
532 use_image_texture_target_ = GL_TEXTURE_RECTANGLE_ARB;
533 } else if (texture_target ==
534 gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_EXTERNAL_OES)) {
535 use_image_texture_target_ = GL_TEXTURE_EXTERNAL_OES;
536 }
reveman 2014/12/04 20:10:38 Current code is fine but you might want to conside
dshwang 2014/12/04 20:55:59 nice code stub. I buy it :) Done.
537 }
525 538
526 if (command_line.HasSwitch(switches::kDisableLCDText)) { 539 if (command_line.HasSwitch(switches::kDisableLCDText)) {
527 is_lcd_text_enabled_ = false; 540 is_lcd_text_enabled_ = false;
528 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { 541 } else if (command_line.HasSwitch(switches::kEnableLCDText)) {
529 is_lcd_text_enabled_ = true; 542 is_lcd_text_enabled_ = true;
530 } else { 543 } else {
531 #if defined(OS_ANDROID) 544 #if defined(OS_ANDROID)
532 is_lcd_text_enabled_ = false; 545 is_lcd_text_enabled_ = false;
533 #else 546 #else
534 is_lcd_text_enabled_ = true; 547 is_lcd_text_enabled_ = true;
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 hidden_widget_count_--; 1628 hidden_widget_count_--;
1616 1629
1617 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1630 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1618 return; 1631 return;
1619 } 1632 }
1620 1633
1621 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1634 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1622 } 1635 }
1623 1636
1624 } // namespace content 1637 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698