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

Unified Diff: content/renderer/render_widget.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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_widget.cc
===================================================================
--- content/renderer/render_widget.cc (revision 213561)
+++ content/renderer/render_widget.cc (working copy)
@@ -31,6 +31,7 @@
#include "content/renderer/gpu/mailbox_output_surface.h"
#include "content/renderer/gpu/render_widget_compositor.h"
#include "content/renderer/ime_event_guard.h"
+#include "content/renderer/pepper/ppapi_plugin_instance_impl.h"
#include "content/renderer/render_process.h"
#include "content/renderer/render_process_visibility_manager.h"
#include "content/renderer/render_thread_impl.h"
@@ -57,7 +58,6 @@
#include "ui/gfx/skia_util.h"
#include "ui/gl/gl_switches.h"
#include "ui/surface/transport_dib.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
#include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h"
#include "webkit/renderer/cursor_utils.h"
@@ -971,6 +971,7 @@
&optimized_copy_rect,
&dib_scale_factor);
if (optimized_instance) {
+#if defined(ENABLE_PLUGINS)
// This plugin can be optimize-painted and we can just ask it to paint
// itself. We don't actually need the TransportDIB in this case.
//
@@ -1005,6 +1006,7 @@
if (!is_accelerated_compositing_active_)
software_stats_.total_paint_time += paint_time;
}
+#endif
} else {
// Normal painting case.
base::TimeTicks paint_begin_ticks;
« no previous file with comments | « content/renderer/pepper/v8_var_converter_unittest.cc ('k') | content/renderer/render_widget_fullscreen_pepper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698