1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "jbauman@chromium.org" <jbauman@chromium.org>
Date: Wed, 29 Jan 2014 00:14:45 +0000
Subject: Use compositor with select popups.
BUG=271575
Review URL: https://codereview.chromium.org/132173005
git-svn-id: svn://svn.chromium.org/blink/trunk@165977 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Change-Id: I78b3354b1040b193c984b82db51c90b8183ebd24
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
Source/web/WebPopupMenuImpl.cpp | 69 +++++++++++++++++++++++++++++++++++++++++
Source/web/WebPopupMenuImpl.h | 59 +++++++++++++++++++++--------------
2 files changed, 104 insertions(+), 24 deletions(-)
diff --git a/Source/web/WebPopupMenuImpl.cpp b/Source/web/WebPopupMenuImpl.cpp
index 05c1d05..e8adfd7 100644
--- a/Source/web/WebPopupMenuImpl.cpp
+++ b/Source/web/WebPopupMenuImpl.cpp
@@ -49,6 +49,10 @@
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/skia/SkiaUtils.h"
#include "platform/scroll/FramelessScrollView.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebCompositorSupport.h"
+#include "public/platform/WebContentLayer.h"
+#include "public/platform/WebLayerTreeView.h"
#include "public/platform/WebRect.h"
#include <skia/ext/platform_canvas.h>
@@ -68,6 +72,10 @@ WebPopupMenu* WebPopupMenu::create(WebWidgetClient* client)
WebPopupMenuImpl::WebPopupMenuImpl(WebWidgetClient* client)
: m_client(client)
+ , m_layerTreeView(0)
+ , m_isAcceleratedCompositingActive(false)
+ // Set to impossible point so we always get the first mouse position.
+ , m_lastMousePosition(WebPoint(-1, -1))
, m_widget(0)
{
// Set to impossible point so we always get the first mouse position.
@@ -80,6 +88,12 @@ WebPopupMenuImpl::~WebPopupMenuImpl()
m_widget->setClient(0);
}
+void WebPopupMenuImpl::willCloseLayerTreeView()
+{
+ enterForceCompositingMode(false);
+ m_layerTreeView = 0;
+}
+
void WebPopupMenuImpl::initialize(FramelessScrollView* widget, const WebRect& bounds)
{
m_widget = widget;
@@ -174,6 +188,9 @@ void WebPopupMenuImpl::resize(const WebSize& newSize)
WebRect damagedRect(0, 0, m_size.width, m_size.height);
m_client->didInvalidateRect(damagedRect);
}
+
+ if (m_rootLayer)
+ m_rootLayer->layer()->setBounds(newSize);
}
void WebPopupMenuImpl::willEndLiveResize()
@@ -188,6 +205,54 @@ void WebPopupMenuImpl::layout()
{
}
+void WebPopupMenuImpl::enterForceCompositingMode(bool enter)
+{
+ if (m_isAcceleratedCompositingActive == enter)
+ return;
+
+ if (!enter) {
+ m_isAcceleratedCompositingActive = false;
+ m_client->didDeactivateCompositor();
+ } else if (m_layerTreeView) {
+ m_isAcceleratedCompositingActive = true;
+ m_client->didActivateCompositor(0);
+ } else {
+ TRACE_EVENT0("webkit", "WebPopupMenuImpl::enterForceCompositingMode(true)");
+
+ m_client->initializeLayerTreeView();
+ m_layerTreeView = m_client->layerTreeView();
+ if (m_layerTreeView) {
+ m_layerTreeView->setVisible(true);
+ m_client->didActivateCompositor(0);
+ m_isAcceleratedCompositingActive = true;
+ m_layerTreeView->setDeviceScaleFactor(m_client->deviceScaleFactor());
+ m_rootLayer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(this));
+ m_rootLayer->layer()->setBounds(m_size);
+ m_layerTreeView->setRootLayer(*m_rootLayer->layer());
+ } else {
+ m_isAcceleratedCompositingActive = false;
+ m_client->didDeactivateCompositor();
+ }
+ }
+}
+
+void WebPopupMenuImpl::didExitCompositingMode()
+{
+ enterForceCompositingMode(false);
+ m_client->didInvalidateRect(IntRect(0, 0, m_size.width, m_size.height));
+}
+
+void WebPopupMenuImpl::paintContents(WebCanvas* canvas, const WebRect& rect, bool, WebFloatRect&)
+{
+ if (!m_widget)
+ return;
+
+ if (!rect.isEmpty()) {
+ GraphicsContext context(canvas);
+ m_widget->paint(&context, rect);
+ }
+}
+
void WebPopupMenuImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions)
{
if (!m_widget)
@@ -343,6 +408,8 @@ void WebPopupMenuImpl::invalidateContentsAndRootView(const IntRect& paintRect)
return;
if (m_client)
m_client->didInvalidateRect(paintRect);
+ if (m_rootLayer)
+ m_rootLayer->layer()->invalidateRect(FloatRect(paintRect));
}
void WebPopupMenuImpl::invalidateContentsForSlowScroll(const IntRect& updateRect)
@@ -361,6 +428,8 @@ void WebPopupMenuImpl::scroll(const IntSize& scrollDelta, const IntRect& scrollR
int dy = scrollDelta.height();
m_client->didScrollRect(dx, dy, clipRect);
}
+ if (m_rootLayer)
+ m_rootLayer->layer()->invalidateRect(FloatRect(clipRect));
}
IntPoint WebPopupMenuImpl::screenToRootView(const IntPoint& point) const
diff --git a/Source/web/WebPopupMenuImpl.h b/Source/web/WebPopupMenuImpl.h
index e5777be..0384675 100644
--- a/Source/web/WebPopupMenuImpl.h
+++ b/Source/web/WebPopupMenuImpl.h
@@ -33,6 +33,7 @@
#include "WebPopupMenu.h"
#include "platform/scroll/FramelessScrollViewClient.h"
+#include "public/platform/WebContentLayerClient.h"
#include "public/platform/WebPoint.h"
#include "public/platform/WebSize.h"
#include "wtf/OwnPtr.h"
@@ -49,44 +50,50 @@ class Widget;
}
namespace blink {
+class WebContentLayer;
class WebGestureEvent;
class WebKeyboardEvent;
+class WebLayerTreeView;
class WebMouseEvent;
class WebMouseWheelEvent;
class WebRange;
struct WebRect;
class WebTouchEvent;
-class WebPopupMenuImpl : public WebPopupMenu,
- public WebCore::FramelessScrollViewClient,
- public RefCounted<WebPopupMenuImpl> {
+class WebPopupMenuImpl : public WebPopupMenu, public WebCore::FramelessScrollViewClient, public WebContentLayerClient, public RefCounted<WebPopupMenuImpl> {
WTF_MAKE_FAST_ALLOCATED;
public:
// WebWidget functions:
- virtual void close() OVERRIDE;
- virtual WebSize size() OVERRIDE { return m_size; }
- virtual void willStartLiveResize() OVERRIDE;
- virtual void resize(const WebSize&) OVERRIDE;
- virtual void willEndLiveResize() OVERRIDE;
- virtual void animate(double frameBeginTime) OVERRIDE;
- virtual void layout() OVERRIDE;
- virtual void paint(WebCanvas*, const WebRect&, PaintOptions = ReadbackFromCompositorIfAvailable) OVERRIDE;
- virtual void themeChanged() OVERRIDE;
- virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE;
- virtual void mouseCaptureLost() OVERRIDE;
- virtual void setFocus(bool enable) OVERRIDE;
+ virtual void close() OVERRIDE FINAL;
+ virtual WebSize size() OVERRIDE FINAL { return m_size; }
+ virtual void willStartLiveResize() OVERRIDE FINAL;
+ virtual void resize(const WebSize&) OVERRIDE FINAL;
+ virtual void willEndLiveResize() OVERRIDE FINAL;
+ virtual void animate(double frameBeginTime) OVERRIDE FINAL;
+ virtual void layout() OVERRIDE FINAL;
+ virtual void enterForceCompositingMode(bool enable) OVERRIDE FINAL;
+ virtual void didExitCompositingMode() OVERRIDE FINAL;
+ virtual void paint(WebCanvas*, const WebRect&, PaintOptions = ReadbackFromCompositorIfAvailable) OVERRIDE FINAL;
+ virtual void themeChanged() OVERRIDE FINAL;
+ virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE FINAL;
+ virtual void mouseCaptureLost() OVERRIDE FINAL;
+ virtual void setFocus(bool enable) OVERRIDE FINAL;
virtual bool setComposition(
const WebString& text,
const WebVector<WebCompositionUnderline>& underlines,
- int selectionStart, int selectionEnd) OVERRIDE;
- virtual bool confirmComposition() OVERRIDE;
- virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) OVERRIDE;
- virtual bool confirmComposition(const WebString& text) OVERRIDE;
- virtual bool compositionRange(size_t* location, size_t* length) OVERRIDE;
- virtual bool caretOrSelectionRange(size_t* location, size_t* length) OVERRIDE;
- virtual void setTextDirection(WebTextDirection) OVERRIDE;
- virtual bool isAcceleratedCompositingActive() const OVERRIDE { return false; }
- virtual bool isPopupMenu() const OVERRIDE { return true; }
+ int selectionStart, int selectionEnd) OVERRIDE FINAL;
+ virtual bool confirmComposition() OVERRIDE FINAL;
+ virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) OVERRIDE FINAL;
+ virtual bool confirmComposition(const WebString& text) OVERRIDE FINAL;
+ virtual bool compositionRange(size_t* location, size_t* length) OVERRIDE FINAL;
+ virtual bool caretOrSelectionRange(size_t* location, size_t* length) OVERRIDE FINAL;
+ virtual void setTextDirection(WebTextDirection) OVERRIDE FINAL;
+ virtual bool isAcceleratedCompositingActive() const OVERRIDE FINAL { return false; }
+ virtual bool isPopupMenu() const OVERRIDE FINAL { return true; }
+ virtual void willCloseLayerTreeView() OVERRIDE FINAL;
+
+ // WebContentLayerClient
+ virtual void paintContents(WebCanvas*, const WebRect& clip, bool canPaintLCDTest, WebFloatRect& opaque) OVERRIDE FINAL;
// WebPopupMenuImpl
void initialize(WebCore::FramelessScrollView* widget, const WebRect& bounds);
@@ -127,6 +134,10 @@ public:
WebWidgetClient* m_client;
WebSize m_size;
+ WebLayerTreeView* m_layerTreeView;
+ OwnPtr<WebContentLayer> m_rootLayer;
+ bool m_isAcceleratedCompositingActive;
+
WebPoint m_lastMousePosition;
// This is a non-owning ref. The popup will notify us via popupClosed()
|
