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

Unified Diff: ui/android/resources/ui_resource_provider.cc

Issue 1371523003: Android: Don't destroy LayerTreeHost when Surface goes away (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « ui/android/resources/ui_resource_provider.h ('k') | ui/android/ui_android.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/resources/ui_resource_provider.cc
diff --git a/ui/android/resources/ui_resource_provider.cc b/ui/android/resources/ui_resource_provider.cc
deleted file mode 100644
index f9776b890148d7d63f0bcdaa0e886a58e77576c1..0000000000000000000000000000000000000000
--- a/ui/android/resources/ui_resource_provider.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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 "ui/android/resources/ui_resource_provider.h"
-
-#include "cc/resources/ui_resource_client.h"
-#include "cc/trees/layer_tree_host.h"
-#include "ui/android/resources/ui_resource_client_android.h"
-
-namespace ui {
-
-UIResourceProvider::UIResourceProvider()
- : host_(NULL), supports_etc1_npot_(false) {
-}
-
-UIResourceProvider::~UIResourceProvider() {
- SetLayerTreeHost(NULL);
-}
-
-void UIResourceProvider::SetLayerTreeHost(cc::LayerTreeHost* host) {
- if (host_ == host)
- return;
- host_ = host;
- UIResourcesAreInvalid();
-}
-
-void UIResourceProvider::UIResourcesAreInvalid() {
- UIResourceClientMap client_map;
- client_map.swap(ui_resource_client_map_);
- for (UIResourceClientMap::iterator iter = client_map.begin();
- iter != client_map.end(); iter++) {
- iter->second->UIResourceIsInvalid();
- }
-}
-
-cc::UIResourceId UIResourceProvider::CreateUIResource(
- ui::UIResourceClientAndroid* client) {
- if (!host_)
- return 0;
- cc::UIResourceId id = host_->CreateUIResource(client);
- DCHECK(ui_resource_client_map_.find(id) == ui_resource_client_map_.end());
-
- ui_resource_client_map_[id] = client;
- return id;
-}
-
-void UIResourceProvider::DeleteUIResource(cc::UIResourceId ui_resource_id) {
- UIResourceClientMap::iterator iter =
- ui_resource_client_map_.find(ui_resource_id);
- DCHECK(iter != ui_resource_client_map_.end());
-
- ui_resource_client_map_.erase(iter);
-
- if (!host_)
- return;
- host_->DeleteUIResource(ui_resource_id);
-}
-
-bool UIResourceProvider::SupportsETC1NonPowerOfTwo() const {
- return supports_etc1_npot_;
-}
-
-} // namespace ui
« no previous file with comments | « ui/android/resources/ui_resource_provider.h ('k') | ui/android/ui_android.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698