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

Unified Diff: content/renderer/render_view_impl.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc (revision 182123)
+++ content/renderer/render_view_impl.cc (working copy)
@@ -27,7 +27,6 @@
#include "base/sys_string_conversions.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
-#include "cc/layer_tree_host.h"
#include "cc/output_surface.h"
#include "cc/switches.h"
#include "content/common/appcache/appcache_dispatcher.h"
@@ -182,7 +181,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkPicture.h"
#include "ui/base/ui_base_switches.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
@@ -6618,11 +6616,6 @@
return true;
}
-
-skia::RefPtr<SkPicture> RenderViewImpl::CapturePicture() {
- return compositor_ ? compositor_->layer_tree_host()->capturePicture() :
- skia::RefPtr<SkPicture>();
-}
#endif
void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
@@ -6631,9 +6624,4 @@
RenderProcess::current()->ReleaseTransportDIB(dib);
}
-void RenderViewImpl::DidCommitCompositorFrame() {
- RenderWidget::DidCommitCompositorFrame();
- FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
-}
-
} // namespace content
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698