Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h - Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h

Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 4 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 unified diff | Download patch

« no previous file with comments | « Source/WebCore/page/Page.cpp ('k') | Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2010 Google Inc. All rights reserved.	2 * Copyright (C) 2010 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42	42

43 // A layer containing an accelerated 2d canvas	43 // A layer containing an accelerated 2d canvas

44 class Canvas2DLayerChromium : public CanvasLayerChromium {	44 class Canvas2DLayerChromium : public CanvasLayerChromium {

45 public:	45 public:

46 static PassRefPtr<Canvas2DLayerChromium> create(DrawingBuffer, GraphicsLaye rChromium owner);	46 static PassRefPtr<Canvas2DLayerChromium> create(DrawingBuffer, GraphicsLaye rChromium owner);

47 virtual ~Canvas2DLayerChromium();	47 virtual ~Canvas2DLayerChromium();

48 virtual bool drawsContent() const;	48 virtual bool drawsContent() const;

49 virtual void updateCompositorResources();	49 virtual void updateCompositorResources();

50	50

51 void setTextureChanged();	51 void setTextureChanged();

52 unsigned textureId() const;	52 virtual unsigned textureId() const;

53 void setDrawingBuffer(DrawingBuffer*);	53 void setDrawingBuffer(DrawingBuffer*);

54	54

55 virtual void setLayerRenderer(LayerRendererChromium*);	55 virtual void setLayerRenderer(LayerRendererChromium*);

56	56

57 private:	57 private:

58 explicit Canvas2DLayerChromium(DrawingBuffer, GraphicsLayerChromium owner) ;	58 explicit Canvas2DLayerChromium(DrawingBuffer, GraphicsLayerChromium owner) ;

59 DrawingBuffer* m_drawingBuffer;	59 DrawingBuffer* m_drawingBuffer;

60 };	60 };

61	61

62 }	62 }

63 #endif // USE(ACCELERATED_COMPOSITING)	63 #endif // USE(ACCELERATED_COMPOSITING)

64	64

65 #endif	65 #endif

OLD	NEW