Cleanup namespace usage in platform/graphics/[filters/* to skia/*] and platform/graphics/[B-D]*

Source/platform/graphics/gpu/DrawingBuffer.h

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 #include "public/platform/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/Deque.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
+
+class Extensions3DUtil;
+class ImageBuffer;
+class ImageData;
 class WebExternalBitmap;
 class WebExternalTextureLayer;
 class WebGraphicsContext3D;
 class WebLayer;
-}
-
-namespace blink {
-class Extensions3DUtil;
-class ImageData;
-class ImageBuffer;
 
 // Abstract interface to allow basic context eviction management
 class PLATFORM_EXPORT ContextEvictionManager : public RefCounted<ContextEvictionManager> {
 public:
     virtual ~ContextEvictionManager() {};
 
     virtual void forciblyLoseOldestContext(const String& reason) = 0;
     virtual IntSize oldestContextSize() = 0;
 };
 
 // Manages a rendering target (framebuffer + attachment) for a canvas.  Can publish its rendering
-// results to a blink::WebLayer for compositing.
-class PLATFORM_EXPORT DrawingBuffer : public RefCounted<DrawingBuffer>, public blink::WebExternalTextureLayerClient  {
+// results to a WebLayer for compositing.
+class PLATFORM_EXPORT DrawingBuffer : public RefCounted<DrawingBuffer>, public WebExternalTextureLayerClient  {
     // If we used CHROMIUM_image as the backing storage for our buffers,
     // we need to know the mapping from texture id to image.
     struct TextureInfo {
         Platform3DObject textureId;
-        blink::WGC3Duint imageId;
+        WGC3Duint imageId;
 
         TextureInfo()
             : textureId(0)
             , imageId(0)
         {
         }
     };
 
     struct MailboxInfo : public RefCounted<MailboxInfo> {
-        blink::WebExternalTextureMailbox mailbox;
+        WebExternalTextureMailbox mailbox;
         TextureInfo textureInfo;
         IntSize size;
         // This keeps the parent drawing buffer alive as long as the compositor is
         // referring to one of the mailboxes DrawingBuffer produced. The parent drawing buffer is
         // cleared when the compositor returns the mailbox. See mailboxReleased().
         RefPtr<DrawingBuffer> m_parentDrawingBuffer;
     };
 public:
     enum PreserveDrawingBuffer {
         Preserve,
         Discard
     };
 
-    static PassRefPtr<DrawingBuffer> create(PassOwnPtr<blink::WebGraphicsContext3D>, const IntSize&, PreserveDrawingBuffer, blink::WebGraphicsContext3D::Attributes requestedAttributes, PassRefPtr<ContextEvictionManager>);
+    static PassRefPtr<DrawingBuffer> create(PassOwnPtr<WebGraphicsContext3D>, const IntSize&, PreserveDrawingBuffer, WebGraphicsContext3D::Attributes requestedAttributes, PassRefPtr<ContextEvictionManager>);
 
     virtual ~DrawingBuffer();
 
     // Destruction will be completed after all mailboxes are released.
     void beginDestruction();
 
     // Issues a glClear() on all framebuffers associated with this DrawingBuffer. The caller is responsible for
     // making the context current and setting the clear values and masks. Modifies the framebuffer binding.
     void clearFramebuffers(GLbitfield clearMask);
 
@@ skipping 24 matching lines @@
     void setActiveTextureUnit(GLint textureUnit) { m_activeTextureUnit = textureUnit; }
 
     bool multisample() const;
 
     Platform3DObject framebuffer() const;
 
     void markContentsChanged();
     void markLayerComposited();
     bool layerComposited() const;
 
-    blink::WebLayer* platformLayer();
+    WebLayer* platformLayer();
     void paintCompositedResultsToCanvas(ImageBuffer*);
 
-    blink::WebGraphicsContext3D* context();
+    WebGraphicsContext3D* context();
 
     // Returns the actual context attributes for this drawing buffer which may differ from the
     // requested context attributes due to implementation limits.
-    blink::WebGraphicsContext3D::Attributes getActualAttributes() const { return m_actualAttributes; }
+    WebGraphicsContext3D::Attributes getActualAttributes() const { return m_actualAttributes; }
 
     // WebExternalTextureLayerClient implementation.
-    virtual bool prepareMailbox(blink::WebExternalTextureMailbox*, blink::WebExternalBitmap*) OVERRIDE;
-    virtual void mailboxReleased(const blink::WebExternalTextureMailbox&, bool lostResource = false) OVERRIDE;
+    virtual bool prepareMailbox(WebExternalTextureMailbox*, WebExternalBitmap*) OVERRIDE;
+    virtual void mailboxReleased(const WebExternalTextureMailbox&, bool lostResource = false) OVERRIDE;
 
     // Destroys the TEXTURE_2D binding for the owned context
-    bool copyToPlatformTexture(blink::WebGraphicsContext3D*, Platform3DObject texture, GLenum internalFormat,
+    bool copyToPlatformTexture(WebGraphicsContext3D*, Platform3DObject texture, GLenum internalFormat,
         GLenum destType, GLint level, bool premultiplyAlpha, bool flipY, bool fromFrontBuffer = false);
 
     void setPackAlignment(GLint param);
 
     void paintRenderingResultsToCanvas(ImageBuffer*);
     PassRefPtr<Uint8ClampedArray> paintRenderingResultsToImageData(int&, int&);
 
 protected: // For unittests
     DrawingBuffer(
-        PassOwnPtr<blink::WebGraphicsContext3D>,
+        PassOwnPtr<WebGraphicsContext3D>,
         PassOwnPtr<Extensions3DUtil>,
         bool multisampleExtensionSupported,
         bool packedDepthStencilExtensionSupported,
         PreserveDrawingBuffer,
-        blink::WebGraphicsContext3D::Attributes requestedAttributes,
+        WebGraphicsContext3D::Attributes requestedAttributes,
         PassRefPtr<ContextEvictionManager>);
 
     bool initialize(const IntSize&);
 
 private:
-    void mailboxReleasedWhileDestructionInProgress(const blink::WebExternalTextureMailbox&);
+    void mailboxReleasedWhileDestructionInProgress(const WebExternalTextureMailbox&);
 
     unsigned createColorTexture();
     // Create the depth/stencil and multisample buffers, if needed.
     void createSecondaryBuffers();
     bool resizeFramebuffer(const IntSize&);
     bool resizeMultisampleFramebuffer(const IntSize&);
     void resizeDepthStencil(const IntSize&);
 
     // Bind to the m_framebufferBinding if it's not 0.
     void restoreFramebufferBinding();
 
     void clearPlatformLayer();
 
     PassRefPtr<MailboxInfo> recycledMailbox();
     PassRefPtr<MailboxInfo> createNewMailbox(const TextureInfo&);
-    void deleteMailbox(const blink::WebExternalTextureMailbox&);
+    void deleteMailbox(const WebExternalTextureMailbox&);
 
     // Updates the current size of the buffer, ensuring that s_currentResourceUsePixels is updated.
     void setSize(const IntSize& size);
 
     // Calculates the difference in pixels between the current buffer size and the proposed size.
     static int pixelDelta(const IntSize& newSize, const IntSize& curSize);
 
     // Given the desired buffer size, provides the largest dimensions that will fit in the pixel budget
     // Returns true if the buffer will only fit if the oldest WebGL context is forcibly lost
     IntSize adjustSizeWithContextEviction(const IntSize&, bool& evictContext);
@@ skipping 19 matching lines @@
     // Allocate buffer storage to be sent to compositor using either texImage2D or CHROMIUM_image based on available support.
     void allocateTextureMemory(TextureInfo*, const IntSize&);
     void deleteChromiumImageForTexture(TextureInfo*);
 
     PreserveDrawingBuffer m_preserveDrawingBuffer;
     bool m_scissorEnabled;
     Platform3DObject m_texture2DBinding;
     Platform3DObject m_framebufferBinding;
     GLenum m_activeTextureUnit;
 
-    OwnPtr<blink::WebGraphicsContext3D> m_context;
+    OwnPtr<WebGraphicsContext3D> m_context;
     OwnPtr<Extensions3DUtil> m_extensionsUtil;
     IntSize m_size;
-    blink::WebGraphicsContext3D::Attributes m_requestedAttributes;
+    WebGraphicsContext3D::Attributes m_requestedAttributes;
     bool m_multisampleExtensionSupported;
     bool m_packedDepthStencilExtensionSupported;
     Platform3DObject m_fbo;
     // DrawingBuffer's output is double-buffered. m_colorBuffer is the back buffer.
     TextureInfo m_colorBuffer;
     TextureInfo m_frontColorBuffer;
 
     // This is used when we have OES_packed_depth_stencil.
     Platform3DObject m_depthStencilBuffer;
 
@@ skipping 13 matching lines @@
     bool m_layerComposited;
 
     enum MultisampleMode {
         None,
         ImplicitResolve,
         ExplicitResolve,
     };
 
     MultisampleMode m_multisampleMode;
 
-    blink::WebGraphicsContext3D::Attributes m_actualAttributes;
+    WebGraphicsContext3D::Attributes m_actualAttributes;
     unsigned m_internalColorFormat;
     unsigned m_colorFormat;
     unsigned m_internalRenderbufferFormat;
     int m_maxTextureSize;
     int m_sampleCount;
     int m_packAlignment;
     bool m_destructionInProgress;
 
-    OwnPtr<blink::WebExternalTextureLayer> m_layer;
+    OwnPtr<WebExternalTextureLayer> m_layer;
 
     // All of the mailboxes that this DrawingBuffer has ever created.
     Vector<RefPtr<MailboxInfo> > m_textureMailboxes;
     // Mailboxes that were released by the compositor can be used again by this DrawingBuffer.
-    Deque<blink::WebExternalTextureMailbox> m_recycledMailboxQueue;
+    Deque<WebExternalTextureMailbox> m_recycledMailboxQueue;
 
     RefPtr<ContextEvictionManager> m_contextEvictionManager;
 
     // If the width and height of the Canvas's backing store don't
     // match those that we were given in the most recent call to
     // reshape(), then we need an intermediate bitmap to read back the
     // frame buffer into. This seems to happen when CSS styles are
     // used to resize the Canvas.
     SkBitmap m_resizingBitmap;
 
     // Used to flip a bitmap vertically.
     Vector<uint8_t> m_scanline;
 };
 
 } // namespace blink
 
 #endif // DrawingBuffer_h