Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index e66bd926caa120ba4bdba4ce5d523db9f365493e..2fcaab46b5068d4d30ae6a3080fa0b161d2ffed9 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -63,6 +63,8 @@ |
#include "content/public/renderer/content_renderer_client.h" |
#include "content/public/renderer/render_process_observer.h" |
#include "content/public/renderer/render_view_visitor.h" |
+#include "content/renderer/compositor_bindings/web_external_bitmap_impl.h" |
+#include "content/renderer/compositor_bindings/web_layer_impl.h" |
#include "content/renderer/devtools/devtools_agent_filter.h" |
#include "content/renderer/dom_storage/dom_storage_dispatcher.h" |
#include "content/renderer/dom_storage/webstoragearea_impl.h" |
@@ -121,8 +123,6 @@ |
#include "ui/base/layout.h" |
#include "ui/base/ui_base_switches.h" |
#include "v8/include/v8.h" |
-#include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h" |
-#include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
#if defined(OS_ANDROID) |
#include <cpu-features.h> |
@@ -413,8 +413,7 @@ void RenderThreadImpl::Init() { |
is_impl_side_painting_enabled_ = |
command_line.HasSwitch(switches::kEnableImplSidePainting); |
- webkit::WebLayerImpl::SetImplSidePaintingEnabled( |
- is_impl_side_painting_enabled_); |
+ WebLayerImpl::SetImplSidePaintingEnabled(is_impl_side_painting_enabled_); |
is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy) && |
!command_line.HasSwitch(switches::kDisableZeroCopy); |
@@ -808,7 +807,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() { |
if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) |
ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
- webkit::SetSharedMemoryAllocationFunction(AllocateSharedMemoryFunction); |
+ SetSharedMemoryAllocationFunction(AllocateSharedMemoryFunction); |
// Limit use of the scaled image cache to when deferred image decoding is |
// enabled. |