| Index: content/renderer/render_widget.h
|
| ===================================================================
|
| --- content/renderer/render_widget.h (revision 163007)
|
| +++ content/renderer/render_widget.h (working copy)
|
| @@ -7,7 +7,6 @@
|
|
|
| #include <deque>
|
| #include <map>
|
| -#include <vector>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| @@ -30,7 +29,6 @@
|
| #include "ui/base/range/range.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/rect.h"
|
| -#include "ui/gfx/size.h"
|
| #include "ui/surface/transport_dib.h"
|
| #include "webkit/glue/webcursor.h"
|
|
|
| @@ -44,18 +42,8 @@
|
| namespace WebKit {
|
| class WebMouseEvent;
|
| class WebTouchEvent;
|
| -class WebWidget;
|
| }
|
|
|
| -namespace content {
|
| -struct GpuRenderingStats;
|
| -class RenderWidgetTest;
|
| -}
|
| -
|
| -namespace gfx {
|
| -class Point;
|
| -}
|
| -
|
| namespace skia {
|
| class PlatformCanvas;
|
| }
|
| @@ -74,6 +62,10 @@
|
| } // namespace ppapi
|
| } // namespace webkit
|
|
|
| +namespace content {
|
| +struct GpuRenderingStats;
|
| +class RenderWidgetTest;
|
| +
|
| // RenderWidget provides a communication bridge between a WebWidget and
|
| // a RenderWidgetHost, the latter of which lives in a different process.
|
| class CONTENT_EXPORT RenderWidget
|
| @@ -166,7 +158,7 @@
|
| // GPU rendering, e.g. count of texture uploads performed, time spent
|
| // uploading.
|
| // This call is relatively expensive as it blocks on the GPU process
|
| - bool GetGpuRenderingStats(content::GpuRenderingStats*) const;
|
| + bool GetGpuRenderingStats(GpuRenderingStats*) const;
|
|
|
| // Callback for use with BeginSmoothScroll.
|
| typedef base::Callback<void()> SmoothScrollCompletionCallback;
|
| @@ -197,7 +189,7 @@
|
| // without ref-counting is an error.
|
| friend class base::RefCounted<RenderWidget>;
|
| // For unit tests.
|
| - friend class content::RenderWidgetTest;
|
| + friend class RenderWidgetTest;
|
|
|
| enum ResizeAck {
|
| SEND_RESIZE_ACK,
|
| @@ -373,7 +365,6 @@
|
| const ui::Range& range,
|
| const std::vector<gfx::Rect>& character_bounds);
|
|
|
| -
|
| // Override point to obtain that the current input method state and caret
|
| // position.
|
| virtual ui::TextInputType GetTextInputType();
|
| @@ -618,4 +609,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidget);
|
| };
|
|
|
| +} // namespace content
|
| +
|
| #endif // CONTENT_RENDERER_RENDER_WIDGET_H_
|
|
|