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

Unified Diff: content/renderer/render_view_impl.h

Issue 10829225: Browser Plugin: Add HTML5-like postMessage support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with ToT. Added subframe targeting + test. Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index bf3aba06a16238e78b2501113b74821a3dd60190..c8609d62fe22ea215ddba3a4539fbead7ace5d01 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -239,6 +239,13 @@ class RenderViewImpl : public RenderWidget,
// May return NULL when the view is closing.
CONTENT_EXPORT WebKit::WebView* webview() const;
+ // If this is a swapped out RenderView, which maintains a copy of the frame
+ // tree of an active RenderView, we keep a map from frame ids in this view to
+ // the frame ids of the active view for each corresponding frame.
+ // This method uses the map to find the frame in this RenderView that
+ // corresponds to the frame in the active RenderView specified by |frame_id|.
+ WebKit::WebFrame* GetFrameByMappedID(int remote_frame_id);
+
// WebGraphicsContext3DSwapBuffersClient implementation.
// Called by a GraphicsContext associated with this view when swapbuffers
@@ -873,6 +880,11 @@ class RenderViewImpl : public RenderWidget,
void UpdateSessionHistory(WebKit::WebFrame* frame);
void SendUpdateState(const WebKit::WebHistoryItem& item);
+ // Update the frame tree.
+ void UpdateFrameTree(int process_id,
+ int route_id,
+ const std::string& frame_tree);
+
// Update current main frame's encoding and send it to browser window.
// Since we want to let users see the right encoding info from menu
// before finishing loading, we call the UpdateEncoding in
@@ -1090,13 +1102,6 @@ class RenderViewImpl : public RenderWidget,
// and added to the DOM.
void CreateFrameTree(WebKit::WebFrame* frame, DictionaryValue* frame_tree);
- // If this is a swapped out RenderView, which maintains a copy of the frame
- // tree of an active RenderView, we keep a map from frame ids in this view to
- // the frame ids of the active view for each corresponding frame.
- // This method uses the map to find the frame in this RenderView that
- // corresponds to the frame in the active RenderView specified by |frame_id|.
- WebKit::WebFrame* GetFrameByMappedID(int frame_id);
-
void EnsureMediaStreamImpl();
// This callback is triggered when DownloadFavicon completes, either

Powered by Google App Engine
This is Rietveld 408576698