| OLD | NEW |
| 1 // // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // // Copyright 2013 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 #ifndef WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ | 5 #ifndef CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ |
| 6 #define WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ | 6 #define CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/threading/thread_local_storage.h" | 8 #include "base/threading/thread_local_storage.h" |
| 9 #include "content/common/content_export.h" |
| 9 #include "webkit/child/webfallbackthemeengine_impl.h" | 10 #include "webkit/child/webfallbackthemeengine_impl.h" |
| 10 #include "webkit/child/webkit_child_export.h" | 11 #include "webkit/child/webkit_child_export.h" |
| 11 #include "webkit/child/webkitplatformsupport_impl.h" | 12 #include "webkit/child/webkitplatformsupport_impl.h" |
| 12 | 13 |
| 13 #if defined(USE_DEFAULT_RENDER_THEME) | 14 #if defined(USE_DEFAULT_RENDER_THEME) |
| 14 #include "webkit/child/webthemeengine_impl_default.h" | 15 #include "webkit/child/webthemeengine_impl_default.h" |
| 15 #elif defined(OS_WIN) | 16 #elif defined(OS_WIN) |
| 16 #include "webkit/child/webthemeengine_impl_win.h" | 17 #include "webkit/child/webthemeengine_impl_win.h" |
| 17 #elif defined(OS_MACOSX) | 18 #elif defined(OS_MACOSX) |
| 18 #include "webkit/child/webthemeengine_impl_mac.h" | 19 #include "webkit/child/webthemeengine_impl_mac.h" |
| 19 #elif defined(OS_ANDROID) | 20 #elif defined(OS_ANDROID) |
| 20 #include "webkit/child/webthemeengine_impl_android.h" | 21 #include "webkit/child/webthemeengine_impl_android.h" |
| 21 #endif | 22 #endif |
| 22 | 23 |
| 23 namespace webkit_glue { | 24 namespace webkit_glue { |
| 25 class FlingCurveConfiguration; |
| 26 } |
| 24 | 27 |
| 25 class FlingCurveConfiguration; | 28 namespace content { |
| 26 | 29 |
| 27 class WEBKIT_CHILD_EXPORT WebKitPlatformSupportChildImpl : | 30 class CONTENT_EXPORT WebKitPlatformSupportChildImpl : |
| 28 public WebKitPlatformSupportImpl { | 31 public webkit_glue::WebKitPlatformSupportImpl { |
| 29 public: | 32 public: |
| 30 WebKitPlatformSupportChildImpl(); | 33 WebKitPlatformSupportChildImpl(); |
| 31 virtual ~WebKitPlatformSupportChildImpl(); | 34 virtual ~WebKitPlatformSupportChildImpl(); |
| 32 | 35 |
| 33 // Platform methods (partial implementation): | 36 // Platform methods (partial implementation): |
| 34 virtual blink::WebThemeEngine* themeEngine(); | 37 virtual blink::WebThemeEngine* themeEngine(); |
| 35 virtual blink::WebFallbackThemeEngine* fallbackThemeEngine(); | 38 virtual blink::WebFallbackThemeEngine* fallbackThemeEngine(); |
| 36 | 39 |
| 37 void SetFlingCurveParameters( | 40 void SetFlingCurveParameters( |
| 38 const std::vector<float>& new_touchpad, | 41 const std::vector<float>& new_touchpad, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 54 const blink::WebWorkerRunLoop& runLoop) OVERRIDE; | 57 const blink::WebWorkerRunLoop& runLoop) OVERRIDE; |
| 55 virtual void didStopWorkerRunLoop( | 58 virtual void didStopWorkerRunLoop( |
| 56 const blink::WebWorkerRunLoop& runLoop) OVERRIDE; | 59 const blink::WebWorkerRunLoop& runLoop) OVERRIDE; |
| 57 | 60 |
| 58 virtual blink::WebDiscardableMemory* allocateAndLockDiscardableMemory( | 61 virtual blink::WebDiscardableMemory* allocateAndLockDiscardableMemory( |
| 59 size_t bytes); | 62 size_t bytes); |
| 60 | 63 |
| 61 private: | 64 private: |
| 62 static void DestroyCurrentThread(void*); | 65 static void DestroyCurrentThread(void*); |
| 63 | 66 |
| 64 WebThemeEngineImpl native_theme_engine_; | 67 webkit_glue::WebThemeEngineImpl native_theme_engine_; |
| 65 WebFallbackThemeEngineImpl fallback_theme_engine_; | 68 webkit_glue::WebFallbackThemeEngineImpl fallback_theme_engine_; |
| 66 base::ThreadLocalStorage::Slot current_thread_slot_; | 69 base::ThreadLocalStorage::Slot current_thread_slot_; |
| 67 scoped_ptr<FlingCurveConfiguration> fling_curve_configuration_; | 70 scoped_ptr<webkit_glue::FlingCurveConfiguration> fling_curve_configuration_; |
| 68 }; | 71 }; |
| 69 | 72 |
| 70 } // namespace webkit_glue | 73 } // namespace content |
| 71 | 74 |
| 72 #endif // WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ | 75 #endif // CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ |
| OLD | NEW |