diff options
author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 06:50:46 +0000 |
---|---|---|
committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 06:50:46 +0000 |
commit | 180ef24f1fd1b1ff309fc35f250336890f702f28 (patch) | |
tree | de5918896ed9780e5cf6098be329060a58f3702e /content/renderer/pepper/pepper_plugin_instance_impl.h | |
parent | 8d7dd7ade794c71be49c7a954c4d4b4ca1ab6c01 (diff) | |
download | chromium_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/renderer/pepper/pepper_plugin_instance_impl.h')
-rw-r--r-- | content/renderer/pepper/pepper_plugin_instance_impl.h | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 7fd13bc..cd41917 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h @@ -63,7 +63,7 @@ struct _NPP; class SkBitmap; class TransportDIB; -namespace WebKit { +namespace blink { class WebInputEvent; class WebLayer; class WebMouseEvent; @@ -125,13 +125,13 @@ class CONTENT_EXPORT PepperPluginInstanceImpl static PepperPluginInstanceImpl* Create( RenderViewImpl* render_view, PluginModule* module, - WebKit::WebPluginContainer* container, + blink::WebPluginContainer* container, const GURL& plugin_url); RenderViewImpl* render_view() const { return render_view_; } PluginModule* module() const { return module_.get(); } MessageChannel& message_channel() { return *message_channel_; } - WebKit::WebPluginContainer* container() const { return container_; } + blink::WebPluginContainer* container() const { return container_; } // Returns the PP_Instance uniquely identifying this instance. Guaranteed // nonzero. @@ -148,7 +148,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl void Delete(); // Paints the current backing store to the web page. - void Paint(WebKit::WebCanvas* canvas, + void Paint(blink::WebCanvas* canvas, const gfx::Rect& plugin_rect, const gfx::Rect& paint_rect); @@ -178,9 +178,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool Initialize(const std::vector<std::string>& arg_names, const std::vector<std::string>& arg_values, bool full_frame); - bool HandleDocumentLoad(const WebKit::WebURLResponse& response); - bool HandleInputEvent(const WebKit::WebInputEvent& event, - WebKit::WebCursorInfo* cursor_info); + bool HandleDocumentLoad(const blink::WebURLResponse& response); + bool HandleInputEvent(const blink::WebInputEvent& event, + blink::WebCursorInfo* cursor_info); PP_Var GetInstanceObject(); void ViewChanged(const gfx::Rect& position, const gfx::Rect& clip, const std::vector<gfx::Rect>& cut_outs_rects); @@ -189,7 +189,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool HandleCompositionStart(const base::string16& text); bool HandleCompositionUpdate( const base::string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end); bool HandleCompositionEnd(const base::string16& text); @@ -241,12 +241,12 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool SupportsPrintInterface(); bool IsPrintScalingDisabled(); - int PrintBegin(const WebKit::WebPrintParams& print_params); - bool PrintPage(int page_number, WebKit::WebCanvas* canvas); + int PrintBegin(const blink::WebPrintParams& print_params); + bool PrintPage(int page_number, blink::WebCanvas* canvas); void PrintEnd(); bool CanRotateView(); - void RotateView(WebKit::WebPlugin::RotationType type); + void RotateView(blink::WebPlugin::RotationType type); // There are 2 implementations of the fullscreen interface // PPB_FlashFullscreen is used by Pepper Flash. @@ -310,14 +310,14 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Returns the user gesture token to use for creating a WebScopedUserGesture, // if IsProcessingUserGesture returned true. - WebKit::WebUserGestureToken CurrentUserGestureToken(); + blink::WebUserGestureToken CurrentUserGestureToken(); // A mouse lock request was pending and this reports success or failure. void OnLockMouseACK(bool succeeded); // A mouse lock was in place, but has been lost. void OnMouseLockLost(); // A mouse lock is enabled and mouse events are being delivered. - void HandleMouseLockedInputEvent(const WebKit::WebMouseEvent& event); + void HandleMouseLockedInputEvent(const blink::WebMouseEvent& event); // Simulates an input event to the plugin by passing it down to WebKit, // which sends it back up to the plugin as if it came from the user. @@ -333,10 +333,10 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // case is non-NULL as long as the corresponding loader resource is alive. // This pointer is non-owning, so the loader must use set_document_loader to // clear itself when it is destroyed. - WebKit::WebURLLoaderClient* document_loader() const { + blink::WebURLLoaderClient* document_loader() const { return document_loader_; } - void set_document_loader(WebKit::WebURLLoaderClient* loader) { + void set_document_loader(blink::WebURLLoaderClient* loader) { document_loader_ = loader; } @@ -344,7 +344,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // PluginInstance implementation virtual RenderView* GetRenderView() OVERRIDE; - virtual WebKit::WebPluginContainer* GetContainer() OVERRIDE; + virtual blink::WebPluginContainer* GetContainer() OVERRIDE; virtual v8::Isolate* GetIsolate() const OVERRIDE; virtual ppapi::VarTracker* GetVarTracker() OVERRIDE; virtual const GURL& GetPluginURL() OVERRIDE; @@ -510,27 +510,27 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Class to record document load notifications and play them back once the // real document loader becomes available. Used only by external instances. - class ExternalDocumentLoader : public WebKit::WebURLLoaderClient { + class ExternalDocumentLoader : public blink::WebURLLoaderClient { public: ExternalDocumentLoader(); virtual ~ExternalDocumentLoader(); void ReplayReceivedData(WebURLLoaderClient* document_loader); - // WebKit::WebURLLoaderClient implementation. - virtual void didReceiveData(WebKit::WebURLLoader* loader, + // blink::WebURLLoaderClient implementation. + virtual void didReceiveData(blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length); - virtual void didFinishLoading(WebKit::WebURLLoader* loader, + virtual void didFinishLoading(blink::WebURLLoader* loader, double finish_time); - virtual void didFail(WebKit::WebURLLoader* loader, - const WebKit::WebURLError& error); + virtual void didFail(blink::WebURLLoader* loader, + const blink::WebURLError& error); private: std::list<std::string> data_; bool finished_loading_; - scoped_ptr<WebKit::WebURLError> error_; + scoped_ptr<blink::WebURLError> error_; }; // Implements PPB_Gamepad_API. This is just to avoid having an excessive @@ -554,7 +554,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl PepperPluginInstanceImpl(RenderViewImpl* render_view, PluginModule* module, ppapi::PPP_Instance_Combined* instance_interface, - WebKit::WebPluginContainer* container, + blink::WebPluginContainer* container, const GURL& plugin_url); bool LoadFindInterface(); @@ -590,7 +590,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // best format to use. Returns false if the plugin does not support any // print format that we can handle (we can handle only PDF). bool GetPreferredPrintOutputFormat(PP_PrintOutputFormat_Dev* format); - bool PrintPDFOutput(PP_Resource print_output, WebKit::WebCanvas* canvas); + bool PrintPDFOutput(PP_Resource print_output, blink::WebCanvas* canvas); // Updates the layer for compositing. This creates a layer and attaches to the // container if: @@ -604,9 +604,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Internal helper function for PrintPage(). bool PrintPageHelper(PP_PrintPageNumberRange_Dev* page_ranges, int num_ranges, - WebKit::WebCanvas* canvas); + blink::WebCanvas* canvas); - void DoSetCursor(WebKit::WebCursorInfo* cursor); + void DoSetCursor(blink::WebCursorInfo* cursor); // Internal helper functions for HandleCompositionXXX(). bool SendCompositionEventToPlugin( @@ -615,7 +615,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool SendCompositionEventWithUnderlineInformationToPlugin( PP_InputEvent_Type type, const base::string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end); @@ -643,7 +643,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl void UnSetAndDeleteLockTargetAdapter(); void DidDataFromWebURLResponse( - const WebKit::WebURLResponse& response, + const blink::WebURLResponse& response, int pending_host_id, const ppapi::URLResponseInfoData& data); @@ -659,9 +659,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl PP_Instance pp_instance_; // NULL until we have been initialized. - WebKit::WebPluginContainer* container_; + blink::WebPluginContainer* container_; scoped_refptr<cc::TextureLayer> texture_layer_; - scoped_ptr<WebKit::WebLayer> web_layer_; + scoped_ptr<blink::WebLayer> web_layer_; bool layer_bound_to_fullscreen_; bool layer_is_hardware_; @@ -737,7 +737,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // to generate the entire PDF given the variables below: // // The most recently used WebCanvas, guaranteed to be valid. - skia::RefPtr<WebKit::WebCanvas> canvas_; + skia::RefPtr<blink::WebCanvas> canvas_; // An array of page ranges. std::vector<PP_PrintPageNumberRange_Dev> ranges_; @@ -750,7 +750,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl const PPP_Graphics3D* plugin_graphics_3d_interface_; // Contains the cursor if it's set by the plugin. - scoped_ptr<WebKit::WebCursorInfo> cursor_; + scoped_ptr<blink::WebCursorInfo> cursor_; // Set to true if this plugin thinks it will always be on top. This allows us // to use a more optimized painting path in some cases. @@ -783,10 +783,10 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // WebKit does not resize the plugin when going into fullscreen mode, so we do // this here by modifying the various plugin attributes and then restoring // them on exit. - WebKit::WebString width_before_fullscreen_; - WebKit::WebString height_before_fullscreen_; - WebKit::WebString border_before_fullscreen_; - WebKit::WebString style_before_fullscreen_; + blink::WebString width_before_fullscreen_; + blink::WebString height_before_fullscreen_; + blink::WebString border_before_fullscreen_; + blink::WebString style_before_fullscreen_; gfx::Size screen_size_for_fullscreen_; // The MessageChannel used to implement bidirectional postMessage for the @@ -820,7 +820,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Track pending user gestures so out-of-process plugins can respond to // a user gesture after it has been processed. PP_TimeTicks pending_user_gesture_; - WebKit::WebUserGestureToken pending_user_gesture_token_; + blink::WebUserGestureToken pending_user_gesture_token_; // We store the arguments so we can re-send them if we are reset to talk to // NaCl via the IPC NaCl proxy. @@ -828,9 +828,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl std::vector<std::string> argv_; // Non-owning pointer to the document loader, if any. - WebKit::WebURLLoaderClient* document_loader_; + blink::WebURLLoaderClient* document_loader_; // State for deferring document loads. Used only by external instances. - WebKit::WebURLResponse external_document_response_; + blink::WebURLResponse external_document_response_; scoped_ptr<ExternalDocumentLoader> external_document_loader_; bool external_document_load_; |