Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 69 deletions

diff --git a/WebCore/platform/graphics/chromium/LayerTexture.h b/WebCore/platform/graphics/chromium/LayerTexture.h
deleted file mode 100644
index 312adfa..0000000
--- a/WebCore/platform/graphics/chromium/LayerTexture.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef LayerTexture_h
-#define LayerTexture_h
-
-#include "IntSize.h"
-#include "TextureManager.h"
-
-#include <wtf/Noncopyable.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class GraphicsContext3D;
-class TextureManager;
-
-class LayerTexture : public Noncopyable {
-public:
-    static PassOwnPtr<LayerTexture> create(GraphicsContext3D* context, TextureManager* manager)
-    {
-        return adoptPtr(new LayerTexture(context, manager));
-    }
-    ~LayerTexture();
-
-    bool isValid(const IntSize&, unsigned format);
-    bool reserve(const IntSize&, unsigned format);
-    void unreserve();
-
-    void bindTexture();
-    void framebufferTexture2D();
-
-private:
-    LayerTexture(GraphicsContext3D*, TextureManager*);
-
-    RefPtr<GraphicsContext3D> m_context;
-    TextureManager* m_textureManager;
-    TextureToken m_token;
-    IntSize m_size;
-    unsigned m_format;
-    unsigned m_textureId;
-};
-
-}
-
-#endif
-