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 790 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
801 // https://code.google.com/p/chromium/issues/detail?id=234437 | 801 // https://code.google.com/p/chromium/issues/detail?id=234437 |
802 WebRuntimeFeatures::enableWebPInAcceptHeader(true); | 802 WebRuntimeFeatures::enableWebPInAcceptHeader(true); |
803 | 803 |
804 if (!media::IsMediaLibraryInitialized()) { | 804 if (!media::IsMediaLibraryInitialized()) { |
805 WebRuntimeFeatures::enableMediaPlayer(false); | 805 WebRuntimeFeatures::enableMediaPlayer(false); |
806 WebRuntimeFeatures::enableWebAudio(false); | 806 WebRuntimeFeatures::enableWebAudio(false); |
807 } | 807 } |
808 | 808 |
809 FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); | 809 FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); |
810 | 810 |
811 devtools_agent_message_filter_ = new DevToolsAgentFilter(); | 811 devtools_agent_message_filter_ = |
| 812 new DevToolsAgentFilter(resource_dispatcher()); |
812 AddFilter(devtools_agent_message_filter_.get()); | 813 AddFilter(devtools_agent_message_filter_.get()); |
813 | 814 |
814 if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) | 815 if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) |
815 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 816 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
816 } | 817 } |
817 | 818 |
818 void RenderThreadImpl::RegisterSchemes() { | 819 void RenderThreadImpl::RegisterSchemes() { |
819 // swappedout: pages should not be accessible, and should also | 820 // swappedout: pages should not be accessible, and should also |
820 // be treated as empty documents that can commit synchronously. | 821 // be treated as empty documents that can commit synchronously. |
821 WebString swappedout_scheme(ASCIIToUTF16(chrome::kSwappedOutScheme)); | 822 WebString swappedout_scheme(ASCIIToUTF16(chrome::kSwappedOutScheme)); |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1325 | 1326 |
1326 void RenderThreadImpl::SetFlingCurveParameters( | 1327 void RenderThreadImpl::SetFlingCurveParameters( |
1327 const std::vector<float>& new_touchpad, | 1328 const std::vector<float>& new_touchpad, |
1328 const std::vector<float>& new_touchscreen) { | 1329 const std::vector<float>& new_touchscreen) { |
1329 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1330 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1330 new_touchscreen); | 1331 new_touchscreen); |
1331 | 1332 |
1332 } | 1333 } |
1333 | 1334 |
1334 } // namespace content | 1335 } // namespace content |
OLD | NEW |