| Index: ui/aura/root_window_host_linux.h
|
| diff --git a/ui/aura/root_window_host_linux.h b/ui/aura/root_window_host_linux.h
|
| index 808475f2dacec900257c0e2fe5334648e41531c3..529bdaa13d5791f61e7499782d5b0efe4b29018c 100644
|
| --- a/ui/aura/root_window_host_linux.h
|
| +++ b/ui/aura/root_window_host_linux.h
|
| @@ -36,14 +36,6 @@ class RootWindowHostLinux : public RootWindowHost,
|
| // Overridden from Dispatcher overrides:
|
| virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
|
|
|
| - private:
|
| - bool DispatchEventForRootWindow(const base::NativeEvent& event);
|
| -
|
| - // Dispatches XI2 events. Note that some events targetted for the X root
|
| - // window are dispatched to the aura root window (e.g. touch events after
|
| - // calibration).
|
| - void DispatchXI2Event(const base::NativeEvent& event);
|
| -
|
| // RootWindowHost Overrides.
|
| virtual void SetDelegate(RootWindowHostDelegate* delegate) OVERRIDE;
|
| virtual RootWindow* GetRootWindow() OVERRIDE;
|
| @@ -62,6 +54,9 @@ class RootWindowHostLinux : public RootWindowHost,
|
| virtual void UnConfineCursor() OVERRIDE;
|
| virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
|
| virtual void SetFocusWhenShown(bool focus_when_shown) OVERRIDE;
|
| + virtual bool CopyAreaToSkCanvas(const gfx::Rect& source_bounds,
|
| + const gfx::Point& dest_offset,
|
| + SkCanvas* canvas);
|
| virtual bool GrabSnapshot(
|
| const gfx::Rect& snapshot_bounds,
|
| std::vector<unsigned char>* png_representation) OVERRIDE;
|
| @@ -69,6 +64,14 @@ class RootWindowHostLinux : public RootWindowHost,
|
| virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
|
| virtual void PrepareForShutdown() OVERRIDE;
|
|
|
| + private:
|
| + bool DispatchEventForRootWindow(const base::NativeEvent& event);
|
| +
|
| + // Dispatches XI2 events. Note that some events targetted for the X root
|
| + // window are dispatched to the aura root window (e.g. touch events after
|
| + // calibration).
|
| + void DispatchXI2Event(const base::NativeEvent& event);
|
| +
|
| // Returns true if there's an X window manager present... in most cases. Some
|
| // window managers (notably, ion3) don't implement enough of ICCCM for us to
|
| // detect that they're there.
|
| @@ -82,6 +85,10 @@ class RootWindowHostLinux : public RootWindowHost,
|
| // dispatches the event to RootWindowHostDelegate.
|
| void TranslateAndDispatchMouseEvent(ui::MouseEvent* event);
|
|
|
| + // Copies and returns |snapshot_bounds| from |xwindow_|. Helper method for
|
| + // CopyAreaToSkCanvas() and GrabSnapshot().
|
| + scoped_ptr<ui::XScopedImage> GetXImage(const gfx::Rect& snapshot_bounds);
|
| +
|
| RootWindowHostDelegate* delegate_;
|
|
|
| // The display and the native X window hosting the root window.
|
|
|