Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: Source/platform/graphics/Canvas2DLayerBridge.h

Issue 464273002: Cleanup namespace usage in platform/graphics/[filters/* to skia/*] and platform/graphics/[B-D]* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/platform/graphics/Canvas2DLayerBridge.h
diff --git a/Source/platform/graphics/Canvas2DLayerBridge.h b/Source/platform/graphics/Canvas2DLayerBridge.h
index 469b43031b8f5a006983c94fb6a05b3c3425f8d6..a1efa637bd328f15f86000ab7253d5eec5ba00d8 100644
--- a/Source/platform/graphics/Canvas2DLayerBridge.h
+++ b/Source/platform/graphics/Canvas2DLayerBridge.h
@@ -40,27 +40,24 @@
#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
-namespace blink {
-class WebGraphicsContext3D;
-class WebGraphicsContext3DProvider;
-}
-
class Canvas2DLayerBridgeTest;
namespace blink {
class ImageBuffer;
+class WebGraphicsContext3D;
+class WebGraphicsContext3DProvider;
-class PLATFORM_EXPORT Canvas2DLayerBridge : public blink::WebExternalTextureLayerClient, public SkDeferredCanvas::NotificationClient, public DoublyLinkedListNode<Canvas2DLayerBridge>, public RefCounted<Canvas2DLayerBridge> {
+class PLATFORM_EXPORT Canvas2DLayerBridge : public WebExternalTextureLayerClient, public SkDeferredCanvas::NotificationClient, public DoublyLinkedListNode<Canvas2DLayerBridge>, public RefCounted<Canvas2DLayerBridge> {
WTF_MAKE_NONCOPYABLE(Canvas2DLayerBridge);
public:
static PassRefPtr<Canvas2DLayerBridge> create(const IntSize&, OpacityMode, int msaaSampleCount);
virtual ~Canvas2DLayerBridge();
- // blink::WebExternalTextureLayerClient implementation.
- virtual bool prepareMailbox(blink::WebExternalTextureMailbox*, blink::WebExternalBitmap*) OVERRIDE;
- virtual void mailboxReleased(const blink::WebExternalTextureMailbox&, bool lostResource) OVERRIDE;
+ // WebExternalTextureLayerClient implementation.
+ virtual bool prepareMailbox(WebExternalTextureMailbox*, WebExternalBitmap*) OVERRIDE;
+ virtual void mailboxReleased(const WebExternalTextureMailbox&, bool lostResource) OVERRIDE;
// SkDeferredCanvas::NotificationClient implementation
virtual void prepareForDraw() OVERRIDE;
@@ -74,7 +71,7 @@ public:
SkCanvas* canvas() const { return m_canvas.get(); }
bool checkSurfaceValid();
bool restoreSurface();
- blink::WebLayer* layer() const;
+ WebLayer* layer() const;
Platform3DObject getBackingTexture();
bool isAccelerated() const { return true; }
void setIsHidden(bool);
@@ -95,15 +92,15 @@ public:
void beginDestruction();
protected:
- Canvas2DLayerBridge(PassOwnPtr<blink::WebGraphicsContext3DProvider>, PassOwnPtr<SkDeferredCanvas>, PassRefPtr<SkSurface>, int, OpacityMode);
+ Canvas2DLayerBridge(PassOwnPtr<WebGraphicsContext3DProvider>, PassOwnPtr<SkDeferredCanvas>, PassRefPtr<SkSurface>, int, OpacityMode);
void setRateLimitingEnabled(bool);
bool releasedMailboxHasExpired();
- blink::WebGraphicsContext3D* context();
+ WebGraphicsContext3D* context();
OwnPtr<SkDeferredCanvas> m_canvas;
RefPtr<SkSurface> m_surface;
- OwnPtr<blink::WebExternalTextureLayer> m_layer;
- OwnPtr<blink::WebGraphicsContext3DProvider> m_contextProvider;
+ OwnPtr<WebExternalTextureLayer> m_layer;
+ OwnPtr<WebGraphicsContext3DProvider> m_contextProvider;
ImageBuffer* m_imageBuffer;
int m_msaaSampleCount;
size_t m_bytesAllocated;
@@ -127,7 +124,7 @@ protected:
};
struct MailboxInfo {
- blink::WebExternalTextureMailbox m_mailbox;
+ WebExternalTextureMailbox m_mailbox;
RefPtr<SkImage> m_image;
MailboxStatus m_status;
RefPtr<Canvas2DLayerBridge> m_parentLayerBridge;
@@ -142,5 +139,7 @@ protected:
Vector<MailboxInfo> m_mailboxes;
int m_releasedMailboxInfoIndex;
};
-}
+
+} // namespace blink
+
#endif
« no previous file with comments | « Source/platform/graphics/Canvas2DImageBufferSurface.h ('k') | Source/platform/graphics/Canvas2DLayerBridge.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698