diff options
Diffstat (limited to 'content')
6 files changed, 8 insertions, 30 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index b074f06..481be2d 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -125,6 +125,7 @@ void AcceleratedSurfaceBuffersSwappedCompletedForGPU(int host_id, } } +#if defined(OS_WIN) // This sends a ViewMsg_SwapBuffers_ACK directly to the renderer process // (RenderWidget). This path is currently not used with the threaded compositor. void AcceleratedSurfaceBuffersSwappedCompletedForRenderer( @@ -167,6 +168,7 @@ void AcceleratedSurfaceBuffersSwappedCompleted(int host_id, AcceleratedSurfaceBuffersSwappedCompletedForRenderer(surface_id, timebase, interval); } +#endif // defined(OS_WIN) } // anonymous namespace @@ -663,7 +665,6 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped( #endif // OS_MACOSX #if defined(OS_WIN) - void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped( const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) { TRACE_EVENT0("gpu", "GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped"); diff --git a/content/browser/renderer_host/gesture_event_filter.cc b/content/browser/renderer_host/gesture_event_filter.cc index 7e0c6e4..af331c3 100644 --- a/content/browser/renderer_host/gesture_event_filter.cc +++ b/content/browser/renderer_host/gesture_event_filter.cc @@ -50,16 +50,6 @@ static int GetTapDownDeferralTimeMs() { switches::kTapDownDeferralTimeMs); return tap_down_deferral_time_window; } - - -// TODO(rjkroege): Coalesce pinch updates. -// Returns |true| if two gesture events should be coalesced. -bool ShouldCoalesceGestureEvents(const WebKit::WebGestureEvent& last_event, - const WebKit::WebGestureEvent& new_event) { - return new_event.type == WebInputEvent::GestureScrollUpdate && - last_event.type == new_event.type && - last_event.modifiers == new_event.modifiers; -} } // namespace GestureEventFilter::GestureEventFilter(RenderWidgetHostImpl* rwhv) diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc index 0e09eda..14fa05a 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc @@ -44,11 +44,6 @@ static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> > namespace { -void ClearSharedContexts() { - base::AutoLock lock(g_all_shared_contexts_lock.Get()); - g_all_shared_contexts.Pointer()->clear(); -} - void ClearSharedContextsIfInShareSet( WebGraphicsContext3DCommandBufferImpl* context) { // If the given context isn't in the share set, that means that it diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index c60d75c..b1a81f6 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -48,7 +48,9 @@ namespace { void WarmUpSandbox(const content::GPUInfo&, bool); +#if defined(OS_LINUX) void CollectGraphicsInfo(content::GPUInfo*); +#endif } // Main function for starting the Gpu process. @@ -227,6 +229,7 @@ int GpuMain(const content::MainFunctionParams& parameters) { namespace { +#if defined(OS_LINUX) void CreateDummyGlContext() { scoped_refptr<gfx::GLSurface> surface( gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1))); @@ -253,6 +256,7 @@ void CreateDummyGlContext() { VLOG(1) << "gfx::GLContext::MakeCurrent failed"; } } +#endif void WarmUpSandbox(const content::GPUInfo& gpu_info, bool should_initialize_gl_context) { @@ -309,11 +313,13 @@ void WarmUpSandbox(const content::GPUInfo& gpu_info, #endif } +#if defined(OS_LINUX) void CollectGraphicsInfo(content::GPUInfo* gpu_info) { if (!gpu_info_collector::CollectGraphicsInfo(gpu_info)) VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed"; content::GetContentClient()->SetGpuInfo(*gpu_info); } +#endif } // namespace. diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.cc b/content/renderer/browser_plugin/browser_plugin_bindings.cc index 2e6fafc..a9d5bb9 100644 --- a/content/renderer/browser_plugin/browser_plugin_bindings.cc +++ b/content/renderer/browser_plugin/browser_plugin_bindings.cc @@ -110,16 +110,6 @@ std::string StringFromNPVariant(const NPVariant& variant) { return std::string(np_string.UTF8Characters, np_string.UTF8Length); } -string16 String16FromNPVariant(const NPVariant& variant) { - if (!NPVARIANT_IS_STRING(variant)) - return string16(); - const NPString& np_string = NPVARIANT_TO_STRING(variant); - string16 wstr; - if (!UTF8ToUTF16(np_string.UTF8Characters, np_string.UTF8Length, &wstr)) - return string16(); - return wstr; -} - bool StringToNPVariant(const std::string &in, NPVariant *variant) { size_t length = in.size(); NPUTF8 *chars = static_cast<NPUTF8 *>(malloc(length)); diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc index ed7c59e..6716d87 100644 --- a/content/renderer/pepper/pepper_url_request_unittest.cc +++ b/content/renderer/pepper/pepper_url_request_unittest.cc @@ -42,10 +42,6 @@ bool IsExpected(const WebString& web_string, const char* expected) { return IsExpected(web_string.utf8(), expected); } -bool IsNullOrEmpty(const WebString& web_string) { - return web_string.isNull() || web_string.isEmpty(); -} - // The base class destructor is protected, so derive. class TestWebFrameClient : public WebFrameClient { }; |