| Index: webkit/child/webkitplatformsupport_child_impl.h
|
| diff --git a/webkit/child/webkitplatformsupport_child_impl.h b/webkit/child/webkitplatformsupport_child_impl.h
|
| index 5ba71d822a410ee1991072fb1be15c73f76988c2..43e447d00e1c232ecce9d71d1543eb15ccaabe4e 100644
|
| --- a/webkit/child/webkitplatformsupport_child_impl.h
|
| +++ b/webkit/child/webkitplatformsupport_child_impl.h
|
| @@ -31,27 +31,27 @@ class WEBKIT_CHILD_EXPORT WebKitPlatformSupportChildImpl :
|
| virtual ~WebKitPlatformSupportChildImpl();
|
|
|
| // Platform methods (partial implementation):
|
| - virtual WebKit::WebThemeEngine* themeEngine();
|
| - virtual WebKit::WebFallbackThemeEngine* fallbackThemeEngine();
|
| + virtual blink::WebThemeEngine* themeEngine();
|
| + virtual blink::WebFallbackThemeEngine* fallbackThemeEngine();
|
|
|
| void SetFlingCurveParameters(
|
| const std::vector<float>& new_touchpad,
|
| const std::vector<float>& new_touchscreen);
|
|
|
| - virtual WebKit::WebGestureCurve* createFlingAnimationCurve(
|
| + virtual blink::WebGestureCurve* createFlingAnimationCurve(
|
| int device_source,
|
| - const WebKit::WebFloatPoint& velocity,
|
| - const WebKit::WebSize& cumulative_scroll) OVERRIDE;
|
| + const blink::WebFloatPoint& velocity,
|
| + const blink::WebSize& cumulative_scroll) OVERRIDE;
|
|
|
| - virtual WebKit::WebThread* createThread(const char* name);
|
| - virtual WebKit::WebThread* currentThread();
|
| + virtual blink::WebThread* createThread(const char* name);
|
| + virtual blink::WebThread* currentThread();
|
|
|
| virtual void didStartWorkerRunLoop(
|
| - const WebKit::WebWorkerRunLoop& runLoop) OVERRIDE;
|
| + const blink::WebWorkerRunLoop& runLoop) OVERRIDE;
|
| virtual void didStopWorkerRunLoop(
|
| - const WebKit::WebWorkerRunLoop& runLoop) OVERRIDE;
|
| + const blink::WebWorkerRunLoop& runLoop) OVERRIDE;
|
|
|
| - virtual WebKit::WebDiscardableMemory* allocateAndLockDiscardableMemory(
|
| + virtual blink::WebDiscardableMemory* allocateAndLockDiscardableMemory(
|
| size_t bytes);
|
|
|
| private:
|
|
|