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

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

Issue 345823002: Move ownership of ChildFrameCompositingHelper from frame to proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Ken's review and fix for Android. Created 6 years, 6 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
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 13 matching lines...) Expand all
24 #include "third_party/WebKit/public/web/WebDataSource.h" 24 #include "third_party/WebKit/public/web/WebDataSource.h"
25 #include "third_party/WebKit/public/web/WebFrameClient.h" 25 #include "third_party/WebKit/public/web/WebFrameClient.h"
26 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" 26 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
27 #include "ui/gfx/range/range.h" 27 #include "ui/gfx/range/range.h"
28 28
29 #if defined(OS_ANDROID) 29 #if defined(OS_ANDROID)
30 #include "content/renderer/media/android/renderer_media_player_manager.h" 30 #include "content/renderer/media/android/renderer_media_player_manager.h"
31 #endif 31 #endif
32 32
33 class TransportDIB; 33 class TransportDIB;
34 struct FrameMsg_BuffersSwapped_Params;
35 struct FrameMsg_CompositorFrameSwapped_Params;
36 struct FrameMsg_Navigate_Params; 34 struct FrameMsg_Navigate_Params;
37 35
38 namespace blink { 36 namespace blink {
39 class WebGeolocationClient; 37 class WebGeolocationClient;
40 class WebInputEvent; 38 class WebInputEvent;
41 class WebMouseEvent; 39 class WebMouseEvent;
42 class WebContentDecryptionModule; 40 class WebContentDecryptionModule;
43 class WebMediaPlayer; 41 class WebMediaPlayer;
44 class WebNotificationPresenter; 42 class WebNotificationPresenter;
45 class WebSecurityOrigin; 43 class WebSecurityOrigin;
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 // Gets the focused element. If no such element exists then the element will 423 // Gets the focused element. If no such element exists then the element will
426 // be NULL. 424 // be NULL.
427 blink::WebElement GetFocusedElement(); 425 blink::WebElement GetFocusedElement();
428 426
429 // IPC message handlers ------------------------------------------------------ 427 // IPC message handlers ------------------------------------------------------
430 // 428 //
431 // The documentation for these functions should be in 429 // The documentation for these functions should be in
432 // content/common/*_messages.h for the message that the function is handling. 430 // content/common/*_messages.h for the message that the function is handling.
433 void OnBeforeUnload(); 431 void OnBeforeUnload();
434 void OnSwapOut(int proxy_routing_id); 432 void OnSwapOut(int proxy_routing_id);
435 void OnChildFrameProcessGone();
436 void OnBuffersSwapped(const FrameMsg_BuffersSwapped_Params& params);
437 void OnCompositorFrameSwapped(const IPC::Message& message);
438 void OnShowContextMenu(const gfx::Point& location); 433 void OnShowContextMenu(const gfx::Point& location);
439 void OnContextMenuClosed(const CustomContextMenuContext& custom_context); 434 void OnContextMenuClosed(const CustomContextMenuContext& custom_context);
440 void OnCustomContextMenuAction(const CustomContextMenuContext& custom_context, 435 void OnCustomContextMenuAction(const CustomContextMenuContext& custom_context,
441 unsigned action); 436 unsigned action);
442 void OnUndo(); 437 void OnUndo();
443 void OnRedo(); 438 void OnRedo();
444 void OnCut(); 439 void OnCut();
445 void OnCopy(); 440 void OnCopy();
446 void OnPaste(); 441 void OnPaste();
447 void OnPasteAndMatchStyle(); 442 void OnPasteAndMatchStyle();
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 ScreenOrientationDispatcher* screen_orientation_dispatcher_; 633 ScreenOrientationDispatcher* screen_orientation_dispatcher_;
639 634
640 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 635 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
641 636
642 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 637 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
643 }; 638 };
644 639
645 } // namespace content 640 } // namespace content
646 641
647 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 642 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698