OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
Ami GONE FROM CHROMIUM
2013/06/26 00:11:58
Looks like you lost the race with https://chromium
Ami GONE FROM CHROMIUM
2013/06/26 00:11:58
Please don't address comments and rebase in the sa
wuchengli
2013/06/28 15:08:44
Done.
wuchengli
2013/06/28 15:08:44
Rebased. It didn't take long. BTW, what are mailbo
Ami GONE FROM CHROMIUM
2013/06/28 17:04:00
gpu/GLES2/extensions/CHROMIUM/CHROMIUM_texture_mai
| |
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 // Represents the browser side of the browser <--> renderer communication | 5 // Represents the browser side of the browser <--> renderer communication |
6 // channel. There will be one RenderProcessHost per renderer process. | 6 // channel. There will be one RenderProcessHost per renderer process. |
7 | 7 |
8 #include "content/browser/renderer_host/render_process_host_impl.h" | 8 #include "content/browser/renderer_host/render_process_host_impl.h" |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
11 #include <limits> | 11 #include <limits> |
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
865 switches::kEnableGpuBenchmarking, | 865 switches::kEnableGpuBenchmarking, |
866 switches::kEnableMemoryBenchmarking, | 866 switches::kEnableMemoryBenchmarking, |
867 switches::kEnableSkiaBenchmarking, | 867 switches::kEnableSkiaBenchmarking, |
868 switches::kEnableLogging, | 868 switches::kEnableLogging, |
869 switches::kEnableSpeechSynthesis, | 869 switches::kEnableSpeechSynthesis, |
870 switches::kEnableTouchDragDrop, | 870 switches::kEnableTouchDragDrop, |
871 switches::kEnableTouchEditing, | 871 switches::kEnableTouchEditing, |
872 switches::kEnableWebPInAcceptHeader, | 872 switches::kEnableWebPInAcceptHeader, |
873 #if defined(ENABLE_WEBRTC) | 873 #if defined(ENABLE_WEBRTC) |
874 switches::kEnableWebRtcAecRecordings, | 874 switches::kEnableWebRtcAecRecordings, |
875 switches::kEnableWebRTCHWDecoding, | |
875 #endif | 876 #endif |
876 #if defined(ANDROID) && !defined(GOOGLE_TV) | 877 #if defined(ANDROID) && !defined(GOOGLE_TV) |
877 switches::kEnableWebKitMediaSource, | 878 switches::kEnableWebKitMediaSource, |
878 #else | 879 #else |
879 switches::kDisableWebKitMediaSource, | 880 switches::kDisableWebKitMediaSource, |
880 #endif | 881 #endif |
881 switches::kEnableOverscrollNotifications, | 882 switches::kEnableOverscrollNotifications, |
882 switches::kEnableStrictSiteIsolation, | 883 switches::kEnableStrictSiteIsolation, |
883 switches::kDisableFullScreen, | 884 switches::kDisableFullScreen, |
884 switches::kEnableNewDialogStyle, | 885 switches::kEnableNewDialogStyle, |
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1777 continue; | 1778 continue; |
1778 | 1779 |
1779 RenderViewHost* rvh = | 1780 RenderViewHost* rvh = |
1780 RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); | 1781 RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); |
1781 | 1782 |
1782 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); | 1783 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); |
1783 } | 1784 } |
1784 } | 1785 } |
1785 | 1786 |
1786 } // namespace content | 1787 } // namespace content |
OLD | NEW |