Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.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/CanvasLayerChromium.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/platform/graphics/chromium/Canvas2DLayerChromium.cpp ('k') | Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
43 public:	43 public:

44 virtual ~CanvasLayerChromium();	44 virtual ~CanvasLayerChromium();

45	45

46 virtual PassRefPtr<CCLayerImpl> createCCLayerImpl();	46 virtual PassRefPtr<CCLayerImpl> createCCLayerImpl();

47	47

48 virtual void pushPropertiesTo(CCLayerImpl*);	48 virtual void pushPropertiesTo(CCLayerImpl*);

49	49

50 protected:	50 protected:

51 explicit CanvasLayerChromium(GraphicsLayerChromium* owner);	51 explicit CanvasLayerChromium(GraphicsLayerChromium* owner);

52	52

	53 virtual unsigned textureId() const = 0;

53 virtual const char* layerTypeAsString() const { return "CanvasLayer"; }	54 virtual const char* layerTypeAsString() const { return "CanvasLayer"; }

54	55

55 bool m_textureChanged;

56 unsigned m_textureId;

57 bool m_hasAlpha;	56 bool m_hasAlpha;

58 bool m_premultipliedAlpha;	57 bool m_premultipliedAlpha;

59 };	58 };

60	59

61 }	60 }

62 #endif // USE(ACCELERATED_COMPOSITING)	61 #endif // USE(ACCELERATED_COMPOSITING)

63	62

64 #endif // CanvasLayerChromium_h	63 #endif // CanvasLayerChromium_h

OLD	NEW