| 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 "webkit/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "webkit/plugins/webplugininfo.h" | 55 #include "webkit/plugins/webplugininfo.h" |
| 56 #include "webkit/user_agent/user_agent.h" | 56 #include "webkit/user_agent/user_agent.h" |
| 57 | 57 |
| 58 #if defined(OS_ANDROID) | 58 #if defined(OS_ANDROID) |
| 59 #include "webkit/glue/fling_animator_impl_android.h" | 59 #include "webkit/glue/fling_animator_impl_android.h" |
| 60 #endif | 60 #endif |
| 61 | 61 |
| 62 using WebKit::WebAudioBus; | 62 using WebKit::WebAudioBus; |
| 63 using WebKit::WebCookie; | 63 using WebKit::WebCookie; |
| 64 using WebKit::WebData; | 64 using WebKit::WebData; |
| 65 using WebKit::WebFallbackThemeEngine; |
| 65 using WebKit::WebLocalizedString; | 66 using WebKit::WebLocalizedString; |
| 66 using WebKit::WebPluginListBuilder; | 67 using WebKit::WebPluginListBuilder; |
| 67 using WebKit::WebString; | 68 using WebKit::WebString; |
| 68 using WebKit::WebSocketStreamHandle; | 69 using WebKit::WebSocketStreamHandle; |
| 69 using WebKit::WebThemeEngine; | 70 using WebKit::WebThemeEngine; |
| 70 using WebKit::WebURL; | 71 using WebKit::WebURL; |
| 71 using WebKit::WebURLError; | 72 using WebKit::WebURLError; |
| 72 using WebKit::WebURLLoader; | 73 using WebKit::WebURLLoader; |
| 73 using WebKit::WebVector; | 74 using WebKit::WebVector; |
| 74 | 75 |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { | 377 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { |
| 377 } | 378 } |
| 378 | 379 |
| 379 void WebKitPlatformSupportImpl::SetFlingCurveParameters( | 380 void WebKitPlatformSupportImpl::SetFlingCurveParameters( |
| 380 const std::vector<float>& new_touchpad, | 381 const std::vector<float>& new_touchpad, |
| 381 const std::vector<float>& new_touchscreen) { | 382 const std::vector<float>& new_touchscreen) { |
| 382 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); | 383 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); |
| 383 } | 384 } |
| 384 | 385 |
| 385 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() { | 386 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() { |
| 386 return &theme_engine_; | 387 return &native_theme_engine_; |
| 388 } |
| 389 |
| 390 WebFallbackThemeEngine* WebKitPlatformSupportImpl::fallbackThemeEngine() { |
| 391 return &fallback_theme_engine_; |
| 387 } | 392 } |
| 388 | 393 |
| 389 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() { | 394 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() { |
| 390 return new WebURLLoaderImpl(this); | 395 return new WebURLLoaderImpl(this); |
| 391 } | 396 } |
| 392 | 397 |
| 393 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() { | 398 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() { |
| 394 return new WebSocketStreamHandleImpl(this); | 399 return new WebSocketStreamHandleImpl(this); |
| 395 } | 400 } |
| 396 | 401 |
| (...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 992 } | 997 } |
| 993 | 998 |
| 994 #if defined(OS_ANDROID) | 999 #if defined(OS_ANDROID) |
| 995 webkit_media::WebAudioMediaCodecRunner | 1000 webkit_media::WebAudioMediaCodecRunner |
| 996 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { | 1001 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { |
| 997 return base::Bind(&NullRunWebAudioMediaCodec); | 1002 return base::Bind(&NullRunWebAudioMediaCodec); |
| 998 } | 1003 } |
| 999 #endif | 1004 #endif |
| 1000 | 1005 |
| 1001 } // namespace webkit_glue | 1006 } // namespace webkit_glue |
| OLD | NEW |