Title: [121220] trunk/Source/WebCore
- Revision
- 121220
- Author
- [email protected]
- Date
- 2012-06-25 20:37:53 -0700 (Mon, 25 Jun 2012)
Log Message
[chromium] Remove uncalled ManagedTexture::framebufferTexture2D
https://bugs.webkit.org/show_bug.cgi?id=89930
Patch by James Robinson <[email protected]> on 2012-06-25
Reviewed by Adrienne Walker.
Removing dead code.
* platform/graphics/chromium/ManagedTexture.cpp:
* platform/graphics/chromium/ManagedTexture.h:
(ManagedTexture):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121219 => 121220)
--- trunk/Source/WebCore/ChangeLog 2012-06-26 03:28:53 UTC (rev 121219)
+++ trunk/Source/WebCore/ChangeLog 2012-06-26 03:37:53 UTC (rev 121220)
@@ -1,3 +1,16 @@
+2012-06-25 James Robinson <[email protected]>
+
+ [chromium] Remove uncalled ManagedTexture::framebufferTexture2D
+ https://bugs.webkit.org/show_bug.cgi?id=89930
+
+ Reviewed by Adrienne Walker.
+
+ Removing dead code.
+
+ * platform/graphics/chromium/ManagedTexture.cpp:
+ * platform/graphics/chromium/ManagedTexture.h:
+ (ManagedTexture):
+
2012-06-25 Sheriff Bot <[email protected]>
Unreviewed, rolling out r121206.
Modified: trunk/Source/WebCore/platform/graphics/chromium/ManagedTexture.cpp (121219 => 121220)
--- trunk/Source/WebCore/platform/graphics/chromium/ManagedTexture.cpp 2012-06-26 03:28:53 UTC (rev 121219)
+++ trunk/Source/WebCore/platform/graphics/chromium/ManagedTexture.cpp 2012-06-26 03:37:53 UTC (rev 121220)
@@ -131,17 +131,6 @@
context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, m_textureId);
}
-void ManagedTexture::framebufferTexture2D(CCGraphicsContext* context, TextureAllocator* allocator)
-{
- allocate(allocator);
- WebGraphicsContext3D* context3d = context->context3D();
- if (!context3d) {
- // FIXME: Implement this path for software compositing.
- return;
- }
- context3d->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_textureId, 0);
-}
-
PassOwnPtr<ManagedTexture> ManagedTexture::steal()
{
OwnPtr<ManagedTexture> texture = adoptPtr(new ManagedTexture(m_textureManager, m_token, m_size, m_format, m_textureId));
Modified: trunk/Source/WebCore/platform/graphics/chromium/ManagedTexture.h (121219 => 121220)
--- trunk/Source/WebCore/platform/graphics/chromium/ManagedTexture.h 2012-06-26 03:28:53 UTC (rev 121219)
+++ trunk/Source/WebCore/platform/graphics/chromium/ManagedTexture.h 2012-06-26 03:37:53 UTC (rev 121220)
@@ -59,7 +59,6 @@
void allocate(TextureAllocator*);
void bindTexture(CCGraphicsContext*, TextureAllocator*);
- void framebufferTexture2D(CCGraphicsContext*, TextureAllocator*);
IntSize size() const { return m_size; }
unsigned format() const { return m_format; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
