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

Unified Diff: ui/accelerated_widget_mac/ca_layer_tree_mac.mm

Issue 1901253002: Mac: Towards moving CALayerTree to the browser proc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove BUILD.gn Created 4 years, 8 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: ui/accelerated_widget_mac/ca_layer_tree_mac.mm
diff --git a/gpu/ipc/service/ca_layer_tree_mac.mm b/ui/accelerated_widget_mac/ca_layer_tree_mac.mm
similarity index 99%
rename from gpu/ipc/service/ca_layer_tree_mac.mm
rename to ui/accelerated_widget_mac/ca_layer_tree_mac.mm
index 8acf01dd34e2b047a0060ceeb8aca5e4fac3ff40..b7cf5e5e47429f66a6a73c0562e70cdd6cc89224 100644
--- a/gpu/ipc/service/ca_layer_tree_mac.mm
+++ b/ui/accelerated_widget_mac/ca_layer_tree_mac.mm
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "gpu/ipc/service/ca_layer_tree_mac.h"
+#include "ui/accelerated_widget_mac/ca_layer_tree_mac.h"
#include <AVFoundation/AVFoundation.h>
#include <CoreMedia/CoreMedia.h>
#include <CoreVideo/CoreVideo.h>
+#include <GLES2/gl2extchromium.h>
#include "base/command_line.h"
#include "base/mac/sdk_forward_declarations.h"
#include "base/trace_event/trace_event.h"
-#include "gpu/GLES2/gl2extchromium.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/cocoa/animation_utils.h"
#include "ui/base/ui_base_switches.h"
@@ -44,7 +44,7 @@ extern CFStringRef const kCMSampleAttachmentKey_DisplayImmediately;
extern const CMTime kCMTimeInvalid;
#endif // MAC_OS_X_VERSION_10_8
-namespace gpu {
+namespace ui {
namespace {
@@ -568,4 +568,4 @@ void CALayerTree::ContentLayer::CommitToCA(CALayer* superlayer,
}
}
-} // namespace gpu
+} // namespace ui
« no previous file with comments | « ui/accelerated_widget_mac/ca_layer_tree_mac.h ('k') | ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698