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

Side by Side Diff: android_webview/browser/renderer_host/aw_render_view_host_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 | « no previous file | android_webview/browser/renderer_host/aw_render_view_host_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_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
6 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 6 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
7 7
8 #include "content/public/browser/web_contents_observer.h" 8 #include "content/public/browser/web_contents_observer.h"
9 9
10 #include "android_webview/common/aw_hit_test_data.h" 10 #include "android_webview/common/aw_hit_test_data.h"
11 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
12 #include "base/threading/non_thread_safe.h" 12 #include "base/threading/non_thread_safe.h"
13 #include "third_party/skia/include/core/SkColor.h" 13 #include "third_party/skia/include/core/SkColor.h"
14 #include "ui/gfx/size.h"
14 15
15 class GURL; 16 class GURL;
16 17
17 namespace content { 18 namespace content {
18 struct FrameNavigateParams; 19 struct FrameNavigateParams;
19 struct LoadCommittedDetails; 20 struct LoadCommittedDetails;
20 } // namespace content 21 } // namespace content
21 22
22 namespace android_webview { 23 namespace android_webview {
23 24
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 void MarkHitTestDataRead(); 60 void MarkHitTestDataRead();
60 61
61 // Return |last_hit_test_data_|. Note that this is unavoidably racy; 62 // Return |last_hit_test_data_|. Note that this is unavoidably racy;
62 // the corresponding public WebView API is as well. 63 // the corresponding public WebView API is as well.
63 const AwHitTestData& GetLastHitTestData() const; 64 const AwHitTestData& GetLastHitTestData() const;
64 65
65 // Sets the zoom level for text only. Used in layout modes other than 66 // Sets the zoom level for text only. Used in layout modes other than
66 // Text Autosizing. 67 // Text Autosizing.
67 void SetTextZoomLevel(double level); 68 void SetTextZoomLevel(double level);
68 69
70 void SetFixedLayoutSize(const gfx::Size& size);
71
69 void ResetScrollAndScaleState(); 72 void ResetScrollAndScaleState();
70 73
71 // Sets the initial page scale. This overrides initial scale set by 74 // Sets the initial page scale. This overrides initial scale set by
72 // the meta viewport tag. 75 // the meta viewport tag.
73 void SetInitialPageScale(double page_scale_factor); 76 void SetInitialPageScale(double page_scale_factor);
74 void SetBackgroundColor(SkColor c); 77 void SetBackgroundColor(SkColor c);
75 void SetJsOnlineProperty(bool network_up); 78 void SetJsOnlineProperty(bool network_up);
76 79
77 private: 80 private:
78 // content::WebContentsObserver implementation. 81 // content::WebContentsObserver implementation.
(...skipping 22 matching lines...) Expand all
101 AwHitTestData last_hit_test_data_; 104 AwHitTestData last_hit_test_data_;
102 105
103 bool has_new_hit_test_data_; 106 bool has_new_hit_test_data_;
104 107
105 DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt); 108 DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt);
106 }; 109 };
107 110
108 } // namespace android_webview 111 } // namespace android_webview
109 112
110 #endif // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 113 #endif // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/renderer_host/aw_render_view_host_ext.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698