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

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

Issue 383303004: Added more detailed result codes for CreateViewCommandBuffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Deleted commented-out code from test. Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/render_thread_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_THREAD_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/memory_pressure_listener.h" 12 #include "base/memory/memory_pressure_listener.h"
13 #include "base/metrics/user_metrics_action.h" 13 #include "base/metrics/user_metrics_action.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/threading/thread_checker.h" 16 #include "base/threading/thread_checker.h"
17 #include "base/timer/timer.h" 17 #include "base/timer/timer.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "content/child/child_thread.h" 19 #include "content/child/child_thread.h"
20 #include "content/common/content_export.h" 20 #include "content/common/content_export.h"
21 #include "content/common/gpu/client/gpu_channel_host.h" 21 #include "content/common/gpu/client/gpu_channel_host.h"
22 #include "content/common/gpu/gpu_result_codes.h"
22 #include "content/public/renderer/render_thread.h" 23 #include "content/public/renderer/render_thread.h"
23 #include "net/base/network_change_notifier.h" 24 #include "net/base/network_change_notifier.h"
24 #include "third_party/WebKit/public/platform/WebConnectionType.h" 25 #include "third_party/WebKit/public/platform/WebConnectionType.h"
25 #include "ui/gfx/native_widget_types.h" 26 #include "ui/gfx/native_widget_types.h"
26 27
27 #if defined(OS_MACOSX) 28 #if defined(OS_MACOSX)
28 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" 29 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h"
29 #endif 30 #endif
30 31
31 class GrContext; 32 class GrContext;
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 private: 409 private:
409 // ChildThread 410 // ChildThread
410 virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE; 411 virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
411 412
412 // GpuChannelHostFactory implementation: 413 // GpuChannelHostFactory implementation:
413 virtual bool IsMainThread() OVERRIDE; 414 virtual bool IsMainThread() OVERRIDE;
414 virtual base::MessageLoop* GetMainLoop() OVERRIDE; 415 virtual base::MessageLoop* GetMainLoop() OVERRIDE;
415 virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() OVERRIDE; 416 virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() OVERRIDE;
416 virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory( 417 virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory(
417 size_t size) OVERRIDE; 418 size_t size) OVERRIDE;
418 virtual bool CreateViewCommandBuffer( 419 virtual CreateCommandBufferResult CreateViewCommandBuffer(
419 int32 surface_id, 420 int32 surface_id,
420 const GPUCreateCommandBufferConfig& init_params, 421 const GPUCreateCommandBufferConfig& init_params,
421 int32 route_id) OVERRIDE; 422 int32 route_id) OVERRIDE;
422 virtual void CreateImage( 423 virtual void CreateImage(
423 gfx::PluginWindowHandle window, 424 gfx::PluginWindowHandle window,
424 int32 image_id, 425 int32 image_id,
425 const CreateImageCallback& callback) OVERRIDE; 426 const CreateImageCallback& callback) OVERRIDE;
426 virtual void DeleteImage(int32 image_id, int32 sync_point) OVERRIDE; 427 virtual void DeleteImage(int32 image_id, int32 sync_point) OVERRIDE;
427 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( 428 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
428 size_t width, 429 size_t width,
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 bool is_one_copy_enabled_; 582 bool is_one_copy_enabled_;
582 583
583 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; 584 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_;
584 585
585 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); 586 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
586 }; 587 };
587 588
588 } // namespace content 589 } // namespace content
589 590
590 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ 591 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698