diff options
author | pasko@chromium.org <pasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 13:21:01 +0000 |
---|---|---|
committer | pasko@chromium.org <pasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 13:21:01 +0000 |
commit | 08f0d1067a3bfec8708c5c0218c37d333f787f1c (patch) | |
tree | e388659905ded56067d9500e7c8685cd56291aa3 /cc/resources | |
parent | 0bf9082d2bece5f81191a1e9cdb66af794157f21 (diff) | |
download | chromium_src-08f0d1067a3bfec8708c5c0218c37d333f787f1c.zip chromium_src-08f0d1067a3bfec8708c5c0218c37d333f787f1c.tar.gz chromium_src-08f0d1067a3bfec8708c5c0218c37d333f787f1c.tar.bz2 |
Revert 248827 "android: Migrate old content readback to use asyn..."
Breaks android ToT, and the pairing change downstream is not ready yet.
> android: Migrate old content readback to use async readback (and delegated renderer)
>
> This patch removes the use of a helper context for content readback. Instead,
> we use the async readback API.
>
> This patch is also setting delegated renderer as the default for android.
>
> android= https://chrome-internal-review.googlesource.com/#/c/152377/
>
> BUG=326363
> TBR=sievers
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/143803004
TBR=powei@chromium.org
Review URL: https://codereview.chromium.org/149653004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources')
-rw-r--r-- | cc/resources/ui_resource_bitmap.cc | 17 | ||||
-rw-r--r-- | cc/resources/ui_resource_bitmap.h | 3 |
2 files changed, 8 insertions, 12 deletions
diff --git a/cc/resources/ui_resource_bitmap.cc b/cc/resources/ui_resource_bitmap.cc index 562e13a..b84eb8e 100644 --- a/cc/resources/ui_resource_bitmap.cc +++ b/cc/resources/ui_resource_bitmap.cc @@ -13,14 +13,14 @@ namespace cc { void UIResourceBitmap::Create(const skia::RefPtr<SkPixelRef>& pixel_ref, - gfx::Size size, UIResourceFormat format) { - DCHECK(size.width()); - DCHECK(size.height()); + const SkImageInfo& info = pixel_ref->info(); + DCHECK(info.fWidth); + DCHECK(info.fHeight); DCHECK(pixel_ref); DCHECK(pixel_ref->isImmutable()); format_ = format; - size_ = size; + size_ = gfx::Size(info.fWidth, info.fHeight); pixel_ref_ = pixel_ref; // Default values for secondary parameters. @@ -34,16 +34,13 @@ UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap) { DCHECK(skbitmap.isImmutable()); skia::RefPtr<SkPixelRef> pixel_ref = skia::SharePtr(skbitmap.pixelRef()); - const SkImageInfo& info = pixel_ref->info(); - Create( - pixel_ref, gfx::Size(info.fWidth, info.fHeight), UIResourceBitmap::RGBA8); + Create(pixel_ref, UIResourceBitmap::RGBA8); SetOpaque(skbitmap.isOpaque()); } -UIResourceBitmap::UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref, - gfx::Size size) { - Create(pixel_ref, size, UIResourceBitmap::ETC1); +UIResourceBitmap::UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref) { + Create(pixel_ref, UIResourceBitmap::ETC1); } UIResourceBitmap::~UIResourceBitmap() {} diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h index 2cce0b3..64e962c 100644 --- a/cc/resources/ui_resource_bitmap.h +++ b/cc/resources/ui_resource_bitmap.h @@ -44,14 +44,13 @@ class CC_EXPORT UIResourceBitmap { // User must ensure that |skbitmap| is immutable. The SkBitmap Format should // be 32-bit RGBA. explicit UIResourceBitmap(const SkBitmap& skbitmap); - UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref, gfx::Size size); + explicit UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref); ~UIResourceBitmap(); private: friend class AutoLockUIResourceBitmap; void Create(const skia::RefPtr<SkPixelRef>& pixel_ref, - gfx::Size size, UIResourceFormat format); skia::RefPtr<SkPixelRef> pixel_ref_; |