Rename WebKit namespace to blink (part 3)
This CL updates all references to the WebKit namespace in content.
[email protected]
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
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 85e7eb9..abd20c3 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -48,7 +48,7 @@
class SyncMessage;
}
-namespace WebKit {
+namespace blink {
class WebGestureEvent;
class WebInputEvent;
class WebKeyboardEvent;
@@ -78,18 +78,18 @@
class CONTENT_EXPORT RenderWidget
: public IPC::Listener,
public IPC::Sender,
- NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient),
+ NON_EXPORTED_BASE(virtual public blink::WebWidgetClient),
NON_EXPORTED_BASE(public WebGraphicsContext3DSwapBuffersClient),
public base::RefCounted<RenderWidget> {
public:
// Creates a new RenderWidget. The opener_id is the routing ID of the
// RenderView that this widget lives inside.
static RenderWidget* Create(int32 opener_id,
- WebKit::WebPopupType popup_type,
- const WebKit::WebScreenInfo& screen_info);
+ blink::WebPopupType popup_type,
+ const blink::WebScreenInfo& screen_info);
// Creates a WebWidget based on the popup type.
- static WebKit::WebWidget* CreateWebWidget(RenderWidget* render_widget);
+ static blink::WebWidget* CreateWebWidget(RenderWidget* render_widget);
// The compositing surface assigned by the RenderWidgetHost
// (or RenderViewHost). Will be gfx::kNullPluginWindow if not assigned yet,
@@ -106,7 +106,7 @@
}
// May return NULL when the window is closing.
- WebKit::WebWidget* webwidget() const { return webwidget_; }
+ blink::WebWidget* webwidget() const { return webwidget_; }
gfx::Size size() const { return size_; }
bool has_focus() const { return has_focus_; }
@@ -119,17 +119,17 @@
// IPC::Sender
virtual bool Send(IPC::Message* msg) OVERRIDE;
- // WebKit::WebWidgetClient
+ // blink::WebWidgetClient
virtual void suppressCompositorScheduling(bool enable);
virtual void willBeginCompositorFrame();
- virtual void didInvalidateRect(const WebKit::WebRect&);
+ virtual void didInvalidateRect(const blink::WebRect&);
virtual void didScrollRect(int dx, int dy,
- const WebKit::WebRect& clipRect);
- virtual void didAutoResize(const WebKit::WebSize& new_size);
+ const blink::WebRect& clipRect);
+ virtual void didAutoResize(const blink::WebSize& new_size);
virtual void didActivateCompositor(int input_handler_identifier);
virtual void didDeactivateCompositor();
virtual void initializeLayerTreeView();
- virtual WebKit::WebLayerTreeView* layerTreeView();
+ virtual blink::WebLayerTreeView* layerTreeView();
virtual void didBecomeReadyForAdditionalInput();
virtual void didCommitAndDrawCompositorFrame();
virtual void didCompleteSwapBuffers();
@@ -137,20 +137,20 @@
virtual void scheduleAnimation();
virtual void didFocus();
virtual void didBlur();
- virtual void didChangeCursor(const WebKit::WebCursorInfo&);
+ virtual void didChangeCursor(const blink::WebCursorInfo&);
virtual void closeWidgetSoon();
- virtual void show(WebKit::WebNavigationPolicy);
+ virtual void show(blink::WebNavigationPolicy);
virtual void runModal() {}
- virtual WebKit::WebRect windowRect();
- virtual void setToolTipText(const WebKit::WebString& text,
- WebKit::WebTextDirection hint);
- virtual void setWindowRect(const WebKit::WebRect&);
- virtual WebKit::WebRect windowResizerRect();
- virtual WebKit::WebRect rootWindowRect();
- virtual WebKit::WebScreenInfo screenInfo();
+ virtual blink::WebRect windowRect();
+ virtual void setToolTipText(const blink::WebString& text,
+ blink::WebTextDirection hint);
+ virtual void setWindowRect(const blink::WebRect&);
+ virtual blink::WebRect windowResizerRect();
+ virtual blink::WebRect rootWindowRect();
+ virtual blink::WebScreenInfo screenInfo();
virtual float deviceScaleFactor();
virtual void resetInputMethod();
- virtual void didHandleGestureEvent(const WebKit::WebGestureEvent& event,
+ virtual void didHandleGestureEvent(const blink::WebGestureEvent& event,
bool event_cancelled);
// Called when a plugin is moved. These events are queued up and sent with
@@ -163,7 +163,7 @@
// Fills in a WebRenderingStatsImpl struct containing information about
// rendering, e.g. count of frames rendered, time spent painting.
- void GetRenderingStats(WebKit::WebRenderingStatsImpl&) const;
+ void GetRenderingStats(blink::WebRenderingStatsImpl&) const;
// Fills in a GpuRenderingStats struct containing information about
// GPU rendering, e.g. count of texture uploads performed, time spent
@@ -254,8 +254,8 @@
NO_RESIZE_ACK,
};
- RenderWidget(WebKit::WebPopupType popup_type,
- const WebKit::WebScreenInfo& screen_info,
+ RenderWidget(blink::WebPopupType popup_type,
+ const blink::WebScreenInfo& screen_info,
bool swapped_out,
bool hidden);
@@ -267,7 +267,7 @@
// Called by Init and subclasses to perform initialization.
bool DoInit(int32 opener_id,
- WebKit::WebWidget* web_widget,
+ blink::WebWidget* web_widget,
IPC::SyncMessage* create_widget_message);
// Finishes creation of a pending view started with Init.
@@ -296,7 +296,7 @@
void DoDeferredUpdateAndSendInputAck();
void DoDeferredUpdate();
void DoDeferredClose();
- void DoDeferredSetWindowRect(const WebKit::WebRect& pos);
+ void DoDeferredSetWindowRect(const blink::WebRect& pos);
virtual void Composite(base::TimeTicks frame_begin_time);
// Set the background of the render widget to a bitmap. The bitmap will be
@@ -320,7 +320,7 @@
virtual void OnShowHostContextMenu(ContextMenuParams* params);
// RenderWidget IPC message handlers
- void OnHandleInputEvent(const WebKit::WebInputEvent* event,
+ void OnHandleInputEvent(const blink::WebInputEvent* event,
const ui::LatencyInfo& latency_info,
bool keyboard_shortcut);
void OnCursorVisibilityChange(bool is_visible);
@@ -340,7 +340,7 @@
void OnSetInputMethodActive(bool is_active);
virtual void OnImeSetComposition(
const string16& text,
- const std::vector<WebKit::WebCompositionUnderline>& underlines,
+ const std::vector<blink::WebCompositionUnderline>& underlines,
int selection_start,
int selection_end);
virtual void OnImeConfirmComposition(const string16& text,
@@ -352,7 +352,7 @@
const gfx::Size& desired_size);
void OnRepaint(gfx::Size size_to_paint);
void OnSyntheticGestureCompleted();
- void OnSetTextDirection(WebKit::WebTextDirection direction);
+ void OnSetTextDirection(blink::WebTextDirection direction);
void OnGetFPS();
void OnUpdateScreenRects(const gfx::Rect& view_screen_rect,
const gfx::Rect& window_screen_rect);
@@ -466,7 +466,7 @@
virtual ui::TextInputType GetTextInputType();
virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end);
virtual ui::TextInputType WebKitToUiTextInputType(
- WebKit::WebTextInputType type);
+ blink::WebTextInputType type);
#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA)
// Checks if the composition range or composition character bounds have been
@@ -506,7 +506,7 @@
// been processed by the browser. So we maintain a pending window rect
// size. If JS code sets the WindowRect, and then immediately calls
// GetWindowRect() we'll use this pending window rect as the size.
- void SetPendingWindowRect(const WebKit::WebRect& r);
+ void SetPendingWindowRect(const blink::WebRect& r);
// Called by OnHandleInputEvent() to notify subclasses that a key event was
// just handled.
@@ -516,27 +516,27 @@
// about to be handled.
// Returns true if no further handling is needed. In that case, the event
// won't be sent to WebKit or trigger DidHandleMouseEvent().
- virtual bool WillHandleMouseEvent(const WebKit::WebMouseEvent& event);
+ virtual bool WillHandleMouseEvent(const blink::WebMouseEvent& event);
// Called by OnHandleInputEvent() to notify subclasses that a key event is
// about to be handled.
// Returns true if no further handling is needed. In that case, the event
// won't be sent to WebKit or trigger DidHandleKeyEvent().
- virtual bool WillHandleKeyEvent(const WebKit::WebKeyboardEvent& event);
+ virtual bool WillHandleKeyEvent(const blink::WebKeyboardEvent& event);
// Called by OnHandleInputEvent() to notify subclasses that a gesture event is
// about to be handled.
// Returns true if no further handling is needed. In that case, the event
// won't be sent to WebKit.
- virtual bool WillHandleGestureEvent(const WebKit::WebGestureEvent& event);
+ virtual bool WillHandleGestureEvent(const blink::WebGestureEvent& event);
// Called by OnHandleInputEvent() to notify subclasses that a mouse event was
// just handled.
- virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event) {}
+ virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) {}
// Called by OnHandleInputEvent() to notify subclasses that a touch event was
// just handled.
- virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) {}
+ virtual void DidHandleTouchEvent(const blink::WebTouchEvent& event) {}
// Check whether the WebWidget has any touch event handlers registered
// at the given point.
@@ -547,7 +547,7 @@
// Creates a 3D context associated with this view.
scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateGraphicsContext3D(
- const WebKit::WebGraphicsContext3D::Attributes& attributes);
+ const blink::WebGraphicsContext3D::Attributes& attributes);
bool OnSnapshotHelper(const gfx::Rect& src_subrect, SkBitmap* bitmap);
@@ -560,7 +560,7 @@
int32 surface_id_;
// We are responsible for destroying this object via its Close method.
- WebKit::WebWidget* webwidget_;
+ blink::WebWidget* webwidget_;
// This is lazily constructed and must not outlive webwidget_.
scoped_ptr<RenderWidgetCompositor> compositor_;
@@ -672,7 +672,7 @@
bool input_method_is_active_;
// Stores information about the current text input.
- WebKit::WebTextInputInfo text_input_info_;
+ blink::WebTextInputInfo text_input_info_;
// Stores the current text input type of |webwidget_|.
ui::TextInputType text_input_type_;
@@ -694,7 +694,7 @@
gfx::Range composition_range_;
// The kind of popup this widget represents, NONE if not a popup.
- WebKit::WebPopupType popup_type_;
+ blink::WebPopupType popup_type_;
// Holds all the needed plugin window moves for a scroll.
typedef std::vector<WebPluginGeometry> WebPluginGeometryVector;
@@ -706,7 +706,7 @@
// While we are waiting for the browser to update window sizes, we track the
// pending size temporarily.
int pending_window_rect_count_;
- WebKit::WebRect pending_window_rect_;
+ blink::WebRect pending_window_rect_;
// The screen rects of the view and the window that contains it.
gfx::Rect view_screen_rect_;
@@ -752,7 +752,7 @@
std::deque<ViewHostMsg_UpdateRect*> updates_pending_swap_;
// Properties of the screen hosting this RenderWidget instance.
- WebKit::WebScreenInfo screen_info_;
+ blink::WebScreenInfo screen_info_;
// The device scale factor. This value is computed from the DPI entries in
// |screen_info_| on some platforms, and defaults to 1 on other platforms.
