summaryrefslogtreecommitdiffstats
path: root/content/port
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 06:50:46 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 06:50:46 +0000
commit180ef24f1fd1b1ff309fc35f250336890f702f28 (patch)
treede5918896ed9780e5cf6098be329060a58f3702e /content/port
parent8d7dd7ade794c71be49c7a954c4d4b4ca1ab6c01 (diff)
downloadchromium_src-180ef24f1fd1b1ff309fc35f250336890f702f28.zip
chromium_src-180ef24f1fd1b1ff309fc35f250336890f702f28.tar.gz
chromium_src-180ef24f1fd1b1ff309fc35f250336890f702f28.tar.bz2
Rename WebKit namespace to blink (part 3)
This CL updates all references to the WebKit namespace in content. TBR=darin@chromium.org BUG=295096 Review URL: https://codereview.chromium.org/63253002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/port')
-rw-r--r--content/port/browser/event_with_latency_info.h10
-rw-r--r--content/port/browser/render_view_host_delegate_view.h4
-rw-r--r--content/port/browser/render_widget_host_view_port.h14
3 files changed, 14 insertions, 14 deletions
diff --git a/content/port/browser/event_with_latency_info.h b/content/port/browser/event_with_latency_info.h
index c8d941f..d746ce2 100644
--- a/content/port/browser/event_with_latency_info.h
+++ b/content/port/browser/event_with_latency_info.h
@@ -9,7 +9,7 @@
#include "content/common/input/web_input_event_traits.h"
-namespace WebKit {
+namespace blink {
class WebGestureEvent;
class WebMouseEvent;
class WebMouseWheelEvent;
@@ -40,13 +40,13 @@ class EventWithLatencyInfo {
}
};
-typedef EventWithLatencyInfo<WebKit::WebGestureEvent>
+typedef EventWithLatencyInfo<blink::WebGestureEvent>
GestureEventWithLatencyInfo;
-typedef EventWithLatencyInfo<WebKit::WebMouseWheelEvent>
+typedef EventWithLatencyInfo<blink::WebMouseWheelEvent>
MouseWheelEventWithLatencyInfo;
-typedef EventWithLatencyInfo<WebKit::WebMouseEvent>
+typedef EventWithLatencyInfo<blink::WebMouseEvent>
MouseEventWithLatencyInfo;
-typedef EventWithLatencyInfo<WebKit::WebTouchEvent>
+typedef EventWithLatencyInfo<blink::WebTouchEvent>
TouchEventWithLatencyInfo;
} // namespace content
diff --git a/content/port/browser/render_view_host_delegate_view.h b/content/port/browser/render_view_host_delegate_view.h
index 5e5d9b4..c6fb2e7 100644
--- a/content/port/browser/render_view_host_delegate_view.h
+++ b/content/port/browser/render_view_host_delegate_view.h
@@ -51,14 +51,14 @@ class CONTENT_EXPORT RenderViewHostDelegateView {
// reason, it must inform the renderer that the drag has ended; otherwise,
// this results in bugs like http://crbug.com/157134.
virtual void StartDragging(const DropData& drop_data,
- WebKit::WebDragOperationsMask allowed_ops,
+ blink::WebDragOperationsMask allowed_ops,
const gfx::ImageSkia& image,
const gfx::Vector2d& image_offset,
const DragEventSourceInfo& event_info) {}
// The page wants to update the mouse cursor during a drag & drop operation.
// |operation| describes the current operation (none, move, copy, link.)
- virtual void UpdateDragCursor(WebKit::WebDragOperation operation) {}
+ virtual void UpdateDragCursor(blink::WebDragOperation operation) {}
// Notification that view for this delegate got the focus.
virtual void GotFocus() {}
diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h
index f9444b3..3360bfc 100644
--- a/content/port/browser/render_widget_host_view_port.h
+++ b/content/port/browser/render_widget_host_view_port.h
@@ -34,7 +34,7 @@ namespace media {
class VideoFrame;
}
-namespace WebKit {
+namespace blink {
struct WebScreenInfo;
}
@@ -60,7 +60,7 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView,
static RenderWidgetHostViewPort* CreateViewForWidget(
RenderWidgetHost* widget);
- static void GetDefaultScreenInfo(WebKit::WebScreenInfo* results);
+ static void GetDefaultScreenInfo(blink::WebScreenInfo* results);
// Perform all the initialization steps necessary for this object to represent
// a popup (such as a <select> dropdown), then shows the popup at |pos|.
@@ -241,7 +241,7 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView,
uint32 output_surface_id,
scoped_ptr<cc::CompositorFrame> frame) = 0;
- virtual void GetScreenInfo(WebKit::WebScreenInfo* results) = 0;
+ virtual void GetScreenInfo(blink::WebScreenInfo* results) = 0;
// The size of the view's backing surface in non-DPI-adjusted pixels.
virtual gfx::Size GetPhysicalBackingSize() const = 0;
@@ -282,14 +282,14 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView,
bool is_pinned_to_left, bool is_pinned_to_right) = 0;
// Called when a mousewheel event was not processed by the renderer.
- virtual void UnhandledWheelEvent(const WebKit::WebMouseWheelEvent& event) = 0;
+ virtual void UnhandledWheelEvent(const blink::WebMouseWheelEvent& event) = 0;
// Called prior to forwarding input event messages to the renderer, giving
// the view a chance to perform in-process event filtering or processing.
// Return values of |NOT_CONSUMED| or |UNKNOWN| will result in |input_event|
// being forwarded.
virtual InputEventAckState FilterInputEvent(
- const WebKit::WebInputEvent& input_event) = 0;
+ const blink::WebInputEvent& input_event) = 0;
// Called by the host when it requires an input flush; the flush call should
// by synchronized with BeginFrame.
@@ -304,8 +304,8 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView,
virtual void OnOverscrolled(gfx::Vector2dF accumulated_overscroll,
gfx::Vector2dF current_fling_velocity) = 0;
- virtual void SetPopupType(WebKit::WebPopupType popup_type) = 0;
- virtual WebKit::WebPopupType GetPopupType() = 0;
+ virtual void SetPopupType(blink::WebPopupType popup_type) = 0;
+ virtual blink::WebPopupType GetPopupType() = 0;
virtual BrowserAccessibilityManager*
GetBrowserAccessibilityManager() const = 0;