Diff
Modified: trunk/Source/Platform/ChangeLog (145005 => 145006)
--- trunk/Source/Platform/ChangeLog 2013-03-07 00:31:05 UTC (rev 145005)
+++ trunk/Source/Platform/ChangeLog 2013-03-07 00:32:31 UTC (rev 145006)
@@ -1,5 +1,15 @@
2013-03-06 Dana Jansens <[email protected]>
+ [chromium] Remove WebSharedGraphicsContext3D class
+ https://bugs.webkit.org/show_bug.cgi?id=111492
+
+ Reviewed by James Robinson.
+
+ * Platform.gypi:
+ * chromium/public/WebSharedGraphicsContext3D.h: Removed.
+
+2013-03-06 Dana Jansens <[email protected]>
+
[chromium] Remove the contents of WebVideoFrame class
https://bugs.webkit.org/show_bug.cgi?id=106037
Modified: trunk/Source/Platform/Platform.gypi (145005 => 145006)
--- trunk/Source/Platform/Platform.gypi 2013-03-07 00:31:05 UTC (rev 145005)
+++ trunk/Source/Platform/Platform.gypi 2013-03-07 00:32:31 UTC (rev 145006)
@@ -122,7 +122,6 @@
'chromium/public/WebScrollbarLayer.h',
'chromium/public/WebScrollbarThemeGeometry.h',
'chromium/public/WebScrollbarThemePainter.h',
- 'chromium/public/WebSharedGraphicsContext3D.h',
'chromium/public/WebSize.h',
'chromium/public/WebSocketStreamError.h',
'chromium/public/WebSocketStreamHandle.h',
Deleted: trunk/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h (145005 => 145006)
--- trunk/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h 2013-03-07 00:31:05 UTC (rev 145005)
+++ trunk/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h 2013-03-07 00:32:31 UTC (rev 145006)
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2012 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 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 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 WebSharedGraphicsContext3D_h
-#define WebSharedGraphicsContext3D_h
-
-#include "WebCommon.h"
-
-class GrContext;
-
-namespace WebKit {
-
-class WebGraphicsContext3D;
-
-class WebSharedGraphicsContext3D {
-public:
- // Returns a context usable from the main thread. If the context is lost or has never been created, this will attempt to create a new context.
- // The returned pointer is only valid until the next call to mainThreadContext().
- WEBKIT_EXPORT static WebGraphicsContext3D* mainThreadContext();
-
- // Returns a ganesh context associated with the main thread shared context. The ganesh context has the same lifetime as the main thread shared
- // WebGraphicsContext3D.
- WEBKIT_EXPORT static GrContext* mainThreadGrContext();
-
- // Attempts to create a context usable from the compositor thread. Must be called from the main (WebKit) thread. Returns false
- // if a context could not be created.
- WEBKIT_EXPORT static bool createCompositorThreadContext();
-
- // Can be called from any thread.
- WEBKIT_EXPORT static bool haveCompositorThreadContext();
-
- // Returns a context usable from the compositor thread, if there is one. The context must be used only from the compositor thread.
- // The returned context is valid until the next call to createCompositorThreadContext().
- // If this context becomes lost or unusable, the caller should call createCompositorThreadContext() on the main thread and
- // then use the newly created context from the compositor thread.
- WEBKIT_EXPORT static WebGraphicsContext3D* compositorThreadContext();
-
- // Returns a ganesh context associated with the compositor thread shared context. The ganesh context has the same lifetime as the compositor thread
- // shared WebGraphicsContext3D.
- WEBKIT_EXPORT static GrContext* compositorThreadGrContext();
-};
-
-}
-
-#endif // WebSharedGraphicsContext3D_h
Modified: trunk/Source/WebCore/ChangeLog (145005 => 145006)
--- trunk/Source/WebCore/ChangeLog 2013-03-07 00:31:05 UTC (rev 145005)
+++ trunk/Source/WebCore/ChangeLog 2013-03-07 00:32:31 UTC (rev 145006)
@@ -1,5 +1,17 @@
2013-03-06 Dana Jansens <[email protected]>
+ [chromium] Remove WebSharedGraphicsContext3D class
+ https://bugs.webkit.org/show_bug.cgi?id=111492
+
+ Reviewed by James Robinson.
+
+ Removing dead code, no new tests.
+
+ * WebCore.gypi:
+ * platform/chromium/support/WebSharedGraphicsContext3D.cpp: Removed.
+
+2013-03-06 Dana Jansens <[email protected]>
+
[chromium] Don't get callbacks or create GrContext from unowned WebGraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=111638
Modified: trunk/Source/WebCore/WebCore.gypi (145005 => 145006)
--- trunk/Source/WebCore/WebCore.gypi 2013-03-07 00:31:05 UTC (rev 145005)
+++ trunk/Source/WebCore/WebCore.gypi 2013-03-07 00:32:31 UTC (rev 145006)
@@ -7408,7 +7408,6 @@
'platform/chromium/support/WebScrollbarThemeGeometryNative.h',
'platform/chromium/support/WebScrollbarImpl.cpp',
'platform/chromium/support/WebScrollbarImpl.h',
- 'platform/chromium/support/WebSharedGraphicsContext3D.cpp',
'platform/chromium/support/WebThreadSafeData.cpp',
'platform/chromium/support/WebTransformKeyframe.cpp',
'platform/chromium/support/WebTransformationMatrix.cpp',
Deleted: trunk/Source/WebCore/platform/chromium/support/WebSharedGraphicsContext3D.cpp (145005 => 145006)
--- trunk/Source/WebCore/platform/chromium/support/WebSharedGraphicsContext3D.cpp 2013-03-07 00:31:05 UTC (rev 145005)
+++ trunk/Source/WebCore/platform/chromium/support/WebSharedGraphicsContext3D.cpp 2013-03-07 00:32:31 UTC (rev 145006)
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 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 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 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.
- */
-
-#include "config.h"
-
-#include <public/WebSharedGraphicsContext3D.h>
-
-#include "GraphicsContext3DPrivate.h"
-#include "SharedGraphicsContext3D.h"
-
-using WebCore::GraphicsContext3DPrivate;
-using WebCore::SharedGraphicsContext3D;
-
-namespace WebKit {
-
-WebGraphicsContext3D* WebSharedGraphicsContext3D::mainThreadContext()
-{
- return GraphicsContext3DPrivate::extractWebGraphicsContext3D(SharedGraphicsContext3D::get().get());
-}
-
-GrContext* WebSharedGraphicsContext3D::mainThreadGrContext()
-{
- return SharedGraphicsContext3D::get() ? SharedGraphicsContext3D::get()->grContext() : 0;
-}
-
-
-WebGraphicsContext3D* WebSharedGraphicsContext3D::compositorThreadContext()
-{
- return GraphicsContext3DPrivate::extractWebGraphicsContext3D(SharedGraphicsContext3D::getForImplThread().get());
-}
-
-GrContext* WebSharedGraphicsContext3D::compositorThreadGrContext()
-{
- return SharedGraphicsContext3D::getForImplThread() ? SharedGraphicsContext3D::getForImplThread()->grContext() : 0;
-}
-
-bool WebSharedGraphicsContext3D::haveCompositorThreadContext()
-{
- return SharedGraphicsContext3D::haveForImplThread();
-}
-
-bool WebSharedGraphicsContext3D::createCompositorThreadContext()
-{
- return SharedGraphicsContext3D::createForImplThread();
-}
-
-}
-
