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

Issue 10633016: Merge r120507 to chromium 1132 branch. (Closed)

Created:
8 years, 6 months ago by jamesr
Modified:
8 years, 4 months ago
Reviewers:
CC:
chromium-reviews
Visibility:
Public.

Description

Merge r120507 to chromium 1132 branch. [chromium] Use SkBitmap in ImageLayerChromium https://bugs.webkit.org/show_bug.cgi?id=89134 Reviewed by Adrienne Walker. GraphicsLayer::setContentsToImage(Image*) is called whenever an image layer's image is or might have changed. In Chromium, this used to hang on to a RefPtr<WebCore::Image> until the compositor was ready to upload texture contents. This is potentially a bit fishy since the Image itself might not be in exactly the same state when we get around to uploading textures and it also creates a bad dependency from ImageLayerChromium on WebCore::Image. This patch grabs the underlying SkBitmap in the setContentsTo call and passes that into ImageLayerChromium instead. I've also removed the venerable but redundant PlatformImage concept since all of chromium's images are skia bitmaps these days. Covered by existing tests, particularly compositing/images/ and compositing/color-matching/. * WebCore.gypi: * platform/graphics/chromium/GraphicsLayerChromium.cpp: (WebCore::GraphicsLayerChromium::setContentsToImage): * platform/graphics/chromium/ImageLayerChromium.cpp: (WebCore::ImageLayerTextureUpdater::updateTextureRect): (WebCore::ImageLayerTextureUpdater::setBitmap): (ImageLayerTextureUpdater): (WebCore::ImageLayerChromium::ImageLayerChromium): (WebCore::ImageLayerChromium::setBitmap): (WebCore::ImageLayerChromium::update): (WebCore::ImageLayerChromium::contentBounds): (WebCore::ImageLayerChromium::drawsContent): * platform/graphics/chromium/ImageLayerChromium.h: (ImageLayerChromium): * platform/graphics/chromium/PlatformImage.cpp: Removed. * platform/graphics/chromium/PlatformImage.h: Removed. TBR=jamesr@chromium.org BUG=124321

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+21 lines, -204 lines) Patch
M WebCore/WebCore.gypi View 1 chunk +0 lines, -2 lines 0 comments Download
M WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp View 2 chunks +3 lines, -1 line 0 comments Download
M WebCore/platform/graphics/chromium/ImageLayerChromium.h View 3 chunks +3 lines, -5 lines 0 comments Download
M WebCore/platform/graphics/chromium/ImageLayerChromium.cpp View 6 chunks +15 lines, -32 lines 0 comments Download
D WebCore/platform/graphics/chromium/PlatformImage.h View 1 chunk +0 lines, -53 lines 0 comments Download
D WebCore/platform/graphics/chromium/PlatformImage.cpp View 1 chunk +0 lines, -111 lines 0 comments Download

Powered by Google App Engine
This is Rietveld 408576698