Title: [90878] trunk/Source/WebKit/chromium
- Revision
- 90878
- Author
- [email protected]
- Date
- 2011-07-12 19:28:17 -0700 (Tue, 12 Jul 2011)
Log Message
Added the ability to dynamically change the parent context of a WebGraphicsContext3D.
GraphicsContext3DInternal::platformTexture uses this to set the parent as appropriate.
https://bugs.webkit.org/show_bug.cgi?id=64397
Patch by Al Patrick <[email protected]> on 2011-07-12
Reviewed by Kenneth Russell.
* public/WebGraphicsContext3D.h:
(WebKit::WebGraphicsContext3D::setParentContext):
* src/GraphicsContext3DChromium.cpp:
(WebCore::GraphicsContext3DInternal::platformTexture):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (90877 => 90878)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-13 01:46:09 UTC (rev 90877)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-13 02:28:17 UTC (rev 90878)
@@ -1,3 +1,16 @@
+2011-07-12 Al Patrick <[email protected]>
+
+ Added the ability to dynamically change the parent context of a WebGraphicsContext3D.
+ GraphicsContext3DInternal::platformTexture uses this to set the parent as appropriate.
+ https://bugs.webkit.org/show_bug.cgi?id=64397
+
+ Reviewed by Kenneth Russell.
+
+ * public/WebGraphicsContext3D.h:
+ (WebKit::WebGraphicsContext3D::setParentContext):
+ * src/GraphicsContext3DChromium.cpp:
+ (WebCore::GraphicsContext3DInternal::platformTexture):
+
2011-07-12 James Robinson <[email protected]>
[chromium] Delete the unused legacy accelerated canvas 2d code
Modified: trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h (90877 => 90878)
--- trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h 2011-07-13 01:46:09 UTC (rev 90877)
+++ trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h 2011-07-13 02:28:17 UTC (rev 90878)
@@ -132,6 +132,8 @@
// Query whether it is built on top of compliant GLES2 implementation.
virtual bool isGLES2Compliant() = 0;
+ virtual bool setParentContext(WebGraphicsContext3D* parentContext) { return false; }
+
// Helper for software compositing path. Reads back the frame buffer into
// the memory region pointed to by "pixels" with size "bufferSize". It is
// expected that the storage for "pixels" covers (4 * width * height) bytes.
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (90877 => 90878)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-07-13 01:46:09 UTC (rev 90877)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-07-13 02:28:17 UTC (rev 90878)
@@ -154,6 +154,7 @@
Platform3DObject GraphicsContext3DInternal::platformTexture() const
{
+ m_impl->setParentContext(m_webViewImpl->graphicsContext3D());
return m_impl->getPlatformTextureId();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
