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

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/LayerTextureUpdater.h ('k') | Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -34,6 +34,7 @@

#include "LayerTextureUpdater.h"

#include "PlatformCanvas.h"

#include <wtf/PassOwnPtr.h>

+#include <wtf/PassRefPtr.h>

#if USE(SKIA)

#include "SkPicture.h"

@@ -50,7 +51,6 @@

// A LayerTextureUpdater with an internal canvas.

class LayerTextureUpdaterCanvas : public LayerTextureUpdater {

- WTF_MAKE_NONCOPYABLE(LayerTextureUpdaterCanvas);

protected:

explicit LayerTextureUpdaterCanvas(PassOwnPtr<LayerPainterChromium>);

@@ -65,9 +65,8 @@

// A LayerTextureUpdater with an internal bitmap canvas.

class LayerTextureUpdaterBitmap : public LayerTextureUpdaterCanvas {

- WTF_MAKE_NONCOPYABLE(LayerTextureUpdaterBitmap);

public:

- static PassOwnPtr<LayerTextureUpdaterBitmap> create(PassOwnPtr<LayerPainterChromium>, bool useMapTexSubImage);

+ static PassRefPtr<LayerTextureUpdaterBitmap> create(PassOwnPtr<LayerPainterChromium>, bool useMapTexSubImage);

virtual Orientation orientation() { return LayerTextureUpdater::BottomUpOrientation; }

virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat);

@@ -82,9 +81,8 @@

#if USE(SKIA)

class LayerTextureUpdaterSkPicture : public LayerTextureUpdaterCanvas {

- WTF_MAKE_NONCOPYABLE(LayerTextureUpdaterSkPicture);

public:

- static PassOwnPtr<LayerTextureUpdaterSkPicture> create(PassOwnPtr<LayerPainterChromium>);

+ static PassRefPtr<LayerTextureUpdaterSkPicture> create(PassOwnPtr<LayerPainterChromium>);

virtual ~LayerTextureUpdaterSkPicture();

virtual Orientation orientation() { return LayerTextureUpdater::TopDownOrientation; }