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

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

Issue 12211149: Revert 182106 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | « content/renderer/gpu/render_widget_compositor.cc ('k') | content/renderer/render_view_impl.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 CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 const WebKit::WebString& message) OVERRIDE; 721 const WebKit::WebString& message) OVERRIDE;
722 virtual void LoadURLExternally( 722 virtual void LoadURLExternally(
723 WebKit::WebFrame* frame, 723 WebKit::WebFrame* frame,
724 const WebKit::WebURLRequest& request, 724 const WebKit::WebURLRequest& request,
725 WebKit::WebNavigationPolicy policy) OVERRIDE; 725 WebKit::WebNavigationPolicy policy) OVERRIDE;
726 virtual void Repaint(const gfx::Size& size) OVERRIDE; 726 virtual void Repaint(const gfx::Size& size) OVERRIDE;
727 virtual void SetEditCommandForNextKeyEvent(const std::string& name, 727 virtual void SetEditCommandForNextKeyEvent(const std::string& name,
728 const std::string& value) OVERRIDE; 728 const std::string& value) OVERRIDE;
729 virtual void ClearEditCommands() OVERRIDE; 729 virtual void ClearEditCommands() OVERRIDE;
730 virtual SSLStatus GetSSLStatusOfFrame(WebKit::WebFrame* frame) const OVERRIDE; 730 virtual SSLStatus GetSSLStatusOfFrame(WebKit::WebFrame* frame) const OVERRIDE;
731 #if defined(OS_ANDROID)
732 virtual skia::RefPtr<SkPicture> CapturePicture() OVERRIDE;
733 #endif
734 731
735 // webkit_glue::WebPluginPageDelegate implementation ------------------------- 732 // webkit_glue::WebPluginPageDelegate implementation -------------------------
736 733
737 virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate( 734 virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate(
738 const FilePath& file_path, 735 const FilePath& file_path,
739 const std::string& mime_type) OVERRIDE; 736 const std::string& mime_type) OVERRIDE;
740 virtual WebKit::WebPlugin* CreatePluginReplacement( 737 virtual WebKit::WebPlugin* CreatePluginReplacement(
741 const FilePath& file_path) OVERRIDE; 738 const FilePath& file_path) OVERRIDE;
742 virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE; 739 virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
743 virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE; 740 virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 int selection_start, 795 int selection_start,
799 int selection_end) OVERRIDE; 796 int selection_end) OVERRIDE;
800 virtual void OnImeConfirmComposition( 797 virtual void OnImeConfirmComposition(
801 const string16& text, const ui::Range& replacement_range) OVERRIDE; 798 const string16& text, const ui::Range& replacement_range) OVERRIDE;
802 virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; 799 virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE;
803 virtual ui::TextInputType GetTextInputType() OVERRIDE; 800 virtual ui::TextInputType GetTextInputType() OVERRIDE;
804 virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) OVERRIDE; 801 virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) OVERRIDE;
805 virtual void GetCompositionCharacterBounds( 802 virtual void GetCompositionCharacterBounds(
806 std::vector<gfx::Rect>* character_bounds) OVERRIDE; 803 std::vector<gfx::Rect>* character_bounds) OVERRIDE;
807 virtual bool CanComposeInline() OVERRIDE; 804 virtual bool CanComposeInline() OVERRIDE;
808 virtual void DidCommitCompositorFrame() OVERRIDE;
809 805
810 protected: 806 protected:
811 explicit RenderViewImpl(RenderViewImplParams* params); 807 explicit RenderViewImpl(RenderViewImplParams* params);
812 808
813 // Do not delete directly. This class is reference counted. 809 // Do not delete directly. This class is reference counted.
814 virtual ~RenderViewImpl(); 810 virtual ~RenderViewImpl();
815 811
816 private: 812 private:
817 // For unit tests. 813 // For unit tests.
818 friend class ExternalPopupMenuTest; 814 friend class ExternalPopupMenuTest;
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 // use the Observer interface to filter IPC messages and receive frame change 1590 // use the Observer interface to filter IPC messages and receive frame change
1595 // notifications. 1591 // notifications.
1596 // --------------------------------------------------------------------------- 1592 // ---------------------------------------------------------------------------
1597 1593
1598 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1594 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1599 }; 1595 };
1600 1596
1601 } // namespace content 1597 } // namespace content
1602 1598
1603 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1599 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698