~chromium-team/chromium-browser/artful-beta : revision 1144

32

UMALinuxWindowManager GetLinuxWindowManager() {

33

switch (ui::GuessWindowManager()) {

34

case ui::WM_UNKNOWN:

35

@@ -243,7 +243,7 @@ void ChromeBrowserMainExtraPartsMetrics:

35

@@ -244,7 +244,7 @@ void ChromeBrowserMainExtraPartsMetrics:

36

37

void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {

38

RecordLinuxGlibcVersion();

168

+#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_OZONE_H_

169

--- a/chrome/chrome_browser_ui.gypi

170

+++ b/chrome/chrome_browser_ui.gypi

171

@@ -2513,6 +2513,8 @@

171

@@ -1319,6 +1319,8 @@

172

'browser/ui/views/first_run_dialog.cc',

173

'browser/ui/views/first_run_dialog.h',

174

'browser/ui/views/frame/browser_desktop_window_tree_host.h',

176

+ 'browser/ui/views/frame/browser_desktop_root_window_host_ozone.h',

177

'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',

178

'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',

179

'browser/ui/views/frame/native_browser_frame_factory_auralinux.cc',

179

'browser/ui/views/frame/desktop_browser_frame_auralinux.cc',

180

--- a/content/browser/browser_main_loop.cc

181

+++ b/content/browser/browser_main_loop.cc

182

@@ -128,6 +128,10 @@

182

@@ -135,6 +135,10 @@

183

#include "ui/gfx/x/x11_types.h"

184

#endif

185

190

// One of the linux specific headers defines this as a macro.

191

#ifdef DestroyAll

192

#undef DestroyAll

193

@@ -924,6 +928,11 @@ void BrowserMainLoop::ShutdownThreadsAnd

193

@@ -980,6 +984,11 @@ void BrowserMainLoop::ShutdownThreadsAnd

194

TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GPUChannelFactory");

195

if (BrowserGpuChannelHostFactory::instance())

196

BrowserGpuChannelHostFactory::Terminate();

202

}

203

204

// Must happen after the I/O thread is shutdown since this class lives on the

205

@@ -1104,6 +1113,13 @@ int BrowserMainLoop::BrowserThreadsStart

205

@@ -1165,6 +1174,13 @@ int BrowserMainLoop::BrowserThreadsStart

206

}

207

#endif // defined(OS_MACOSX)

208

218

return result_code_;

219

--- a/content/content_common.gypi

220

+++ b/content/content_common.gypi

221

@@ -829,6 +829,25 @@

221

@@ -944,6 +944,25 @@

222

},

223

]

224

}],

247

--- a/content/gpu/gpu_main.cc

248

+++ b/content/gpu/gpu_main.cc

249

@@ -63,6 +63,10 @@

250

#include <sanitizer/asan_interface.h>

250

#include <sanitizer/common_interface_defs.h>

251

#endif

252

253

+#if defined(USE_OZONE)

257

const int kGpuTimeout = 10000;

258

259

namespace content {

260

@@ -372,6 +376,11 @@ int GpuMain(const MainFunctionParams& pa

260

@@ -362,6 +366,11 @@ int GpuMain(const MainFunctionParams& pa

261

262

{

263

TRACE_EVENT0("gpu", "Run Message Loop");

596

+ EventConverterInProcess();

597

+ virtual ~EventConverterInProcess();

598

+

599

+ virtual void MotionNotify(float x, float y) OVERRIDE;

599

+ virtual void MotionNotify(float x, float y) override;

600

+ virtual void ButtonNotify(unsigned handle,

601

+ ui::EventType type,

602

+ ui::EventFlags flags,

603

+ float x,

604

+ float y) OVERRIDE;

604

+ float y) override;

605

+ virtual void AxisNotify(float x,

606

+ float y,

607

+ int xoffset,

608

+ int yoffset) OVERRIDE;

609

+ virtual void PointerEnter(unsigned handle, float x, float y) OVERRIDE;

610

+ virtual void PointerLeave(unsigned handle, float x, float y) OVERRIDE;

608

+ int yoffset) override;

609

+ virtual void PointerEnter(unsigned handle, float x, float y) override;

610

+ virtual void PointerLeave(unsigned handle, float x, float y) override;

611

+ virtual void KeyNotify(ui::EventType type,

612

+ unsigned code,

613

+ unsigned modifiers) OVERRIDE;

613

+ unsigned modifiers) override;

614

+ virtual void TouchNotify(ui::EventType type,

615

+ float x,

616

+ float y,

617

+ int32_t touch_id,

618

+ uint32_t time_stamp) OVERRIDE;

619

+ virtual void CloseWidget(unsigned handle) OVERRIDE;

618

+ uint32_t time_stamp) override;

619

+ virtual void CloseWidget(unsigned handle) override;

620

+

621

+ virtual void OutputSizeChanged(unsigned width, unsigned height) OVERRIDE;

621

+ virtual void OutputSizeChanged(unsigned width, unsigned height) override;

622

+ virtual void WindowResized(unsigned windowhandle,

623

+ unsigned width,

624

+ unsigned height) OVERRIDE;

624

+ unsigned height) override;

625

+

626

+ virtual void Commit(unsigned handle, const std::string& text) OVERRIDE;

626

+ virtual void Commit(unsigned handle, const std::string& text) override;

627

+ virtual void PreeditChanged(unsigned handle, const std::string& text,

628

+ const std::string& commit) OVERRIDE;

629

+ virtual void PreeditEnd() OVERRIDE;

630

+ virtual void PreeditStart() OVERRIDE;

628

+ const std::string& commit) override;

629

+ virtual void PreeditEnd() override;

630

+ virtual void PreeditStart() override;

631

+

632

+ virtual void SetWindowChangeObserver(

633

+ ui::WindowChangeObserver* observer) OVERRIDE;

633

+ ui::WindowChangeObserver* observer) override;

634

+ virtual void SetOutputChangeObserver(

635

+ ui::OutputChangeObserver* observer) OVERRIDE;

635

+ ui::OutputChangeObserver* observer) override;

636

+

637

+ private:

638

+ static void NotifyMotion(EventConverterInProcess* data,

1006

+ virtual ~OzoneChannel();

1007

+

1008

+ // IPC::Listener implementation.

1009

+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;

1009

+ virtual bool OnMessageReceived(const IPC::Message& message) override;

1010

+

1011

+ void Register();

1012

+ void OnWidgetStateChanged(unsigned handleid,

1290

+

1291

+ // Implement |BrowserChildProcessObserver|.

1292

+ virtual void BrowserChildProcessHostConnected(

1293

+ const ChildProcessData& data) OVERRIDE;

1293

+ const ChildProcessData& data) override;

1294

+ virtual void BrowserChildProcessHostDisconnected(

1295

+ const ChildProcessData& data) OVERRIDE;

1295

+ const ChildProcessData& data) override;

1296

+ virtual void BrowserChildProcessCrashed(

1297

+ const ChildProcessData& data) OVERRIDE;

1297

+ const ChildProcessData& data) override;

1298

+

1299

+ private:

1300

+ void OnMessageReceived(const IPC::Message& message);

1639

+ RemoteEventDispatcher();

1640

+ virtual ~RemoteEventDispatcher();

1641

+

1642

+ virtual void MotionNotify(float x, float y) OVERRIDE;

1642

+ virtual void MotionNotify(float x, float y) override;

1643

+ virtual void ButtonNotify(unsigned handle,

1644

+ ui::EventType type,

1645

+ ui::EventFlags flags,

1646

+ float x,

1647

+ float y) OVERRIDE;

1647

+ float y) override;

1648

+ virtual void AxisNotify(float x,

1649

+ float y,

1650

+ int xoffset,

1651

+ int yoffset) OVERRIDE;

1652

+ virtual void PointerEnter(unsigned handle, float x, float y) OVERRIDE;

1653

+ virtual void PointerLeave(unsigned handle, float x, float y) OVERRIDE;

1651

+ int yoffset) override;

1652

+ virtual void PointerEnter(unsigned handle, float x, float y) override;

1653

+ virtual void PointerLeave(unsigned handle, float x, float y) override;

1654

+ virtual void KeyNotify(ui::EventType type,

1655

+ unsigned code,

1656

+ unsigned modifiers) OVERRIDE;

1656

+ unsigned modifiers) override;

1657

+ virtual void TouchNotify(ui::EventType type,

1658

+ float x,

1659

+ float y,

1660

+ int32_t touch_id,

1661

+ uint32_t time_stamp) OVERRIDE;

1661

+ uint32_t time_stamp) override;

1662

+

1663

+ virtual void OutputSizeChanged(unsigned width, unsigned height) OVERRIDE;

1663

+ virtual void OutputSizeChanged(unsigned width, unsigned height) override;

1664

+ virtual void WindowResized(unsigned handle,

1665

+ unsigned width,

1666

+ unsigned height) OVERRIDE;

1667

+ virtual void CloseWidget(unsigned handle) OVERRIDE;

1666

+ unsigned height) override;

1667

+ virtual void CloseWidget(unsigned handle) override;

1668

+

1669

+ virtual void Commit(unsigned handle, const std::string& text) OVERRIDE;

1669

+ virtual void Commit(unsigned handle, const std::string& text) override;

1670

+ virtual void PreeditChanged(unsigned handle,

1671

+ const std::string& text,

1672

+ const std::string& commit) OVERRIDE;

1673

+ virtual void PreeditEnd() OVERRIDE;

1674

+ virtual void PreeditStart() OVERRIDE;

1672

+ const std::string& commit) override;

1673

+ virtual void PreeditEnd() override;

1674

+ virtual void PreeditStart() override;

1675

+

1676

+ private:

1677

+ static void SendMotionNotify(float x, float y);

1900

+ virtual void SetWidgetState(unsigned widget,

1901

+ ui::WidgetState state,

1902

+ unsigned width = 0,

1903

+ unsigned height = 0) OVERRIDE;

1903

+ unsigned height = 0) override;

1904

+ virtual void SetWidgetTitle(unsigned w,

1905

+ const base::string16& title) OVERRIDE;

1906

+ virtual void SetWidgetCursor(int cursor_type) OVERRIDE;

1905

+ const base::string16& title) override;

1906

+ virtual void SetWidgetCursor(int cursor_type) override;

1907

+ virtual void SetWidgetAttributes(unsigned widget,

1908

+ unsigned parent,

1909

+ unsigned x,

1910

+ unsigned y,

1911

+ ui::WidgetType type) OVERRIDE;

1912

+ virtual void ResetIme() OVERRIDE;

1913

+ virtual void ImeCaretBoundsChanged(gfx::Rect rect) OVERRIDE;

1914

+ virtual void ShowInputPanel() OVERRIDE;

1915

+ virtual void HideInputPanel() OVERRIDE;

1911

+ ui::WidgetType type) override;

1912

+ virtual void ResetIme() override;

1913

+ virtual void ImeCaretBoundsChanged(gfx::Rect rect) override;

1914

+ virtual void ShowInputPanel() override;

1915

+ virtual void HideInputPanel() override;

1916

+

1917

+ private:

1918

+ bool Send(IPC::Message* message);

2350

+ virtual ~Display();

2351

+

2352

+ // gfx::OzoneDisplay

2353

+ //virtual HardwareState InitializeHardware() OVERRIDE;

2354

+ //virtual void ShutdownHardware() OVERRIDE;

2355

+ virtual intptr_t GetNativeDisplay() OVERRIDE;

2353

+ //virtual HardwareState InitializeHardware() override;

2354

+ //virtual void ShutdownHardware() override;

2355

+ virtual intptr_t GetNativeDisplay() override;

2356

+

2357

+ //virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;

2358

+ scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(gfx::AcceleratedWidget w) OVERRIDE;

2359

+ virtual void LookAheadOutputGeometry() OVERRIDE;

2357

+ //virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;

2358

+ scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(gfx::AcceleratedWidget w) override;

2359

+ virtual void LookAheadOutputGeometry() override;

2360

+

2361

+ // ui::WindowStateChangeHandler

2362

+ virtual void SetWidgetState(unsigned widget, ui::WidgetState state, unsigned width = 0, unsigned height = 0) OVERRIDE;

2362

+ virtual void SetWidgetState(unsigned widget, ui::WidgetState state, unsigned width = 0, unsigned height = 0) override;

2363

+ virtual void SetWidgetTitle(unsigned w,

2364

+ const base::string16& title) OVERRIDE;

2365

+ virtual void SetWidgetCursor(int cursor_type) OVERRIDE;

2364

+ const base::string16& title) override;

2365

+ virtual void SetWidgetCursor(int cursor_type) override;

2366

+ virtual void SetWidgetAttributes(unsigned widget,

2367

+ unsigned parent,

2368

+ unsigned x,

2369

+ unsigned y,

2370

+ ui::WidgetType type) OVERRIDE;

2370

+ ui::WidgetType type) override;

2371

+

2372

+ virtual bool LoadEGLGLES2Bindings(

2373

+ ui::SurfaceFactoryOzone::AddGLLibraryCallback add_gl_library,

2374

+ ui::SurfaceFactoryOzone::SetGLGetProcAddressProcCallback

2375

+ proc_address) OVERRIDE;

2375

+ proc_address) override;

2376

+ virtual const int32* GetEGLSurfaceProperties(

2377

+ const int32* desired_list) OVERRIDE;

2377

+ const int32* desired_list) override;

2378

+

2379

+private:

2380

+ void Terminate();

3109

+#ifndef OZONE_MIR_WINDOW_H_

3110

+#define OZONE_MIR_WINDOW_H_

3111

+

3112

+#include "ui/gfx/rect.h"

3112

+#include "ui/gfx/geometry/rect.h"

3113

+#include "base/strings/string16.h"

3114

+#include "ui/ozone/public/surface_ozone_egl.h" // TODO: Forward decl?

3115

+

3312

+

3313

+ virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(

3314

+ PlatformWindowDelegate* delegate,

3315

+ const gfx::Rect& bounds) OVERRIDE {

3315

+ const gfx::Rect& bounds) override {

3316

+ // FIXME(chad): implement

3317

+ }

3318

+

3319

+ virtual inline ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE {

3319

+ virtual inline ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {

3320

+ return &hardware_display_;

3321

+ }

3322

+

3323

+ virtual inline ui::CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {

3323

+ virtual inline ui::CursorFactoryOzone* GetCursorFactoryOzone() override {

3324

+ return NULL; // FIXME(chad) def? &cursor_factory_ozone_;

3325

+ }

3326

+

3327

+#if 0

3328

+ virtual inline ui::InputMethodContextFactoryOzone* GetInputMethodContextFactoryOzone() OVERRIDE {

3328

+ virtual inline ui::InputMethodContextFactoryOzone* GetInputMethodContextFactoryOzone() override {

3329

+ return &input_method_context_factory_ozone_;

3330

+ }

3331

+#endif

3332

+

3333

+ virtual void InitializeGPU() OVERRIDE {}

3333

+ virtual void InitializeGPU() override {}

3334

+

3335

+ virtual void InitializeUI() OVERRIDE {}

3335

+ virtual void InitializeUI() override {}

3336

+

3337

+ virtual ui::GpuPlatformSupport* GetGpuPlatformSupport() { return NULL; }

3338

+

3394

+ }

3395

+

3396

+ // OzonePlatform:

3397

+ virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE {

3397

+ virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {

3398

+ return wayland_display_.get();

3399

+ }

3400

+ virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {

3400

+ virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() override {

3401

+ return cursor_factory_ozone_.get();

3402

+ }

3403

+

3404

+ virtual void InitializeUI() OVERRIDE {

3404

+ virtual void InitializeUI() override {

3405

+ input_method_factory_.reset(

3406

+ new ui::InputMethodContextFactoryWayland());

3407

+ event_factory_ozone_.reset(

3410

+ wayland_proxy_display_ = new ozonewayland::WaylandProxyDisplay();

3411

+ }

3412

+

3413

+ virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE {

3413

+ virtual GpuPlatformSupport* GetGpuPlatformSupport() override {

3414

+ return NULL;

3415

+ //return gpu_platform_support_.get();

3416

+ }

3417

+ virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE {

3417

+ virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {

3418

+ return NULL;

3419

+ //return gpu_platform_support_host_.get();

3420

+ }

3421

+

3422

+ virtual void InitializeGPU() OVERRIDE {

3422

+ virtual void InitializeGPU() override {

3423

+ // We don't need proxy display in case of Single process.

3424

+ // TODO(kalyan): Find a better way to handle this.

3425

+ if (wayland_proxy_display_) {

3434

+

3435

+ virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(

3436

+ PlatformWindowDelegate* delegate,

3437

+ const gfx::Rect& bounds) OVERRIDE {

3437

+ const gfx::Rect& bounds) override {

3438

+ // FIXME(chad): implement

3439

+ }

3440

+ //

3675

+ CursorFactoryOzoneWayland();

3676

+ virtual ~CursorFactoryOzoneWayland();

3677

+

3678

+ virtual PlatformCursor GetDefaultCursor(int type) OVERRIDE;

3678

+ virtual PlatformCursor GetDefaultCursor(int type) override;

3679

+ virtual PlatformCursor CreateImageCursor(const SkBitmap& bitmap,

3680

+ const gfx::Point& hotspot) OVERRIDE;

3681

+ virtual void RefImageCursor(PlatformCursor cursor) OVERRIDE;

3682

+ virtual void UnrefImageCursor(PlatformCursor cursor) OVERRIDE;

3680

+ const gfx::Point& hotspot) override;

3681

+ virtual void RefImageCursor(PlatformCursor cursor) override;

3682

+ virtual void UnrefImageCursor(PlatformCursor cursor) override;

3683

+ //virtual void SetCursor(gfx::AcceleratedWidget widget,

3684

+ //PlatformCursor cursor) OVERRIDE;

3684

+ //PlatformCursor cursor) override;

3685

+};

3686

+

3687

+} // namespace ui

3792

+ aura::Window* source_window,

3793

+ const gfx::Point& root_location,

3794

+ int operation,

3795

+ ui::DragDropTypes::DragEventSource source) OVERRIDE;

3795

+ ui::DragDropTypes::DragEventSource source) override;

3796

+ virtual void DragUpdate(aura::Window* target,

3797

+ const ui::LocatedEvent& event) OVERRIDE;

3797

+ const ui::LocatedEvent& event) override;

3798

+ virtual void Drop(aura::Window* target,

3799

+ const ui::LocatedEvent& event) OVERRIDE;

3800

+ virtual void DragCancel() OVERRIDE;

3801

+ virtual bool IsDragDropInProgress() OVERRIDE;

3799

+ const ui::LocatedEvent& event) override;

3800

+ virtual void DragCancel() override;

3801

+ virtual bool IsDragDropInProgress() override;

3802

+

3803

+ private:

3804

+ DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientWayland);

3886

+ // views::DesktopFactoryOzone

3887

+ virtual DesktopWindowTreeHost* CreateWindowTreeHost(

3888

+ internal::NativeWidgetDelegate* native_widget_delegate,

3889

+ DesktopNativeWidgetAura* desktop_native_widget_aura) OVERRIDE;

3890

+

3891

+ virtual gfx::Screen* CreateDesktopScreen() OVERRIDE;

3892

+

3893

+ //virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE;

3889

+ DesktopNativeWidgetAura* desktop_native_widget_aura) override;

3890

+

3891

+ virtual gfx::Screen* CreateDesktopScreen() override;

3892

+

3893

+ //virtual bool IsTranslucentWindowOpacitySupported() const override;

3894

+

3895

+ private:

3896

+ DesktopScreenWayland* desktop_screen_;

4082

+ virtual ~DesktopScreenWayland();

4083

+

4084

+ // OutputChangeObserver overrides.

4085

+ virtual void OnOutputSizeChanged(unsigned width, unsigned height) OVERRIDE;

4085

+ virtual void OnOutputSizeChanged(unsigned width, unsigned height) override;

4086

+

4087

+ private:

4088

+ void SetGeometry(const gfx::Rect& geometry);

4089

+ // Overridden from gfx::Screen:

4090

+ virtual bool IsDIPEnabled() OVERRIDE;

4091

+ virtual gfx::Point GetCursorScreenPoint() OVERRIDE;

4092

+ virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE;

4090

+ virtual bool IsDIPEnabled() override;

4091

+ virtual gfx::Point GetCursorScreenPoint() override;

4092

+ virtual gfx::NativeWindow GetWindowUnderCursor() override;

4093

+ virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)

4094

+ OVERRIDE;

4095

+ virtual int GetNumDisplays() const OVERRIDE;

4096

+ virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE;

4094

+ override;

4095

+ virtual int GetNumDisplays() const override;

4096

+ virtual std::vector<gfx::Display> GetAllDisplays() const override;

4097

+ virtual gfx::Display GetDisplayNearestWindow(

4098

+ gfx::NativeView window) const OVERRIDE;

4098

+ gfx::NativeView window) const override;

4099

+ virtual gfx::Display GetDisplayNearestPoint(

4100

+ const gfx::Point& point) const OVERRIDE;

4100

+ const gfx::Point& point) const override;

4101

+ virtual gfx::Display GetDisplayMatching(

4102

+ const gfx::Rect& match_rect) const OVERRIDE;

4103

+ virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;

4104

+ virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE;

4105

+ virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE;

4102

+ const gfx::Rect& match_rect) const override;

4103

+ virtual gfx::Display GetPrimaryDisplay() const override;

4104

+ virtual void AddObserver(gfx::DisplayObserver* observer) override;

4105

+ virtual void RemoveObserver(gfx::DisplayObserver* observer) override;

4106

+

4107

+ gfx::Rect rect_;

4108

+ // The display objects we present to chrome.

4991

+ // belongs to a particular window.

4992

+ gfx::Rect GetBoundsInScreen() const;

4993

+

4994

+ virtual void OnRootViewLayout() OVERRIDE;

4995

+ virtual void SizeConstraintsChanged() OVERRIDE;

4994

+ virtual void OnRootViewLayout() override;

4995

+ virtual void SizeConstraintsChanged() override;

4996

+

4997

+ private:

4998

+ enum {

5018

+ // Overridden from DesktopWindowTreeHost:

5019

+ virtual void Init(

5020

+ aura::Window* content_window,

5021

+ const views::Widget::InitParams& params) OVERRIDE;

5021

+ const views::Widget::InitParams& params) override;

5022

+ virtual void OnNativeWidgetCreated(

5023

+ const views::Widget::InitParams& params) OVERRIDE;

5024

+ virtual scoped_ptr<views::corewm::Tooltip> CreateTooltip() OVERRIDE;

5023

+ const views::Widget::InitParams& params) override;

5024

+ virtual scoped_ptr<views::corewm::Tooltip> CreateTooltip() override;

5025

+ virtual scoped_ptr<aura::client::DragDropClient> CreateDragDropClient(

5026

+ views::DesktopNativeCursorManager* cursor_manager) OVERRIDE;

5027

+ virtual void Close() OVERRIDE;

5028

+ virtual void CloseNow() OVERRIDE;

5029

+ virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE;

5030

+ virtual void ShowWindowWithState(ui::WindowShowState show_state) OVERRIDE;

5026

+ views::DesktopNativeCursorManager* cursor_manager) override;

5027

+ virtual void Close() override;

5028

+ virtual void CloseNow() override;

5029

+ virtual aura::WindowTreeHost* AsWindowTreeHost() override;

5030

+ virtual void ShowWindowWithState(ui::WindowShowState show_state) override;

5031

+ virtual void ShowMaximizedWithBounds(

5032

+ const gfx::Rect& restored_bounds) OVERRIDE;

5033

+ virtual bool IsVisible() const OVERRIDE;

5034

+ virtual void SetSize(const gfx::Size& size) OVERRIDE;

5035

+ virtual void StackAtTop() OVERRIDE;

5036

+ virtual void CenterWindow(const gfx::Size& size) OVERRIDE;

5032

+ const gfx::Rect& restored_bounds) override;

5033

+ virtual bool IsVisible() const override;

5034

+ virtual void SetSize(const gfx::Size& size) override;

5035

+ virtual void StackAtTop() override;

5036

+ virtual void CenterWindow(const gfx::Size& size) override;

5037

+ virtual void GetWindowPlacement(

5038

+ gfx::Rect* bounds,

5039

+ ui::WindowShowState* show_state) const OVERRIDE;

5040

+ virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE;

5041

+ virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE;

5042

+ virtual gfx::Rect GetRestoredBounds() const OVERRIDE;

5043

+ virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE;

5044

+ virtual void SetShape(gfx::NativeRegion native_region) OVERRIDE;

5045

+ virtual void Activate() OVERRIDE;

5046

+ virtual void Deactivate() OVERRIDE;

5047

+ virtual bool IsActive() const OVERRIDE;

5048

+ virtual void Maximize() OVERRIDE;

5049

+ virtual void Minimize() OVERRIDE;

5050

+ virtual void Restore() OVERRIDE;

5051

+ virtual bool IsMaximized() const OVERRIDE;

5052

+ virtual bool IsMinimized() const OVERRIDE;

5053

+ virtual bool HasCapture() const OVERRIDE;

5054

+ virtual bool IsAlwaysOnTop() const OVERRIDE;

5055

+ virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE;

5056

+ virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;

5057

+ virtual bool SetWindowTitle(const base::string16& title) OVERRIDE;

5058

+ virtual void ClearNativeFocus() OVERRIDE;

5039

+ ui::WindowShowState* show_state) const override;

5040

+ virtual gfx::Rect GetWindowBoundsInScreen() const override;

5041

+ virtual gfx::Rect GetClientAreaBoundsInScreen() const override;

5042

+ virtual gfx::Rect GetRestoredBounds() const override;

5043

+ virtual gfx::Rect GetWorkAreaBoundsInScreen() const override;

5044

+ virtual void SetShape(gfx::NativeRegion native_region) override;

5045

+ virtual void Activate() override;

5046

+ virtual void Deactivate() override;

5047

+ virtual bool IsActive() const override;

5048

+ virtual void Maximize() override;

5049

+ virtual void Minimize() override;

5050

+ virtual void Restore() override;

5051

+ virtual bool IsMaximized() const override;

5052

+ virtual bool IsMinimized() const override;

5053

+ virtual bool HasCapture() const override;

5054

+ virtual bool IsAlwaysOnTop() const override;

5055

+ virtual void SetVisibleOnAllWorkspaces(bool always_visible) override;

5056

+ virtual void SetAlwaysOnTop(bool always_on_top) override;

5057

+ virtual bool SetWindowTitle(const base::string16& title) override;

5058

+ virtual void ClearNativeFocus() override;

5059

+ virtual views::Widget::MoveLoopResult RunMoveLoop(

5060

+ const gfx::Vector2d& drag_offset,

5061

+ views::Widget::MoveLoopSource source,

5062

+ views::Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE;

5063

+ virtual void EndMoveLoop() OVERRIDE;

5064

+ //virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;

5065

+ virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE;

5066

+ virtual bool ShouldUseNativeFrame() const OVERRIDE;

5067

+ virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE;

5068

+ virtual void FrameTypeChanged() OVERRIDE;

5069

+ virtual void SetFullscreen(bool fullscreen) OVERRIDE;

5070

+ virtual bool IsFullscreen() const OVERRIDE;

5071

+ virtual void SetOpacity(unsigned char opacity) OVERRIDE;

5062

+ views::Widget::MoveLoopEscapeBehavior escape_behavior) override;

5063

+ virtual void EndMoveLoop() override;

5064

+ //virtual NonClientFrameView* CreateNonClientFrameView() override;

5065

+ virtual void SetVisibilityChangedAnimationsEnabled(bool value) override;

5066

+ virtual bool ShouldUseNativeFrame() const override;

5067

+ virtual bool ShouldWindowContentsBeTransparent() const override;

5068

+ virtual void FrameTypeChanged() override;

5069

+ virtual void SetFullscreen(bool fullscreen) override;

5070

+ virtual bool IsFullscreen() const override;

5071

+ virtual void SetOpacity(unsigned char opacity) override;

5072

+ virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,

5073

+ const gfx::ImageSkia& app_icon) OVERRIDE;

5074

+ virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;

5075

+ virtual void FlashFrame(bool flash_frame) OVERRIDE;

5076

+ //virtual void OnRootViewLayout() const OVERRIDE;

5077

+ virtual void OnNativeWidgetFocus() OVERRIDE;

5078

+ virtual void OnNativeWidgetBlur() OVERRIDE;

5079

+ virtual bool IsAnimatingClosed() const OVERRIDE;

5073

+ const gfx::ImageSkia& app_icon) override;

5074

+ virtual void InitModalType(ui::ModalType modal_type) override;

5075

+ virtual void FlashFrame(bool flash_frame) override;

5076

+ //virtual void OnRootViewLayout() const override;

5077

+ virtual void OnNativeWidgetFocus() override;

5078

+ virtual void OnNativeWidgetBlur() override;

5079

+ virtual bool IsAnimatingClosed() const override;

5080

+

5081

+ // Overridden from aura::WindowTreeHost:

5082

+ virtual ui::EventSource* GetEventSource() OVERRIDE;

5083

+ virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;

5084

+ virtual void Show() OVERRIDE;

5085

+ virtual void Hide() OVERRIDE;

5086

+ virtual gfx::Rect GetBounds() const OVERRIDE;

5087

+ virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;

5088

+ virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;

5089

+ virtual void SetCapture() OVERRIDE;

5090

+ virtual void ReleaseCapture() OVERRIDE;

5091

+ virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE;

5092

+ virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;

5093

+ virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;

5094

+ virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;

5095

+ //virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;

5096

+ virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE;

5082

+ virtual ui::EventSource* GetEventSource() override;

5083

+ virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;

5084

+ virtual void Show() override;

5085

+ virtual void Hide() override;

5086

+ virtual gfx::Rect GetBounds() const override;

5087

+ virtual void SetBounds(const gfx::Rect& bounds) override;

5088

+ virtual gfx::Point GetLocationOnNativeScreen() const override;

5089

+ virtual void SetCapture() override;

5090

+ virtual void ReleaseCapture() override;

5091

+ virtual void SetCursorNative(gfx::NativeCursor cursor) override;

5092

+ virtual void OnCursorVisibilityChangedNative(bool show) override;

5093

+ virtual void MoveCursorToNative(const gfx::Point& location) override;

5094

+ virtual void PostNativeEvent(const base::NativeEvent& native_event) override;

5095

+ //virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override;

5096

+ virtual bool IsTranslucentWindowOpacitySupported() const override;

5097

+

5098

+ void HandleNativeWidgetActivationChanged(bool active);

5099

+ void HandleWindowResize(unsigned width, unsigned height);

5586

+ const std::vector<aura::Window*>& GetAllOpenWindows();

5587

+

5588

+ // Overridden frm ui::EventSource

5589

+ virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;

5589

+ virtual ui::EventProcessor* GetEventProcessor() override;

5590

+ private:

5591

+ // ui::PlatformEventDispatcher:

5592

+ virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;

5593

+ virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;

5592

+ virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;

5593

+ virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;

5594

+

5595

+ // Window Change Observer.

5596

+ virtual void OnWindowFocused(unsigned handle) OVERRIDE;

5597

+ virtual void OnWindowEnter(unsigned handle) OVERRIDE;

5598

+ virtual void OnWindowLeave(unsigned handle) OVERRIDE;

5599

+ virtual void OnWindowClose(unsigned handle) OVERRIDE;

5596

+ virtual void OnWindowFocused(unsigned handle) override;

5597

+ virtual void OnWindowEnter(unsigned handle) override;

5598

+ virtual void OnWindowLeave(unsigned handle) override;

5599

+ virtual void OnWindowClose(unsigned handle) override;

5600

+ virtual void OnWindowResized(unsigned windowhandle,

5601

+ unsigned width,

5602

+ unsigned height) OVERRIDE;

5602

+ unsigned height) override;

5603

+ virtual void OnPreeditChanged(unsigned handle,

5604

+ const std::string& text,

5605

+ const std::string& commit) OVERRIDE;

5606

+ virtual void OnCommit(unsigned handle, const std::string& text) OVERRIDE;

5605

+ const std::string& commit) override;

5606

+ virtual void OnCommit(unsigned handle, const std::string& text) override;

5607

+

5608

+ // Dispatches a mouse event.

5609

+ void DispatchMouseEvent(ui::MouseEvent* event);

5614

+ bool handle_event_ :1;

5615

+ bool stop_propogation_ :1;

5616

+

5617

+ //virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;

5617

+ //virtual NonClientFrameView* CreateNonClientFrameView() override;

5618

+

5619

+ // Current dispatcher.

5620

+ DesktopWindowTreeHostWayland* current_dispatcher_;

5949

+

5950

+#include "base/basictypes.h"

5951

+#include "ozone/platform/ozone_export_wayland.h"

5952

+#include "ui/gfx/rect.h"

5952

+#include "ui/gfx/geometry/rect.h"

5953

+

5954

+namespace ui {

5955

+

6875

+ virtual void LookAheadOutputGeometry();

6876

+

6877

+ // Ozone Display implementation:

6878

+ //virtual ui::SurfaceFactoryOzone::HardwareState InitializeHardware() OVERRIDE;

6879

+ //virtual void ShutdownHardware() OVERRIDE;

6880

+ virtual intptr_t GetNativeDisplay() OVERRIDE;

6878

+ //virtual ui::SurfaceFactoryOzone::HardwareState InitializeHardware() override;

6879

+ //virtual void ShutdownHardware() override;

6880

+ virtual intptr_t GetNativeDisplay() override;

6881

+

6882

+ //virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;

6882

+ //virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;

6883

+

6884

+ // Ownership is passed to the caller.

6885

+ virtual scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(

6886

+ gfx::AcceleratedWidget widget) OVERRIDE;

6886

+ gfx::AcceleratedWidget widget) override;

6887

+

6888

+ virtual bool LoadEGLGLES2Bindings(

6889

+ ui::SurfaceFactoryOzone::AddGLLibraryCallback add_gl_library,

6890

+ ui::SurfaceFactoryOzone::SetGLGetProcAddressProcCallback

6891

+ proc_address) OVERRIDE;

6891

+ proc_address) override;

6892

+ virtual const int32* GetEGLSurfaceProperties(

6893

+ const int32* desired_list) OVERRIDE;

6893

+ const int32* desired_list) override;

6894

+

6895

+ private:

6896

+ static OzoneDisplay* instance_;

6946

+ explicit WaylandSyncProvider();

6947

+ virtual ~WaylandSyncProvider();

6948

+

6949

+ virtual void GetVSyncParameters(const UpdateVSyncCallback& callback) OVERRIDE;

6949

+ virtual void GetVSyncParameters(const UpdateVSyncCallback& callback) override;

6950

+

6951

+ private:

6952

+ DISALLOW_COPY_AND_ASSIGN(WaylandSyncProvider);

7034

+ virtual ~InputMethodContextFactoryWayland();

7035

+

7036

+ virtual scoped_ptr<LinuxInputMethodContext> CreateInputMethodContext(

7037

+ ui::LinuxInputMethodContextDelegate* delegate) const OVERRIDE;

7037

+ ui::LinuxInputMethodContextDelegate* delegate) const override;

7038

+};

7039

+

7040

+} // namespace ui

7102

+

7103

+#include "ozone/platform/ozone_export_wayland.h"

7104

+#include "ui/base/ime/linux/linux_input_method_context.h"

7105

+#include "ui/gfx/rect.h"

7105

+#include "ui/gfx/geometry/rect.h"

7106

+

7107

+namespace ui {

7108

+

7116

+ virtual ~InputMethodContextImplWayland();

7117

+

7118

+ // Overriden from ui::LinuxInputMethodContext

7119

+ virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) OVERRIDE;

7120

+ virtual void Reset() OVERRIDE;

7119

+ virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) override;

7120

+ virtual void Reset() override;

7121

+ virtual void OnTextInputTypeChanged(ui::TextInputType text_input_type)

7122

+ OVERRIDE;

7123

+ virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) OVERRIDE;

7122

+ override;

7123

+ virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override;

7124

+

7125

+ private:

7126

+ // Must not be NULL.

7663

+ void FlushDisplay();

7664

+

7665

+ // Ozone Display implementation:

7666

+ //virtual ui::SurfaceFactoryOzone::HardwareState InitializeHardware() OVERRIDE;

7667

+ //virtual void ShutdownHardware() OVERRIDE;

7668

+ virtual intptr_t GetNativeDisplay() OVERRIDE;

7666

+ //virtual ui::SurfaceFactoryOzone::HardwareState InitializeHardware() override;

7667

+ //virtual void ShutdownHardware() override;

7668

+ virtual intptr_t GetNativeDisplay() override;

7669

+

7670

+ //virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;

7670

+ //virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;

7671

+

7672

+ // Ownership is passed to the caller.

7673

+ virtual scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(

7674

+ gfx::AcceleratedWidget widget) OVERRIDE;

7674

+ gfx::AcceleratedWidget widget) override;

7675

+

7676

+ virtual bool LoadEGLGLES2Bindings(

7677

+ ui::SurfaceFactoryOzone::AddGLLibraryCallback add_gl_library,

7678

+ ui::SurfaceFactoryOzone::SetGLGetProcAddressProcCallback

7679

+ proc_address) OVERRIDE;

7679

+ proc_address) override;

7680

+ virtual const int32* GetEGLSurfaceProperties(

7681

+ const int32* desired_list) OVERRIDE;

7681

+ const int32* desired_list) override;

7682

+

7683

+ // WindowStateChangeHandler implementation:

7684

+ virtual void SetWidgetState(unsigned widget,

7685

+ ui::WidgetState state,

7686

+ unsigned width = 0,

7687

+ unsigned height = 0) OVERRIDE;

7687

+ unsigned height = 0) override;

7688

+ virtual void SetWidgetTitle(unsigned w,

7689

+ const base::string16& title) OVERRIDE;

7690

+ virtual void SetWidgetCursor(int cursor_type) OVERRIDE;

7689

+ const base::string16& title) override;

7690

+ virtual void SetWidgetCursor(int cursor_type) override;

7691

+ virtual void SetWidgetAttributes(unsigned widget,

7692

+ unsigned parent,

7693

+ unsigned x,

7694

+ unsigned y,

7695

+ ui::WidgetType type) OVERRIDE;

7695

+ ui::WidgetType type) override;

7696

+

7697

+ private:

7698

+ void InitializeDisplay();

8089

+class SurfaceOzoneWayland : public ui::SurfaceOzoneEGL {

8090

+public:

8091

+ explicit SurfaceOzoneWayland(unsigned handle);

8092

+ virtual ~SurfaceOzoneWayland() OVERRIDE;

8092

+ virtual ~SurfaceOzoneWayland() override;

8093

+

8094

+ // SurfaceOzone:

8095

+ virtual intptr_t GetNativeWindow() OVERRIDE;

8096

+ virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) OVERRIDE;

8097

+ virtual bool OnSwapBuffers() OVERRIDE;

8098

+ virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE;

8095

+ virtual intptr_t GetNativeWindow() override;

8096

+ virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) override;

8097

+ virtual bool OnSwapBuffers() override;

8098

+ virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;

8099

+

8100

+ private:

8101

+ unsigned handle_;

9336

+#define OZONE_WAYLAND_INPUT_POINTER_H_

9337

+

9338

+#include "ozone/wayland/display.h"

9339

+#include "ui/gfx/point.h"

9339

+#include "ui/gfx/geometry/point.h"

9340

+

9341

+namespace ui {

9342

+class EventConverterOzoneWayland;

10495

+#define OZONE_WAYLAND_INPUT_TOUCHSCREEN_H_

10496

+

10497

+#include "ozone/wayland/display.h"

10498

+#include "ui/gfx/point.h"

10498

+#include "ui/gfx/geometry/point.h"

10499

+

10500

+namespace ui {

10501

+class EventConverterOzoneWayland;

10835

+ void SetGrabWindowHandle(unsigned windowhandle, uint32_t button);

10836

+ void SetCursorType(int cursor_type);

10837

+

10838

+ virtual void ResetIme() OVERRIDE;

10839

+ virtual void ImeCaretBoundsChanged(gfx::Rect rect) OVERRIDE;

10840

+ virtual void ShowInputPanel() OVERRIDE;

10841

+ virtual void HideInputPanel() OVERRIDE;

10838

+ virtual void ResetIme() override;

10839

+ virtual void ImeCaretBoundsChanged(gfx::Rect rect) override;

10840

+ virtual void ShowInputPanel() override;

10841

+ virtual void HideInputPanel() override;

10842

+

10843

+ private:

10844

+ static void OnSeatCapabilities(void *data,

10979

+ explicit WaylandProxyDisplay();

10980

+ virtual ~WaylandProxyDisplay();

10981

+

10982

+ virtual void LookAheadOutputGeometry() OVERRIDE;

10982

+ virtual void LookAheadOutputGeometry() override;

10983

+

10984

+ private:

10985

+ // This handler resolves only screen registration. In general you don't want

11086

+#include <stdint.h>

11087

+

11088

+#include "base/basictypes.h"

11089

+#include "ui/gfx/point.h"

11090

+#include "ui/gfx/rect.h"

11089

+#include "ui/gfx/geometry/point.h"

11090

+#include "ui/gfx/geometry/rect.h"

11091

+

11092

+struct wl_output;

11093

+struct wl_registry;

11513

+ WLShellSurface();

11514

+ virtual ~WLShellSurface();

11515

+

11516

+ virtual void InitializeShellSurface(WaylandWindow* window) OVERRIDE;

11516

+ virtual void InitializeShellSurface(WaylandWindow* window) override;

11517

+ virtual void UpdateShellSurface(WaylandWindow::ShellType type,

11518

+ WaylandShellSurface* shell_parent,

11519

+ unsigned x,

11520

+ unsigned y) OVERRIDE;

11521

+ virtual void SetWindowTitle(const base::string16& title) OVERRIDE;

11522

+ virtual void Maximize() OVERRIDE;

11523

+ virtual void Minimize() OVERRIDE;

11520

+ unsigned y) override;

11521

+ virtual void SetWindowTitle(const base::string16& title) override;

11522

+ virtual void Maximize() override;

11523

+ virtual void Minimize() override;

11524

+

11525

+ static void HandleConfigure(void* data,

11526

+ struct wl_shell_surface* shell_surface,

12356

+ XDGShellSurface();

12357

+ virtual ~XDGShellSurface();

12358

+

12359

+ virtual void InitializeShellSurface(WaylandWindow* window) OVERRIDE;

12359

+ virtual void InitializeShellSurface(WaylandWindow* window) override;

12360

+ virtual void UpdateShellSurface(WaylandWindow::ShellType type,

12361

+ WaylandShellSurface* shell_parent,

12362

+ unsigned x,

12363

+ unsigned y) OVERRIDE;

12364

+ virtual void SetWindowTitle(const base::string16& title) OVERRIDE;

12365

+ virtual void Maximize() OVERRIDE;

12366

+ virtual void Minimize() OVERRIDE;

12363

+ unsigned y) override;

12364

+ virtual void SetWindowTitle(const base::string16& title) override;

12365

+ virtual void Maximize() override;

12366

+ virtual void Minimize() override;

12367

+

12368

+ static void HandleConfigure(void* data,

12369

+ struct xdg_surface* xdg_surface,

12422

+ 'target_name': 'wayland_toolkit',

12423

+ 'type': 'static_library',

12424

+ 'variables': {

12425

+ 'WAYLAND_VERSION': '1.6.0',

12425

+ 'WAYLAND_VERSION': '1.7.0',

12426

+ 'MESA_VERSION': '9.1.3',

12427

+ 'wayland_packages': [

12428

+ 'egl >= <(MESA_VERSION)',

12648

+#include <wayland-client.h>

12649

+

12650

+#include "base/strings/string16.h"

12651

+#include "ui/gfx/rect.h"

12651

+#include "ui/gfx/geometry/rect.h"

12652

+

12653

+namespace ozonewayland {

12654

+

12720

# Sources lists shared with GN build.

12721

'views_sources': [

12722

'accessibility/native_view_accessibility.cc',

12723

@@ -658,6 +659,9 @@

12723

@@ -671,6 +672,9 @@

12724

'msvs_disabled_warnings': [ 4267, ],

12725

}],

12726

['use_ozone==1', {