[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kbr at google.com
kbr at google.com
Wed Dec 22 13:37:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 80b4cf9b85ac52e8ce67af3210443321d0252722
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 00:34:32 2010 +0000
2010-09-21 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
[chromium] Remove GLES2Context and WebGLES2Context
https://bugs.webkit.org/show_bug.cgi?id=46131
Removed now-obsolete GLES2Context and WebGLES2Context classes, and
dependency on command buffer client code from WebCore. Built and
tested 3D CSS and WebGL content on Mac OS X to test.
* WebKit.gyp:
* public/WebGLES2Context.h: Removed.
* public/WebGraphicsContext3D.h:
* public/WebKitClient.h:
* public/WebView.h:
* src/ChromeClientImpl.cpp:
* src/GLES2Context.cpp: Removed.
* src/GLES2ContextInternal.cpp: Removed.
* src/GLES2ContextInternal.h: Removed.
* src/WebGraphicsContext3DDefaultImpl.cpp:
* src/WebGraphicsContext3DDefaultImpl.h:
* src/WebViewImpl.cpp:
* src/WebViewImpl.h:
2010-09-21 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
[chromium] Remove GLES2Context and WebGLES2Context
https://bugs.webkit.org/show_bug.cgi?id=46131
Removed now-obsolete GLES2Context and WebGLES2Context classes, and
dependency on command buffer client code from WebCore. Built and
tested 3D CSS and WebGL content on Mac OS X to test.
* WebCore.gypi:
* platform/chromium/GLES2Context.h: Removed.
* platform/graphics/skia/ImageSkia.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4f6069c..665c32c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-21 Kenneth Russell <kbr at google.com>
+
+ Reviewed by James Robinson.
+
+ [chromium] Remove GLES2Context and WebGLES2Context
+ https://bugs.webkit.org/show_bug.cgi?id=46131
+
+ Removed now-obsolete GLES2Context and WebGLES2Context classes, and
+ dependency on command buffer client code from WebCore. Built and
+ tested 3D CSS and WebGL content on Mac OS X to test.
+
+ * WebCore.gypi:
+ * platform/chromium/GLES2Context.h: Removed.
+ * platform/graphics/skia/ImageSkia.cpp:
+
2010-09-21 Geoffrey Garen <ggaren at apple.com>
Try to fix the Windows build.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index d4b7ed3..da57352 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2221,7 +2221,6 @@
'platform/chromium/FramelessScrollViewClient.h',
'platform/chromium/GeolocationServiceChromium.cpp',
'platform/chromium/GeolocationServiceChromium.h',
- 'platform/chromium/GLES2Context.h',
'platform/chromium/KeyCodeConversion.h',
'platform/chromium/KeyCodeConversionGtk.cpp',
'platform/chromium/Language.cpp',
diff --git a/WebCore/platform/chromium/GLES2Context.h b/WebCore/platform/chromium/GLES2Context.h
deleted file mode 100644
index d37885a..0000000
--- a/WebCore/platform/chromium/GLES2Context.h
+++ /dev/null
@@ -1,70 +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:
- *
- * * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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 GLES2Context_h
-#define GLES2Context_h
-
-#include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-
-namespace WebCore {
-
-class GLES2ContextInternal;
-class IntSize;
-class Page;
-
-class GLES2Context : public Noncopyable {
-public:
- // Used by the implementation only
- static PassOwnPtr<GLES2Context> create(PassOwnPtr<GLES2ContextInternal>);
- ~GLES2Context();
-
- bool makeCurrent();
- bool destroy();
- bool swapBuffers();
-
- // Only valid for offscreen contexts.
- void resizeOffscreenContent(const IntSize&);
-
- // Returns the ID of the texture used for offscreen rendering in the context of the parent.
- // This texture is accessible by the GPU page compositor.
- unsigned getOffscreenContentParentTextureId();
-
-private:
- GLES2Context();
-
- friend class GLES2ContextInternal;
- OwnPtr<GLES2ContextInternal> m_internal;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/WebCore/platform/graphics/skia/ImageSkia.cpp b/WebCore/platform/graphics/skia/ImageSkia.cpp
index 0b96d80..23e7be6 100644
--- a/WebCore/platform/graphics/skia/ImageSkia.cpp
+++ b/WebCore/platform/graphics/skia/ImageSkia.cpp
@@ -36,7 +36,6 @@
#include "FloatConversion.h"
#include "FloatRect.h"
#include "GLES2Canvas.h"
-#include "GLES2Context.h"
#include "GraphicsContext.h"
#include "Logging.h"
#include "NativeImageSkia.h"
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ca4470f..28f84ec 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,31 @@
Reviewed by James Robinson.
+ [chromium] Remove GLES2Context and WebGLES2Context
+ https://bugs.webkit.org/show_bug.cgi?id=46131
+
+ Removed now-obsolete GLES2Context and WebGLES2Context classes, and
+ dependency on command buffer client code from WebCore. Built and
+ tested 3D CSS and WebGL content on Mac OS X to test.
+
+ * WebKit.gyp:
+ * public/WebGLES2Context.h: Removed.
+ * public/WebGraphicsContext3D.h:
+ * public/WebKitClient.h:
+ * public/WebView.h:
+ * src/ChromeClientImpl.cpp:
+ * src/GLES2Context.cpp: Removed.
+ * src/GLES2ContextInternal.cpp: Removed.
+ * src/GLES2ContextInternal.h: Removed.
+ * src/WebGraphicsContext3DDefaultImpl.cpp:
+ * src/WebGraphicsContext3DDefaultImpl.h:
+ * src/WebViewImpl.cpp:
+ * src/WebViewImpl.h:
+
+2010-09-21 Kenneth Russell <kbr at google.com>
+
+ Reviewed by James Robinson.
+
[chromium] Roll forward Chromium DEPS to pick up removal of WebGLES2Context dependencies
https://bugs.webkit.org/show_bug.cgi?id=46231
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 4977300..fc8fbdd 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -170,7 +170,6 @@
'public/WebGeolocationServiceBridge.h',
'public/WebGeolocationServiceMock.h',
'public/WebGlyphCache.h',
- 'public/WebGLES2Context.h',
'public/WebGraphicsContext3D.h',
'public/WebHistoryItem.h',
'public/WebHTTPBody.h',
@@ -323,9 +322,6 @@
'src/FrameLoaderClientImpl.cpp',
'src/FrameLoaderClientImpl.h',
'src/FrameNetworkingContextImpl.h',
- 'src/GLES2Context.cpp',
- 'src/GLES2ContextInternal.cpp',
- 'src/GLES2ContextInternal.h',
'src/GraphicsContext3D.cpp',
'src/GraphicsContext3DInternal.h',
'src/gtk/WebFontInfo.cpp',
@@ -551,7 +547,6 @@
'dependencies': [
'../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
- '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
'<(chromium_src_dir)/third_party/icu/icu.gyp:*',
'<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
'<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
@@ -731,7 +726,6 @@
'<(chromium_src_dir)/base/base.gyp:base',
'<(chromium_src_dir)/base/base.gyp:base_i18n',
'<(chromium_src_dir)/base/base.gyp:test_support_base',
- '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
],
@@ -813,7 +807,6 @@
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
- '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib'
],
'include_dirs': [
'.',
diff --git a/WebKit/chromium/public/WebGLES2Context.h b/WebKit/chromium/public/WebGLES2Context.h
deleted file mode 100644
index 45184aa..0000000
--- a/WebKit/chromium/public/WebGLES2Context.h
+++ /dev/null
@@ -1,71 +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:
- *
- * * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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 WebGLES2Context_h
-#define WebGLES2Context_h
-
-#include "WebCommon.h"
-#include "WebNonCopyable.h"
-
-namespace WebKit {
-
-struct WebSize;
-class WebView;
-
-// This interface abstracts the creation and management of an
-// OpenGL ES 2.0 context.
-
-class WebGLES2Context : public WebNonCopyable {
-public:
- virtual ~WebGLES2Context() {}
-
- virtual bool initialize(WebView*, WebGLES2Context* parent) = 0;
- virtual bool makeCurrent() = 0;
- virtual bool destroy() = 0;
- virtual bool swapBuffers() = 0;
-
- // The follow two functions are for managing a context that renders offscreen.
-
- // Resizes the backing store used for offscreen rendering.
- virtual void resizeOffscreenContent(const WebSize&) = 0;
-
- // Returns the ID of the texture used for offscreen rendering in the context of the parent.
- virtual unsigned getOffscreenContentParentTextureId() = 0;
-
- // The following function is used only on Mac OS X and is needed
- // in order to report window size changes.
-#if defined(__APPLE__)
- virtual void resizeOnscreenContent(const WebSize&) = 0;
-#endif
-};
-
-} // namespace WebKit
-
-#endif
diff --git a/WebKit/chromium/public/WebGraphicsContext3D.h b/WebKit/chromium/public/WebGraphicsContext3D.h
index 9857174..15e6365 100644
--- a/WebKit/chromium/public/WebGraphicsContext3D.h
+++ b/WebKit/chromium/public/WebGraphicsContext3D.h
@@ -85,11 +85,6 @@ public:
// on newly-constructed instances. Returns true on success.
virtual bool initialize(Attributes, WebView*, bool renderDirectlyToWebView) = 0;
- // Initializes the graphics context; should be the first operation performed
- // on newly-constructed instances. Returns true on success.
- // FIXME: remove this entry point once the compositor is switched to use GraphicsContext3D.
- virtual bool initialize(Attributes, WebView*) = 0;
-
// Makes the OpenGL context current on the current thread. Returns true on
// success.
virtual bool makeContextCurrent() = 0;
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 0f282e0..09c79c5 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -53,7 +53,6 @@ class WebClipboard;
class WebCookieJar;
class WebFileSystem;
class WebFileUtilities;
-class WebGLES2Context;
class WebGraphicsContext3D;
class WebIDBFactory;
class WebIDBKey;
@@ -270,12 +269,6 @@ public:
// Returns newly allocated WebGraphicsContext3D instance.
virtual WebGraphicsContext3D* createGraphicsContext3D() { return 0; }
- // GLES2 --------------------------------------------------------------
-
- // Returns newly allocated WebGLES2Context instance.
- // May return null if it fails to create the context.
- virtual WebGLES2Context* createGLES2Context() { return 0; }
-
// FileSystem ----------------------------------------------------------
// Must return non-null.
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index d162f26..b0d0864 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -44,7 +44,6 @@ class WebDevToolsAgentClient;
class WebDragData;
class WebFrame;
class WebFrameClient;
-class WebGLES2Context;
class WebGraphicsContext3D;
class WebNode;
class WebSettings;
@@ -341,12 +340,6 @@ public:
// GPU acceleration support --------------------------------------------
- // Returns the GLES2Context associated with this WebView. One will be
- // created if it doesn't already exist.
- // FIXME: remove this method once the compositor is fully switched
- // over to GraphicsContext3D.
- virtual WebGLES2Context* gles2Context() = 0;
-
// Returns the (on-screen) WebGraphicsContext3D associated with
// this WebView. One will be created if it doesn't already exist.
// This is used to set up sharing between this context (which is
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 1922395..5f702e0 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -44,7 +44,6 @@
#include "FloatRect.h"
#include "FrameLoadRequest.h"
#include "FrameView.h"
-#include "GLES2Context.h"
#include "Geolocation.h"
#include "GeolocationService.h"
#include "GeolocationServiceChromium.h"
diff --git a/WebKit/chromium/src/GLES2Context.cpp b/WebKit/chromium/src/GLES2Context.cpp
deleted file mode 100644
index b4b4bb2..0000000
--- a/WebKit/chromium/src/GLES2Context.cpp
+++ /dev/null
@@ -1,115 +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:
- *
- * * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#include "config.h"
-
-#include "GLES2Context.h"
-#include "GLES2ContextInternal.h"
-#include "IntSize.h"
-#include "WebGLES2Context.h"
-#include "WebKit.h"
-#include "WebKitClient.h"
-#include "WebViewImpl.h"
-#include <wtf/OwnPtr.h>
-
-// There are two levels of delegation in this file:
-//
-// 1. GLES2Context delegates to GLES2ContextInternal. This is done
-// so that we have some place to store data members common among
-// implementations.
-//
-// 2. GLES2ContextInternal delegates to an implementation of
-// WebGLES2Context. This is done so we have a place to inject an
-// implementation which creates the GL ES context.
-
-using namespace WebKit;
-
-namespace WebCore {
-
-PassOwnPtr<GLES2ContextInternal> GLES2ContextInternal::create(WebGLES2Context* impl, bool owns)
-{
- PassOwnPtr<GLES2ContextInternal> result = new GLES2ContextInternal(impl, owns);
- return result;
-}
-
-PassOwnPtr<GLES2Context> GLES2Context::create(PassOwnPtr<GLES2ContextInternal> internal)
-{
- PassOwnPtr<GLES2Context> result = new GLES2Context();
- result->m_internal = internal;
- return result;
-}
-
-GLES2Context::GLES2Context()
-{
-}
-
-GLES2Context::~GLES2Context()
-{
-}
-
-bool GLES2Context::makeCurrent()
-{
- WebGLES2Context* webContext = m_internal->getWebGLES2Context();
- if (!webContext)
- return false;
- return webContext->makeCurrent();
-}
-
-bool GLES2Context::destroy()
-{
- WebGLES2Context* webContext = m_internal->getWebGLES2Context();
- if (!webContext)
- return false;
- return webContext->destroy();
-}
-
-bool GLES2Context::swapBuffers()
-{
- WebGLES2Context* webContext = m_internal->getWebGLES2Context();
- if (!webContext)
- return false;
- return webContext->swapBuffers();
-}
-
-void GLES2Context::resizeOffscreenContent(const IntSize& size)
-{
- WebGLES2Context* webContext = m_internal->getWebGLES2Context();
- ASSERT(webContext);
- webContext->resizeOffscreenContent(size);
-}
-
-unsigned GLES2Context::getOffscreenContentParentTextureId()
-{
- WebGLES2Context* webContext = m_internal->getWebGLES2Context();
- ASSERT(webContext);
- return webContext->getOffscreenContentParentTextureId();
-}
-
-} // namespace WebCore
diff --git a/WebKit/chromium/src/GLES2ContextInternal.cpp b/WebKit/chromium/src/GLES2ContextInternal.cpp
deleted file mode 100644
index 33eb602..0000000
--- a/WebKit/chromium/src/GLES2ContextInternal.cpp
+++ /dev/null
@@ -1,52 +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:
- *
- * * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#include "config.h"
-
-#include "GLES2ContextInternal.h"
-
-#include "WebGLES2Context.h"
-
-namespace WebCore {
-
-GLES2ContextInternal::GLES2ContextInternal(WebKit::WebGLES2Context* impl, bool owns)
- : m_impl(impl)
- , m_owns(owns)
-{
-}
-
-GLES2ContextInternal::~GLES2ContextInternal()
-{
- if (m_owns)
- delete m_impl;
-}
-
-} // namespace WebCore
-
diff --git a/WebKit/chromium/src/GLES2ContextInternal.h b/WebKit/chromium/src/GLES2ContextInternal.h
deleted file mode 100644
index 4668311..0000000
--- a/WebKit/chromium/src/GLES2ContextInternal.h
+++ /dev/null
@@ -1,55 +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:
- *
- * * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#include <wtf/PassOwnPtr.h>
-
-namespace WebKit {
-class WebGLES2Context;
-}
-
-namespace WebCore {
-
-class GLES2ContextInternal {
-public:
- // If 'owns' is set to true, this GLES2ContextInternal takes ownership of the passed in WebKit::WebGLES2Context.
- static PassOwnPtr<GLES2ContextInternal> create(WebKit::WebGLES2Context* impl, bool owns);
-
- WebKit::WebGLES2Context* getWebGLES2Context() { return m_impl; }
-
- ~GLES2ContextInternal();
-
-private:
- GLES2ContextInternal(WebKit::WebGLES2Context* impl, bool owns);
-
- WebKit::WebGLES2Context* m_impl;
- bool m_owns;
-};
-
-}
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index 24dcf9a..45ef33e 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -119,11 +119,6 @@ bool WebGraphicsContext3DDefaultImpl::initialize(WebGraphicsContext3D::Attribute
return true;
}
-bool WebGraphicsContext3DDefaultImpl::initialize(WebGraphicsContext3D::Attributes attributes, WebView* webView)
-{
- return initialize(attributes, webView, false);
-}
-
void WebGraphicsContext3DDefaultImpl::validateAttributes()
{
const char* extensions = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
index 5bf439a..33d0977 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
@@ -60,8 +60,6 @@ public:
//----------------------------------------------------------------------
// WebGraphicsContext3D methods
virtual bool initialize(WebGraphicsContext3D::Attributes attributes, WebView*, bool);
- // FIXME: remove once compositor is switched over to GraphicsContext3D.
- virtual bool initialize(WebGraphicsContext3D::Attributes attributes, WebView*);
virtual bool makeContextCurrent();
virtual int width();
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index a1c6578..23ebb80 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2431,11 +2431,6 @@ SharedGraphicsContext3D* WebViewImpl::getSharedGraphicsContext3D()
return m_sharedContext3D.get();
}
-WebGLES2Context* WebViewImpl::gles2Context()
-{
- return 0;
-}
-
WebGraphicsContext3D* WebViewImpl::graphicsContext3D()
{
#if USE(ACCELERATED_COMPOSITING)
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index bbd25a2..6d81cc9 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -332,9 +332,6 @@ public:
void scrollRootLayerRect(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& clipRect);
void invalidateRootLayerRect(const WebCore::IntRect&);
#endif
- // FIXME: remove this method once the compositor is fully switched
- // over to GraphicsContext3D.
- virtual WebGLES2Context* gles2Context();
// Returns the onscreen 3D context used by the compositor. This is
// used by the renderer's code to set up resource sharing between
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list