OLD | NEW |
---|---|
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
94 #include "content/renderer/p2p/socket_dispatcher.h" | 94 #include "content/renderer/p2p/socket_dispatcher.h" |
95 #include "content/renderer/render_frame_proxy.h" | 95 #include "content/renderer/render_frame_proxy.h" |
96 #include "content/renderer/render_process_impl.h" | 96 #include "content/renderer/render_process_impl.h" |
97 #include "content/renderer/render_view_impl.h" | 97 #include "content/renderer/render_view_impl.h" |
98 #include "content/renderer/renderer_blink_platform_impl.h" | 98 #include "content/renderer/renderer_blink_platform_impl.h" |
99 #include "content/renderer/scheduler/renderer_scheduler.h" | 99 #include "content/renderer/scheduler/renderer_scheduler.h" |
100 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h" | 100 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h" |
101 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" | 101 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
102 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" | 102 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" |
103 #include "gin/public/debug.h" | 103 #include "gin/public/debug.h" |
104 #include "gpu/GLES2/gl2extchromium.h" | |
104 #include "ipc/ipc_channel_handle.h" | 105 #include "ipc/ipc_channel_handle.h" |
105 #include "ipc/ipc_platform_file.h" | 106 #include "ipc/ipc_platform_file.h" |
106 #include "ipc/mojo/ipc_channel_mojo.h" | 107 #include "ipc/mojo/ipc_channel_mojo.h" |
107 #include "media/base/audio_hardware_config.h" | 108 #include "media/base/audio_hardware_config.h" |
108 #include "media/base/media.h" | 109 #include "media/base/media.h" |
109 #include "media/filters/gpu_video_accelerator_factories.h" | 110 #include "media/filters/gpu_video_accelerator_factories.h" |
110 #include "mojo/common/common_type_converters.h" | 111 #include "mojo/common/common_type_converters.h" |
111 #include "net/base/net_errors.h" | 112 #include "net/base/net_errors.h" |
112 #include "net/base/net_util.h" | 113 #include "net/base/net_util.h" |
113 #include "skia/ext/event_tracer_impl.h" | 114 #include "skia/ext/event_tracer_impl.h" |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
513 | 514 |
514 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 515 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
515 // TODO(danakj): If changing these also update NumberOfRendererRasterThreads | 516 // TODO(danakj): If changing these also update NumberOfRendererRasterThreads |
516 // in compositor_util.cc. We should be using methods from compositor_util here | 517 // in compositor_util.cc. We should be using methods from compositor_util here |
517 // instead of inspecting flags. | 518 // instead of inspecting flags. |
518 is_one_copy_enabled_ = command_line.HasSwitch(switches::kEnableOneCopy); | 519 is_one_copy_enabled_ = command_line.HasSwitch(switches::kEnableOneCopy); |
519 #else | 520 #else |
520 is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy); | 521 is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy); |
521 #endif | 522 #endif |
522 | 523 |
523 use_image_external_ = command_line.HasSwitch(switches::kUseImageExternal); | 524 image_texture_target_ = GL_TEXTURE_2D; |
reveman
2014/12/03 15:57:19
do you need to set this here?
| |
525 if (command_line.HasSwitch(switches::kImageTextureTarget)) { | |
526 std::string texture_target = | |
527 command_line.GetSwitchValueASCII(switches::kImageTextureTarget); | |
528 if (texture_target == "GL_TEXTURE_RECTANGLE_ARB") { | |
reveman
2014/12/03 15:57:19
I prefer "rectangle" instead of "GL_TEXTURE_RECTAN
| |
529 image_texture_target_ = GL_TEXTURE_RECTANGLE_ARB; | |
530 } else if (texture_target == "GL_TEXTURE_EXTERNAL_OES") { | |
reveman
2014/12/03 15:57:19
"external"
| |
531 image_texture_target_ = GL_TEXTURE_EXTERNAL_OES; | |
532 } | |
533 } | |
524 | 534 |
525 if (command_line.HasSwitch(switches::kDisableLCDText)) { | 535 if (command_line.HasSwitch(switches::kDisableLCDText)) { |
526 is_lcd_text_enabled_ = false; | 536 is_lcd_text_enabled_ = false; |
527 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { | 537 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { |
528 is_lcd_text_enabled_ = true; | 538 is_lcd_text_enabled_ = true; |
529 } else { | 539 } else { |
530 #if defined(OS_ANDROID) | 540 #if defined(OS_ANDROID) |
531 is_lcd_text_enabled_ = false; | 541 is_lcd_text_enabled_ = false; |
532 #else | 542 #else |
533 is_lcd_text_enabled_ = true; | 543 is_lcd_text_enabled_ = true; |
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1598 hidden_widget_count_--; | 1608 hidden_widget_count_--; |
1599 | 1609 |
1600 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1610 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1601 return; | 1611 return; |
1602 } | 1612 } |
1603 | 1613 |
1604 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1614 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1605 } | 1615 } |
1606 | 1616 |
1607 } // namespace content | 1617 } // namespace content |
OLD | NEW |