WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp - Issue 10633016: Merge r120507 to chromium 1132 branch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

Issue 10633016: Merge r120507 to chromium 1132 branch. (Closed) Base URL: svn://svn.chromium.org/webkit-readonly/branches/chromium/1132/Source/

Patch Set: Created 8 years, 6 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:

Index: WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

===================================================================

--- WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (revision 120960)

+++ WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (working copy)

@@ -52,6 +52,7 @@

#include "Image.h"

#include "ImageLayerChromium.h"

#include "LayerChromium.h"

+#include "NativeImageSkia.h"

#include "PlatformString.h"

#include "SystemTime.h"

@@ -365,7 +366,8 @@

childrenChanged = true;

}

ImageLayerChromium* imageLayer = static_cast<ImageLayerChromium*>(m_contentsLayer.get());

- imageLayer->setContents(image);

+ NativeImageSkia* nativeImage = image->nativeImageForCurrentFrame();

+ imageLayer->setBitmap(nativeImage->bitmap());

imageLayer->setOpaque(image->isBitmapImage() && !image->currentFrameHasAlpha());

updateContentsRect();

} else {

« no previous file with comments | « WebCore/WebCore.gypi ('k') | WebCore/platform/graphics/chromium/ImageLayerChromium.h » ('j') | no next file with comments »