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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 616133002: Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed Created 6 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
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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 // Gets the focused element. If no such element exists then the element will 498 // Gets the focused element. If no such element exists then the element will
499 // be NULL. 499 // be NULL.
500 blink::WebElement GetFocusedElement(); 500 blink::WebElement GetFocusedElement();
501 501
502 // IPC message handlers ------------------------------------------------------ 502 // IPC message handlers ------------------------------------------------------
503 // 503 //
504 // The documentation for these functions should be in 504 // The documentation for these functions should be in
505 // content/common/*_messages.h for the message that the function is handling. 505 // content/common/*_messages.h for the message that the function is handling.
506 void OnBeforeUnload(); 506 void OnBeforeUnload();
507 void OnSwapOut(int proxy_routing_id); 507 void OnSwapOut(int proxy_routing_id);
508 void OnNewWidgetForFrame(int routing_id_for_widget, bool hidden);
508 void OnStop(); 509 void OnStop();
509 void OnShowContextMenu(const gfx::Point& location); 510 void OnShowContextMenu(const gfx::Point& location);
510 void OnContextMenuClosed(const CustomContextMenuContext& custom_context); 511 void OnContextMenuClosed(const CustomContextMenuContext& custom_context);
511 void OnCustomContextMenuAction(const CustomContextMenuContext& custom_context, 512 void OnCustomContextMenuAction(const CustomContextMenuContext& custom_context,
512 unsigned action); 513 unsigned action);
513 void OnUndo(); 514 void OnUndo();
514 void OnRedo(); 515 void OnRedo();
515 void OnCut(); 516 void OnCut();
516 void OnCopy(); 517 void OnCopy();
517 void OnPaste(); 518 void OnPaste();
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 639
639 base::WeakPtr<RenderViewImpl> render_view_; 640 base::WeakPtr<RenderViewImpl> render_view_;
640 int routing_id_; 641 int routing_id_;
641 bool is_swapped_out_; 642 bool is_swapped_out_;
642 // RenderFrameProxy exists only when is_swapped_out_ is true. 643 // RenderFrameProxy exists only when is_swapped_out_ is true.
643 // TODO(nasko): This can be removed once we don't have a swapped out state on 644 // TODO(nasko): This can be removed once we don't have a swapped out state on
644 // RenderFrame. See https://crbug.com/357747. 645 // RenderFrame. See https://crbug.com/357747.
645 RenderFrameProxy* render_frame_proxy_; 646 RenderFrameProxy* render_frame_proxy_;
646 bool is_detaching_; 647 bool is_detaching_;
647 648
649 // Used when the RenderFrame is a root of a connected subtree of local
Charlie Reis 2014/10/02 00:06:57 This still doesn't match my understanding. It sou
kenrb 2014/10/02 20:20:48 Okay, to be graph theoretically precise I think I
650 // frames.
651 scoped_refptr<RenderWidget> render_widget_;
652
648 #if defined(ENABLE_PLUGINS) 653 #if defined(ENABLE_PLUGINS)
649 // Current text input composition text. Empty if no composition is in 654 // Current text input composition text. Empty if no composition is in
650 // progress. 655 // progress.
651 base::string16 pepper_composition_text_; 656 base::string16 pepper_composition_text_;
652 #endif 657 #endif
653 658
654 RendererWebCookieJarImpl cookie_jar_; 659 RendererWebCookieJarImpl cookie_jar_;
655 660
656 // All the registered observers. 661 // All the registered observers.
657 ObserverList<RenderFrameObserver> observers_; 662 ObserverList<RenderFrameObserver> observers_;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 #endif 760 #endif
756 761
757 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 762 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
758 763
759 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 764 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
760 }; 765 };
761 766
762 } // namespace content 767 } // namespace content
763 768
764 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 769 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698