OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
368 | 368 |
369 // Most methods are handled by RenderWidget. | 369 // Most methods are handled by RenderWidget. |
370 virtual void didFocus(); | 370 virtual void didFocus(); |
371 virtual void didBlur(); | 371 virtual void didBlur(); |
372 virtual void show(blink::WebNavigationPolicy policy); | 372 virtual void show(blink::WebNavigationPolicy policy); |
373 virtual bool enterFullScreen(); | 373 virtual bool enterFullScreen(); |
374 virtual void exitFullScreen(); | 374 virtual void exitFullScreen(); |
375 virtual bool requestPointerLock(); | 375 virtual bool requestPointerLock(); |
376 virtual void requestPointerUnlock(); | 376 virtual void requestPointerUnlock(); |
377 virtual bool isPointerLocked(); | 377 virtual bool isPointerLocked(); |
| 378 // FIXME: To be removed as soon as chromium and blink side changes land |
| 379 // didActivateCompositor with parameters is still kept in order to land |
| 380 // these changes s-chromium - https://codereview.chromium.org/137893025/. |
| 381 // s-blink - https://codereview.chromium.org/138523003/ |
378 virtual void didActivateCompositor(int input_handler_identifier); | 382 virtual void didActivateCompositor(int input_handler_identifier); |
| 383 virtual void didActivateCompositor() OVERRIDE; |
379 virtual void didHandleGestureEvent(const blink::WebGestureEvent& event, | 384 virtual void didHandleGestureEvent(const blink::WebGestureEvent& event, |
380 bool event_cancelled) OVERRIDE; | 385 bool event_cancelled) OVERRIDE; |
381 virtual void initializeLayerTreeView() OVERRIDE; | 386 virtual void initializeLayerTreeView() OVERRIDE; |
382 | 387 |
383 // blink::WebViewClient implementation -------------------------------------- | 388 // blink::WebViewClient implementation -------------------------------------- |
384 | 389 |
385 virtual blink::WebView* createView( | 390 virtual blink::WebView* createView( |
386 blink::WebFrame* creator, | 391 blink::WebFrame* creator, |
387 const blink::WebURLRequest& request, | 392 const blink::WebURLRequest& request, |
388 const blink::WebWindowFeatures& features, | 393 const blink::WebWindowFeatures& features, |
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1437 // use the Observer interface to filter IPC messages and receive frame change | 1442 // use the Observer interface to filter IPC messages and receive frame change |
1438 // notifications. | 1443 // notifications. |
1439 // --------------------------------------------------------------------------- | 1444 // --------------------------------------------------------------------------- |
1440 | 1445 |
1441 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); | 1446 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); |
1442 }; | 1447 }; |
1443 | 1448 |
1444 } // namespace content | 1449 } // namespace content |
1445 | 1450 |
1446 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ | 1451 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ |
OLD | NEW |