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

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

Issue 23478022: [android_webview] Fixes for wrap_content layouts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix findbugs + rebase Created 7 years, 3 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
« no previous file with comments | « android_webview/renderer/DEPS ('k') | android_webview/renderer/aw_render_view_ext.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "third_party/WebKit/public/web/WebPermissionClient.h" 11 #include "third_party/WebKit/public/web/WebPermissionClient.h"
12 #include "third_party/skia/include/core/SkColor.h" 12 #include "third_party/skia/include/core/SkColor.h"
13 #include "ui/gfx/size.h"
13 14
14 namespace WebKit { 15 namespace WebKit {
15 16
16 class WebNode; 17 class WebNode;
17 class WebURL; 18 class WebURL;
18 19
19 } // namespace WebKit 20 } // namespace WebKit
20 21
21 namespace android_webview { 22 namespace android_webview {
22 23
(...skipping 19 matching lines...) Expand all
42 43
43 void OnDocumentHasImagesRequest(int id); 44 void OnDocumentHasImagesRequest(int id);
44 45
45 void OnDoHitTest(int view_x, int view_y); 46 void OnDoHitTest(int view_x, int view_y);
46 47
47 void OnSetTextZoomLevel(double zoom_level); 48 void OnSetTextZoomLevel(double zoom_level);
48 49
49 void OnResetScrollAndScaleState(); 50 void OnResetScrollAndScaleState();
50 51
51 void OnSetInitialPageScale(double page_scale_factor); 52 void OnSetInitialPageScale(double page_scale_factor);
53
54 void OnSetFixedLayoutSize(const gfx::Size& size);
55
52 void OnSetBackgroundColor(SkColor c); 56 void OnSetBackgroundColor(SkColor c);
53 57
54 void UpdatePageScaleFactor(); 58 void UpdatePageScaleFactor();
55 59
56 // WebKit::WebPermissionClient implementation. 60 // WebKit::WebPermissionClient implementation.
57 virtual bool allowDisplayingInsecureContent( 61 virtual bool allowDisplayingInsecureContent(
58 WebKit::WebFrame* frame, 62 WebKit::WebFrame* frame,
59 bool enabled_per_settings, 63 bool enabled_per_settings,
60 const WebKit::WebSecurityOrigin& origin, 64 const WebKit::WebSecurityOrigin& origin,
61 const WebKit::WebURL& url) OVERRIDE; 65 const WebKit::WebURL& url) OVERRIDE;
62 virtual bool allowRunningInsecureContent( 66 virtual bool allowRunningInsecureContent(
63 WebKit::WebFrame* frame, 67 WebKit::WebFrame* frame,
64 bool enabled_per_settings, 68 bool enabled_per_settings,
65 const WebKit::WebSecurityOrigin& origin, 69 const WebKit::WebSecurityOrigin& origin,
66 const WebKit::WebURL& url) OVERRIDE; 70 const WebKit::WebURL& url) OVERRIDE;
67 71
68 bool capture_picture_enabled_; 72 bool capture_picture_enabled_;
69 73
70 float page_scale_factor_; 74 float page_scale_factor_;
71 75
72 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt); 76 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt);
73 }; 77 };
74 78
75 } // namespace android_webview 79 } // namespace android_webview
76 80
77 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ 81 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_
OLDNEW
« no previous file with comments | « android_webview/renderer/DEPS ('k') | android_webview/renderer/aw_render_view_ext.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698