Modified: trunk/Source/WebKit/chromium/ChangeLog (91440 => 91441)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-21 02:29:11 UTC (rev 91440)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-21 02:46:56 UTC (rev 91441)
@@ -1,3 +1,15 @@
+2011-07-20 Al Patrick <apatr...@chromium.org>
+
+ Set the parent context to that of the associated view when calling GraphicsContext3DChromium::copyTextureToParentCHROMIUM.
+ This fixes a race condition whereby the view window does not exist when the offscreen context is created. It allows
+ accelerated 2D canvases to be added to newly created window.
+ https://bugs.webkit.org/show_bug.cgi?id=64905
+
+ Reviewed by James Robinson.
+
+ * src/GraphicsContext3DChromium.cpp:
+ (WebCore::GraphicsContext3DInternal::copyTextureToParentTextureCHROMIUM):
+
2011-07-19 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Add support for disabling cache in web inspector.
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (91440 => 91441)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-07-21 02:29:11 UTC (rev 91440)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-07-21 02:46:56 UTC (rev 91441)
@@ -831,7 +831,13 @@
DELEGATE_TO_IMPL_1(unmapBufferSubDataCHROMIUM, const void*)
DELEGATE_TO_IMPL_9R(mapTexSubImage2DCHROMIUM, GC3Denum, GC3Dint, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei, GC3Denum, GC3Denum, GC3Denum, void*)
DELEGATE_TO_IMPL_1(unmapTexSubImage2DCHROMIUM, const void*)
-DELEGATE_TO_IMPL_2(copyTextureToParentTextureCHROMIUM, Platform3DObject, Platform3DObject)
+
+void GraphicsContext3DInternal::copyTextureToParentTextureCHROMIUM(Platform3DObject texture, Platform3DObject parentTexture)
+{
+ m_impl->setParentContext(m_webViewImpl->graphicsContext3D());
+ m_impl->copyTextureToParentTextureCHROMIUM(texture, parentTexture);
+}
+
DELEGATE_TO_IMPL_10(blitFramebufferCHROMIUM, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dbitfield, GC3Denum)
DELEGATE_TO_IMPL_5(renderbufferStorageMultisampleCHROMIUM, GC3Denum, GC3Dsizei, GC3Denum, GC3Dsizei, GC3Dsizei)
DELEGATE_TO_IMPL_1(getParentToChildLatchCHROMIUM, GC3Duint*)
