Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp - Issue 7982004: Merge 95506 - [chromium] ContentLayer's texture updater deleted during paint when compositing tur...

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: Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp

Issue 7982004: Merge 95506 - [chromium] ContentLayer's texture updater deleted during paint when compositing tur... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/

Patch Set: Created 9 years, 3 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 | « Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.h ('k') | Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp

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

--- Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp (revision 95551)

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

@@ -61,9 +61,9 @@

m_contentRect = contentRect;

}

-PassOwnPtr<LayerTextureUpdaterBitmap> LayerTextureUpdaterBitmap::create(PassOwnPtr<LayerPainterChromium> painter, bool useMapTexSubImage)

+PassRefPtr<LayerTextureUpdaterBitmap> LayerTextureUpdaterBitmap::create(PassOwnPtr<LayerPainterChromium> painter, bool useMapTexSubImage)

{

- return adoptPtr(new LayerTextureUpdaterBitmap(painter, useMapTexSubImage));

+ return adoptRef(new LayerTextureUpdaterBitmap(painter, useMapTexSubImage));

}

LayerTextureUpdaterBitmap::LayerTextureUpdaterBitmap(PassOwnPtr<LayerPainterChromium> painter, bool useMapTexSubImage)

@@ -103,9 +103,9 @@

#if !USE(THREADED_COMPOSITING)

#if USE(SKIA)

-PassOwnPtr<LayerTextureUpdaterSkPicture> LayerTextureUpdaterSkPicture::create(PassOwnPtr<LayerPainterChromium> painter)

+PassRefPtr<LayerTextureUpdaterSkPicture> LayerTextureUpdaterSkPicture::create(PassOwnPtr<LayerPainterChromium> painter)

{

- return adoptPtr(new LayerTextureUpdaterSkPicture(painter));

+ return adoptRef(new LayerTextureUpdaterSkPicture(painter));

}

LayerTextureUpdaterSkPicture::LayerTextureUpdaterSkPicture(PassOwnPtr<LayerPainterChromium> painter)