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

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 140753005: Add the UI compositor to the Mac build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/aura/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
similarity index 95%
rename from content/browser/aura/gpu_process_transport_factory.cc
rename to content/browser/compositor/gpu_process_transport_factory.cc
index 8250d47e1c72e984290f8ee57fb6978fc145472f..b6e8cbfc5a6a05fa59b0ac59fe0e2569ce4ab551 100644
--- a/content/browser/aura/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/aura/gpu_process_transport_factory.h"
+#include "content/browser/compositor/gpu_process_transport_factory.h"
#include <string>
@@ -13,11 +13,11 @@
#include "base/metrics/histogram.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/output_surface.h"
-#include "content/browser/aura/browser_compositor_output_surface.h"
-#include "content/browser/aura/browser_compositor_output_surface_proxy.h"
-#include "content/browser/aura/gpu_browser_compositor_output_surface.h"
-#include "content/browser/aura/reflector_impl.h"
-#include "content/browser/aura/software_browser_compositor_output_surface.h"
+#include "content/browser/compositor/browser_compositor_output_surface.h"
+#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
+#include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
+#include "content/browser/compositor/reflector_impl.h"
+#include "content/browser/compositor/software_browser_compositor_output_surface.h"
#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
#include "content/browser/gpu/gpu_data_manager_impl.h"
#include "content/browser/gpu/gpu_surface_tracker.h"
@@ -36,12 +36,12 @@
#include "ui/gfx/size.h"
#if defined(OS_WIN)
-#include "content/browser/aura/software_output_device_win.h"
+#include "content/browser/compositor/software_output_device_win.h"
#include "ui/surface/accelerated_surface_win.h"
#elif defined(USE_OZONE)
-#include "content/browser/aura/software_output_device_ozone.h"
+#include "content/browser/compositor/software_output_device_ozone.h"
#elif defined(USE_X11)
-#include "content/browser/aura/software_output_device_x11.h"
+#include "content/browser/compositor/software_output_device_x11.h"
#endif
using cc::ContextProvider;
« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.h ('k') | content/browser/compositor/image_transport_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698