diff options
| author | powei@chromium.org <powei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 03:34:14 +0000 |
|---|---|---|
| committer | powei@chromium.org <powei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 03:34:14 +0000 |
| commit | 741fba42846459cbecdeb933f98e74bffdc0e306 (patch) | |
| tree | 318ace136ecc0ef477c912cb8e98352a6e45e665 /cc/test/fake_scoped_ui_resource.h | |
| parent | 0dff241faa6cc89083d24f6443cf03695e64f1e4 (diff) | |
| download | chromium_src-741fba42846459cbecdeb933f98e74bffdc0e306.zip chromium_src-741fba42846459cbecdeb933f98e74bffdc0e306.tar.gz chromium_src-741fba42846459cbecdeb933f98e74bffdc0e306.tar.bz2 | |
Update the nine patch layer to use UI resources
The old nine-patch layer used priority resource manager for requesting textures.
This patch updates the nine-patch layer to use the UI resource manager.
this patch clarifies the semantics of the aperture in both image and layer
The new semantics corresponds to existing logic on the android-side.
Changes have been made to UIResourceBitmap to use SkPixelRef as ref-counted
of the bitmap content.
The android-side changes:
https://gerrit-int.chromium.org/#/c/43103/
[Update 8/13/2013] Reverted due to "regression"
( https://code.google.com/p/chromium/issues/detail?id=290215 ):
https://codereview.chromium.org/23620047/
[Update 8/13/2013] Reverted due to failed mac_gpu bot:
https://codereview.chromium.org/23740010/
BUG=276482,276487,290215
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=222732
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=223162
Review URL: https://chromiumcodereview.appspot.com/22870016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_scoped_ui_resource.h')
| -rw-r--r-- | cc/test/fake_scoped_ui_resource.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/test/fake_scoped_ui_resource.h b/cc/test/fake_scoped_ui_resource.h index 84c097f..970d7b0 100644 --- a/cc/test/fake_scoped_ui_resource.h +++ b/cc/test/fake_scoped_ui_resource.h @@ -16,9 +16,8 @@ class FakeScopedUIResource : public ScopedUIResource { public: static scoped_ptr<FakeScopedUIResource> Create(LayerTreeHost* host); - virtual scoped_refptr<UIResourceBitmap> GetBitmap( - UIResourceId uid, - bool resource_lost) OVERRIDE; + virtual UIResourceBitmap GetBitmap(UIResourceId uid, + bool resource_lost) OVERRIDE; void ResetCounters(); int resource_create_count; |