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

Side by Side Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 2649553003: gpu: merge gpu/ipc/host/gpu_memory_buffer_support.cc to gpu/ipc/common/
Patch Set: fix bot failure Created 3 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/browser/compositor/gpu_process_transport_factory.h" 5 #include "content/browser/compositor/gpu_process_transport_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 29 matching lines...) Expand all
40 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 40 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
41 #include "content/browser/gpu/gpu_data_manager_impl.h" 41 #include "content/browser/gpu/gpu_data_manager_impl.h"
42 #include "content/browser/renderer_host/render_widget_host_impl.h" 42 #include "content/browser/renderer_host/render_widget_host_impl.h"
43 #include "content/common/host_shared_bitmap_manager.h" 43 #include "content/common/host_shared_bitmap_manager.h"
44 #include "content/public/common/content_switches.h" 44 #include "content/public/common/content_switches.h"
45 #include "gpu/GLES2/gl2extchromium.h" 45 #include "gpu/GLES2/gl2extchromium.h"
46 #include "gpu/command_buffer/client/gles2_interface.h" 46 #include "gpu/command_buffer/client/gles2_interface.h"
47 #include "gpu/command_buffer/client/shared_memory_limits.h" 47 #include "gpu/command_buffer/client/shared_memory_limits.h"
48 #include "gpu/command_buffer/common/mailbox.h" 48 #include "gpu/command_buffer/common/mailbox.h"
49 #include "gpu/ipc/client/gpu_channel_host.h" 49 #include "gpu/ipc/client/gpu_channel_host.h"
50 #include "gpu/ipc/host/gpu_memory_buffer_support.h" 50 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
51 #include "services/service_manager/runner/common/client_util.h" 51 #include "services/service_manager/runner/common/client_util.h"
52 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" 52 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
53 #include "third_party/khronos/GLES2/gl2.h" 53 #include "third_party/khronos/GLES2/gl2.h"
54 #include "ui/compositor/compositor.h" 54 #include "ui/compositor/compositor.h"
55 #include "ui/compositor/compositor_constants.h" 55 #include "ui/compositor/compositor_constants.h"
56 #include "ui/compositor/compositor_switches.h" 56 #include "ui/compositor/compositor_switches.h"
57 #include "ui/compositor/layer.h" 57 #include "ui/compositor/layer.h"
58 #include "ui/display/types/display_snapshot.h" 58 #include "ui/display/types/display_snapshot.h"
59 #include "ui/gfx/geometry/size.h" 59 #include "ui/gfx/geometry/size.h"
60 #include "ui/gfx/switches.h" 60 #include "ui/gfx/switches.h"
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 shared_vulkan_context_provider_ = 922 shared_vulkan_context_provider_ =
923 cc::VulkanInProcessContextProvider::Create(); 923 cc::VulkanInProcessContextProvider::Create();
924 } 924 }
925 925
926 shared_vulkan_context_provider_initialized_ = true; 926 shared_vulkan_context_provider_initialized_ = true;
927 } 927 }
928 return shared_vulkan_context_provider_; 928 return shared_vulkan_context_provider_;
929 } 929 }
930 930
931 } // namespace content 931 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/browser_gpu_memory_buffer_manager.h » ('j') | gpu/ipc/common/gpu_memory_buffer_support.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698