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

Unified Diff: cc/trees/layer_tree_host.cc

Issue 838603002: Remove support for custom overscroll background (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase (for real) Created 5 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
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host.cc
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index b6e64730ef2cebcc6662fa25ceee2c0d7edc300c..57c6b81a8d05ab0ab7befb1d4f640a65ef14f375 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -183,8 +183,6 @@ void LayerTreeHost::InitializeProxy(scoped_ptr<Proxy> proxy) {
LayerTreeHost::~LayerTreeHost() {
TRACE_EVENT0("cc", "LayerTreeHost::~LayerTreeHost");
- overhang_ui_resource_ = nullptr;
-
if (root_layer_.get())
root_layer_->SetLayerTreeHost(NULL);
@@ -360,11 +358,6 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
sync_tree->set_ui_resource_request_queue(ui_resource_request_queue_);
ui_resource_request_queue_.clear();
}
- if (overhang_ui_resource_) {
- host_impl->SetOverhangUIResource(
- overhang_ui_resource_->id(),
- GetUIResourceSize(overhang_ui_resource_->id()));
- }
DCHECK(!sync_tree->ViewportSizeInvalid());
@@ -715,23 +708,6 @@ void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor,
SetNeedsCommit();
}
-void LayerTreeHost::SetOverhangBitmap(const SkBitmap& bitmap) {
- DCHECK(bitmap.width() && bitmap.height());
- DCHECK_EQ(bitmap.bytesPerPixel(), 4);
-
- SkBitmap bitmap_copy;
- if (bitmap.isImmutable()) {
- bitmap_copy = bitmap;
- } else {
- bitmap.copyTo(&bitmap_copy);
- bitmap_copy.setImmutable();
- }
-
- UIResourceBitmap overhang_bitmap(bitmap_copy);
- overhang_bitmap.SetWrapMode(UIResourceBitmap::REPEAT);
- overhang_ui_resource_ = ScopedUIResource::Create(this, overhang_bitmap);
-}
-
void LayerTreeHost::SetVisible(bool visible) {
if (visible_ == visible)
return;
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698