Diff
Modified: trunk/Source/WebCore/ChangeLog (108073 => 108074)
--- trunk/Source/WebCore/ChangeLog 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebCore/ChangeLog 2012-02-17 16:06:14 UTC (rev 108074)
@@ -1,3 +1,13 @@
+2012-02-17 Ilya Tikhonovsky <[email protected]>
+
+ Unreviewed, rolling out r108071.
+ http://trac.webkit.org/changeset/108071
+ https://bugs.webkit.org/show_bug.cgi?id=77155
+
+ chromium-mac compilation failed
+
+ * platform/graphics/chromium/Extensions3DChromium.h:
+
2012-02-17 Michal Mocny <[email protected]>
[chromium] GL_CHROMIUM_gpu_memory_manager extension
Modified: trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h (108073 => 108074)
--- trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2012-02-17 16:06:14 UTC (rev 108074)
@@ -87,14 +87,6 @@
// GL_CHROMIUM_set_visibility
void setVisibilityCHROMIUM(bool);
- // GL_CHROMIUM_gpu_memory_manager
- class GpuMemoryAllocationChangedCallbackCHROMIUM {
- public:
- virtual void onGpuMemoryAllocationChanged(size_t gpuResourceSizeInBytes) = 0;
- virtual ~GpuMemoryAllocationChangedCallbackCHROMIUM() { }
- };
- void setGpuMemoryAllocationChangedCallbackCHROMIUM(PassOwnPtr<GpuMemoryAllocationChangedCallbackCHROMIUM>);
-
// GL_CHROMIUM_swapbuffers_complete_callback
class SwapBuffersCompleteCallbackCHROMIUM {
public:
Modified: trunk/Source/WebKit/chromium/ChangeLog (108073 => 108074)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-17 16:06:14 UTC (rev 108074)
@@ -1,3 +1,20 @@
+2012-02-17 Ilya Tikhonovsky <[email protected]>
+
+ Unreviewed, rolling out r108071.
+ http://trac.webkit.org/changeset/108071
+ https://bugs.webkit.org/show_bug.cgi?id=77155
+
+ chromium-mac compilation failed
+
+ * public/platform/WebGraphicsContext3D.h:
+ (WebGraphicsContext3D):
+ * src/Extensions3DChromium.cpp:
+ * src/GraphicsContext3DChromium.cpp:
+ (WebCore::GraphicsContext3D::~GraphicsContext3D):
+ * src/GraphicsContext3DPrivate.h:
+ (WebCore):
+ * tests/FakeWebGraphicsContext3D.h:
+
2012-02-17 Michal Mocny <[email protected]>
[chromium] GL_CHROMIUM_gpu_memory_manager extension
Modified: trunk/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h (108073 => 108074)
--- trunk/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h 2012-02-17 16:06:14 UTC (rev 108074)
@@ -130,14 +130,6 @@
virtual ~WebGraphicsSwapBuffersCompleteCallbackCHROMIUM() { }
};
- class WebGraphicsMemoryAllocationChangedCallbackCHROMIUM {
- public:
- virtual void onMemoryAllocationChanged(size_t gpuResourceSizeInBytes) = 0;
-
- protected:
- virtual ~WebGraphicsMemoryAllocationChangedCallbackCHROMIUM() { }
- };
-
// This destructor needs to be public so that using classes can destroy instances if initialization fails.
virtual ~WebGraphicsContext3D() {}
@@ -159,9 +151,6 @@
// GL_CHROMIUM_setVisibility - Changes the visibility of the backbuffer
virtual void setVisibilityCHROMIUM(bool visible) = 0;
- // GL_CHROMIUM_gpu_memory_manager - sets callback to observe changes to memory allocation limits.
- virtual void setMemoryAllocationChangedCallbackCHROMIUM(WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) { }
-
// Query whether it is built on top of compliant GLES2 implementation.
virtual bool isGLES2Compliant() = 0;
Modified: trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp (108073 => 108074)
--- trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp 2012-02-17 16:06:14 UTC (rev 108074)
@@ -107,11 +107,6 @@
m_private->setVisibilityCHROMIUM(visibility);
}
-void Extensions3DChromium::setGpuMemoryAllocationChangedCallbackCHROMIUM(PassOwnPtr<GpuMemoryAllocationChangedCallbackCHROMIUM> callback)
-{
- m_private->setGpuMemoryAllocationChangedCallbackCHROMIUM(callback);
-}
-
Platform3DObject Extensions3DChromium::createVertexArrayOES()
{
return 0;
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (108073 => 108074)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2012-02-17 16:06:14 UTC (rev 108074)
@@ -1035,7 +1035,6 @@
m_private->setContextLostCallback(nullptr);
m_private->setErrorMessageCallback(nullptr);
m_private->setSwapBuffersCompleteCallbackCHROMIUM(nullptr);
- m_private->setGpuMemoryAllocationChangedCallbackCHROMIUM(nullptr);
}
PassRefPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle renderStyle)
@@ -1360,31 +1359,6 @@
m_impl->setSwapBuffersCompleteCallbackCHROMIUM(m_swapBuffersCompleteCallbackAdapter.get());
}
-class GraphicsContext3DMemoryAllocationChangedCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM {
-public:
- GraphicsContext3DMemoryAllocationChangedCallbackAdapter(PassOwnPtr<Extensions3DChromium::GpuMemoryAllocationChangedCallbackCHROMIUM> cb)
- : m_memoryAllocationChangedCallback(cb)
- {
- }
-
- virtual ~GraphicsContext3DMemoryAllocationChangedCallbackAdapter() { }
-
- virtual void onMemoryAllocationChanged(size_t gpuResourceSizeInBytes)
- {
- if (m_memoryAllocationChangedCallback)
- m_memoryAllocationChangedCallback->onGpuMemoryAllocationChanged(gpuResourceSizeInBytes);
- }
-
-private:
- OwnPtr<Extensions3DChromium::GpuMemoryAllocationChangedCallbackCHROMIUM> m_memoryAllocationChangedCallback;
-};
-
-void GraphicsContext3DPrivate::setGpuMemoryAllocationChangedCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::GpuMemoryAllocationChangedCallbackCHROMIUM> cb)
-{
- m_memoryAllocationChangedCallbackAdapter = adoptPtr(new GraphicsContext3DMemoryAllocationChangedCallbackAdapter(cb));
- m_impl->setMemoryAllocationChangedCallbackCHROMIUM(m_memoryAllocationChangedCallbackAdapter.get());
-}
-
} // namespace WebCore
#endif // ENABLE(WEBGL)
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h (108073 => 108074)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h 2012-02-17 16:06:14 UTC (rev 108074)
@@ -51,7 +51,6 @@
class GraphicsContextLostCallbackAdapter;
class GraphicsContext3DSwapBuffersCompleteCallbackAdapter;
class GraphicsErrorMessageCallbackAdapter;
-class GraphicsContext3DMemoryAllocationChangedCallbackAdapter;
class GraphicsContext3DPrivate {
public:
@@ -296,9 +295,6 @@
// GL_CHROMIUM_set_visibility
void setVisibilityCHROMIUM(bool);
- // GL_CHROMIUM_gpu_memory_manager
- virtual void setGpuMemoryAllocationChangedCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::GpuMemoryAllocationChangedCallbackCHROMIUM>);
-
// GL_CHROMIUM_framebuffer_multisample
void blitFramebufferCHROMIUM(GC3Dint srcX0, GC3Dint srcY0, GC3Dint srcX1, GC3Dint srcY1, GC3Dint dstX0, GC3Dint dstY0, GC3Dint dstX1, GC3Dint dstY1, GC3Dbitfield mask, GC3Denum filter);
void renderbufferStorageMultisampleCHROMIUM(GC3Denum target, GC3Dsizei samples, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height);
@@ -329,7 +325,6 @@
OwnPtr<GraphicsContextLostCallbackAdapter> m_contextLostCallbackAdapter;
OwnPtr<GraphicsErrorMessageCallbackAdapter> m_errorMessageCallbackAdapter;
OwnPtr<GraphicsContext3DSwapBuffersCompleteCallbackAdapter> m_swapBuffersCompleteCallbackAdapter;
- OwnPtr<GraphicsContext3DMemoryAllocationChangedCallbackAdapter> m_memoryAllocationChangedCallbackAdapter;
WebKit::WebViewImpl* m_webViewImpl;
bool m_initializedAvailableExtensions;
HashSet<String> m_enabledExtensions;
Modified: trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h (108073 => 108074)
--- trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h 2012-02-17 15:53:05 UTC (rev 108073)
+++ trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h 2012-02-17 16:06:14 UTC (rev 108074)
@@ -65,8 +65,6 @@
virtual void setVisibilityCHROMIUM(bool visible) { }
- virtual void setMemoryAllocationChangedCallbackCHROMIUM(WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) { }
-
virtual WebString getRequestableExtensionsCHROMIUM() { return WebString(); }
virtual void requestExtensionCHROMIUM(const char*) { }
