Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Side by Side Diff: android_webview/renderer/aw_render_view_ext.h

Issue 12567020: [android] Resize the android_webview if it's 0x0 initially. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't re-layout while pinch-zooming Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 OnSetEnableFixedLayoutMode(bool enabled); 45 void OnSetEnableFixedLayoutMode(bool enabled);
45 46
46 void OnSetTextZoomLevel(double zoom_level); 47 void OnSetTextZoomLevel(double zoom_level);
47 48
48 void OnResetScrollAndScaleState(); 49 void OnResetScrollAndScaleState();
49 50
50 void OnSetInitialPageScale(double page_scale_factor); 51 void OnSetInitialPageScale(double page_scale_factor);
51 52
53 void UpdatePageScaleFactor();
54
52 // WebKit::WebPermissionClient implementation. 55 // WebKit::WebPermissionClient implementation.
53 virtual bool allowImage(WebKit::WebFrame* frame, 56 virtual bool allowImage(WebKit::WebFrame* frame,
54 bool enabledPerSettings, 57 bool enabledPerSettings,
55 const WebKit::WebURL& imageURL) OVERRIDE; 58 const WebKit::WebURL& imageURL) OVERRIDE;
56 59
57 bool capture_picture_enabled_; 60 bool capture_picture_enabled_;
58 61
62 float page_scale_factor_;
63
59 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt); 64 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt);
60 }; 65 };
61 66
62 } // namespace android_webview 67 } // namespace android_webview
63 68
64 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ 69 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698