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 ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ | 5 #ifndef ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ |
6 #define ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ | 6 #define ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "content/public/renderer/render_view_observer.h" | 10 #include "content/public/renderer/render_view_observer.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 private: | 30 private: |
31 AwRenderViewExt(content::RenderView* render_view); | 31 AwRenderViewExt(content::RenderView* render_view); |
32 virtual ~AwRenderViewExt(); | 32 virtual ~AwRenderViewExt(); |
33 | 33 |
34 // RenderView::Observer: | 34 // RenderView::Observer: |
35 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 35 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
36 virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, | 36 virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, |
37 bool is_new_navigation) OVERRIDE; | 37 bool is_new_navigation) OVERRIDE; |
38 virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE; | 38 virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE; |
| 39 virtual void DidCommitCompositorFrame() OVERRIDE; |
39 | 40 |
40 void OnDocumentHasImagesRequest(int id); | 41 void OnDocumentHasImagesRequest(int id); |
41 | 42 |
42 void OnDoHitTest(int view_x, int view_y); | 43 void OnDoHitTest(int view_x, int view_y); |
43 | 44 |
44 void OnSetTextZoomLevel(double zoom_level); | 45 void OnSetTextZoomLevel(double zoom_level); |
45 | 46 |
46 void OnResetScrollAndScaleState(); | 47 void OnResetScrollAndScaleState(); |
47 | 48 |
48 void OnSetInitialPageScale(double page_scale_factor); | 49 void OnSetInitialPageScale(double page_scale_factor); |
49 | 50 |
| 51 void UpdatePageScaleFactor(); |
| 52 |
50 // WebKit::WebPermissionClient implementation. | 53 // WebKit::WebPermissionClient implementation. |
51 virtual bool allowImage(WebKit::WebFrame* frame, | 54 virtual bool allowImage(WebKit::WebFrame* frame, |
52 bool enabledPerSettings, | 55 bool enabledPerSettings, |
53 const WebKit::WebURL& imageURL) OVERRIDE; | 56 const WebKit::WebURL& imageURL) OVERRIDE; |
54 | 57 |
55 bool capture_picture_enabled_; | 58 bool capture_picture_enabled_; |
56 | 59 |
| 60 float page_scale_factor_; |
| 61 |
57 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt); | 62 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt); |
58 }; | 63 }; |
59 | 64 |
60 } // namespace android_webview | 65 } // namespace android_webview |
61 | 66 |
62 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ | 67 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ |
OLD | NEW |