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

Unified Diff: content/browser/renderer_host/compositing_iosurface_context_mac.mm

Issue 490393002: Simplify IOSurface CoreAnimation code: Part 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Lower similarity Created 6 years, 4 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/renderer_host/compositing_iosurface_context_mac.mm
diff --git a/content/browser/renderer_host/compositing_iosurface_context_mac.mm b/content/browser/renderer_host/compositing_iosurface_context_mac.mm
deleted file mode 100644
index 5f0979293b3ce92007d012a36dd041f33e37b4be..0000000000000000000000000000000000000000
--- a/content/browser/renderer_host/compositing_iosurface_context_mac.mm
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) 2013 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/renderer_host/compositing_iosurface_context_mac.h"
-
-#include <OpenGL/gl.h>
-#include <OpenGL/OpenGL.h>
-#include <vector>
-
-#include "base/command_line.h"
-#include "base/debug/trace_event.h"
-#include "base/logging.h"
-#include "content/browser/gpu/gpu_data_manager_impl.h"
-#include "ui/base/ui_base_switches.h"
-#include "ui/gl/gl_switches.h"
-#include "ui/gl/gpu_switching_manager.h"
-
-namespace content {
-
-// static
-scoped_refptr<CompositingIOSurfaceContext>
-CompositingIOSurfaceContext::Get(int window_number) {
- TRACE_EVENT0("browser", "CompositingIOSurfaceContext::Get");
-
- // Return the context for this window_number, if it exists.
- WindowMap::iterator found = window_map()->find(window_number);
- if (found != window_map()->end()) {
- DCHECK(!found->second->poisoned_);
- return found->second;
- }
-
- base::ScopedTypeRef<CGLContextObj> cgl_context_strong;
- CGLContextObj cgl_context = NULL;
- CGLError error = kCGLNoError;
-
- // Create the pixel format object for the context.
- std::vector<CGLPixelFormatAttribute> attribs;
- attribs.push_back(kCGLPFADepthSize);
- attribs.push_back(static_cast<CGLPixelFormatAttribute>(0));
- if (ui::GpuSwitchingManager::GetInstance()->SupportsDualGpus()) {
- attribs.push_back(kCGLPFAAllowOfflineRenderers);
- attribs.push_back(static_cast<CGLPixelFormatAttribute>(1));
- }
- attribs.push_back(static_cast<CGLPixelFormatAttribute>(0));
- GLint number_virtual_screens = 0;
- base::ScopedTypeRef<CGLPixelFormatObj> pixel_format;
- error = CGLChoosePixelFormat(&attribs.front(),
- pixel_format.InitializeInto(),
- &number_virtual_screens);
- if (error != kCGLNoError) {
- LOG(ERROR) << "Failed to create pixel format object.";
- return NULL;
- }
-
- // Create all contexts in the same share group so that the textures don't
- // need to be recreated when transitioning contexts.
- CGLContextObj share_context = NULL;
- if (!window_map()->empty())
- share_context = window_map()->begin()->second->cgl_context();
- error = CGLCreateContext(
- pixel_format, share_context, cgl_context_strong.InitializeInto());
- if (error != kCGLNoError) {
- LOG(ERROR) << "Failed to create context object.";
- return NULL;
- }
- cgl_context = cgl_context_strong;
-
- // Note that VSync is ignored because CoreAnimation will automatically
- // rate limit draws.
-
- return new CompositingIOSurfaceContext(
- window_number,
- cgl_context_strong,
- cgl_context);
-}
-
-void CompositingIOSurfaceContext::PoisonContextAndSharegroup() {
- if (poisoned_)
- return;
-
- for (WindowMap::iterator it = window_map()->begin();
- it != window_map()->end();
- ++it) {
- it->second->poisoned_ = true;
- }
- window_map()->clear();
-}
-
-CompositingIOSurfaceContext::CompositingIOSurfaceContext(
- int window_number,
- base::ScopedTypeRef<CGLContextObj> cgl_context_strong,
- CGLContextObj cgl_context)
- : window_number_(window_number),
- cgl_context_strong_(cgl_context_strong),
- cgl_context_(cgl_context),
- poisoned_(false) {
- DCHECK(window_map()->find(window_number_) == window_map()->end());
- window_map()->insert(std::make_pair(window_number_, this));
-
- GpuDataManager::GetInstance()->AddObserver(this);
-}
-
-CompositingIOSurfaceContext::~CompositingIOSurfaceContext() {
- GpuDataManager::GetInstance()->RemoveObserver(this);
-
- if (!poisoned_) {
- DCHECK(window_map()->find(window_number_) != window_map()->end());
- DCHECK(window_map()->find(window_number_)->second == this);
- window_map()->erase(window_number_);
- } else {
- WindowMap::const_iterator found = window_map()->find(window_number_);
- if (found != window_map()->end())
- DCHECK(found->second != this);
- }
-}
-
-void CompositingIOSurfaceContext::OnGpuSwitching() {
- // Recreate all browser-side GL contexts whenever the GPU switches. If this
- // is not done, performance will suffer.
- // http://crbug.com/361493
- PoisonContextAndSharegroup();
-}
-
-// static
-CompositingIOSurfaceContext::WindowMap*
- CompositingIOSurfaceContext::window_map() {
- return window_map_.Pointer();
-}
-
-// static
-base::LazyInstance<CompositingIOSurfaceContext::WindowMap>
- CompositingIOSurfaceContext::window_map_;
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698