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

Side by Side Diff: components/plugins/renderer/webview_plugin.h

Issue 2389493002: Revert of Require WebLocalFrame to be created with a non-null client (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « no previous file | components/plugins/renderer/webview_plugin.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_ 5 #ifndef COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_
6 #define COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_ 6 #define COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_
7 7
8 #include <list> 8 #include <list>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 Delegate* delegate_; 147 Delegate* delegate_;
148 148
149 blink::WebCursorInfo current_cursor_; 149 blink::WebCursorInfo current_cursor_;
150 150
151 // Owns us. 151 // Owns us.
152 blink::WebPluginContainer* container_; 152 blink::WebPluginContainer* container_;
153 153
154 // Owned by us, deleted via |close()|. 154 // Owned by us, deleted via |close()|.
155 blink::WebView* web_view_; 155 blink::WebView* web_view_;
156 156
157 // Owned by us, deleted via |close()|.
158 blink::WebFrameWidget* web_frame_widget_;
159
160 // Owned by us, deleted via |close()|.
161 blink::WebFrame* web_frame_;
157 gfx::Rect rect_; 162 gfx::Rect rect_;
158 163
159 blink::WebString old_title_; 164 blink::WebString old_title_;
160 bool focused_; 165 bool focused_;
161 bool is_painting_; 166 bool is_painting_;
162 bool is_resizing_; 167 bool is_resizing_;
163 168
164 // A helper needed to create a WebLocalFrame. 169 // A helper needed to create a WebLocalFrame.
165 class PluginWebFrameClient : public blink::WebFrameClient { 170 class PluginWebFrameClient : public blink::WebFrameClient {
166 public: 171 public:
167 PluginWebFrameClient(WebViewPlugin* plugin) : plugin_(plugin) {} 172 PluginWebFrameClient(WebViewPlugin* plugin) : plugin_(plugin) {}
168 ~PluginWebFrameClient() override {} 173 ~PluginWebFrameClient() override {}
169 void didClearWindowObject(blink::WebLocalFrame* frame) override; 174 void didClearWindowObject(blink::WebLocalFrame* frame) override;
170 175
171 private: 176 private:
172 WebViewPlugin* plugin_; 177 WebViewPlugin* plugin_;
173 }; 178 };
174 PluginWebFrameClient web_frame_client_; 179 PluginWebFrameClient web_frame_client_;
175 180
176 // Should be invalidated when destroy() is called. 181 // Should be invalidated when destroy() is called.
177 base::WeakPtrFactory<WebViewPlugin> weak_factory_; 182 base::WeakPtrFactory<WebViewPlugin> weak_factory_;
178 }; 183 };
179 184
180 #endif // COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_ 185 #endif // COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_
OLDNEW
« no previous file with comments | « no previous file | components/plugins/renderer/webview_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698