| Index: content/child/npapi/webplugin_delegate_impl.h
|
| diff --git a/content/child/npapi/webplugin_delegate_impl.h b/content/child/npapi/webplugin_delegate_impl.h
|
| index df705843199a4e6ce8e33e8f7b33065db0950f3d..91eddfa8a0ac20a993f6a93aa3936cebbaae7d2b 100644
|
| --- a/content/child/npapi/webplugin_delegate_impl.h
|
| +++ b/content/child/npapi/webplugin_delegate_impl.h
|
| @@ -145,7 +145,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
|
| void SetContentAreaHasFocus(bool has_focus);
|
|
|
| #if defined(OS_WIN)
|
| - // Informs the plug-in that an IME has changed its status.
|
| + // Informs the plugin that an IME has changed its status.
|
| void ImeCompositionUpdated(const base::string16& text,
|
| const std::vector<int>& clauses,
|
| const std::vector<int>& target,
|
| @@ -155,7 +155,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
|
| // IME was cancelled.
|
| void ImeCompositionCompleted(const base::string16& text);
|
|
|
| - // Returns the IME status retrieved from a plug-in.
|
| + // Returns the IME status retrieved from a plugin.
|
| bool GetIMEStatus(int* input_type, gfx::Rect* caret_rect);
|
| #endif
|
|
|
| @@ -304,7 +304,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
|
| uint32 last_message_;
|
| bool is_calling_wndproc;
|
|
|
| - // An IME emulator used by a windowless plug-in to retrieve IME data through
|
| + // An IME emulator used by a windowless plugin to retrieve IME data through
|
| // IMM32 functions.
|
| scoped_ptr<WebPluginIMEWin> plugin_ime_;
|
| #endif // defined(OS_WIN)
|
| @@ -386,13 +386,13 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
|
| // Informs the browser about the updated accelerated drawing surface.
|
| void UpdateAcceleratedSurface();
|
|
|
| - // Uses a CARenderer to draw the plug-in's layer in our OpenGL surface.
|
| + // Uses a CARenderer to draw the plugin's layer in our OpenGL surface.
|
| void DrawLayerInSurface();
|
|
|
| bool use_buffer_context_;
|
| CGContextRef buffer_context_; // Weak ref.
|
|
|
| - CALayer* layer_; // Used for CA drawing mode. Weak, retained by plug-in.
|
| + CALayer* layer_; // Used for CA drawing mode. Weak, retained by plugin.
|
| WebPluginAcceleratedSurface* surface_; // Weak ref.
|
| CARenderer* renderer_; // Renders layer_ to surface_.
|
| scoped_ptr<base::RepeatingTimer<WebPluginDelegateImpl> > redraw_timer_;
|
|
|