Changeset 69633 in webkit

Timestamp:

Oct 12, 2010 7:25:52 PM (14 years ago)

Author:

kbr@google.com

Message:

2010-10-12 Kenneth Russell <​kbr@google.com>

Unreviewed. Fixes for all WebGL content causing assertion failures
in Chromium after ​http://trac.webkit.org/changeset/69619 and
​http://trac.webkit.org/changeset/69624 .

• src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContext3D::create):
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/GraphicsContext3DChromium.cpp (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-12  Kenneth Russell  <kbr@google.com>
+
+        Unreviewed. Fixes for all WebGL content causing assertion failures
+        in Chromium after http://trac.webkit.org/changeset/69619 and
+        http://trac.webkit.org/changeset/69624 .
+
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3D::create):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
 2010-10-12  Alok priyadarshi  <alokp@chromium.org>
 

trunk/WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@ -808 +808 @@
         return 0;
     }
-    RefPtr<GraphicsContext3D> result = new GraphicsContext3D(attrs, hostWindow, renderStyle == RenderDirectlyToHostWindow);
+    RefPtr<GraphicsContext3D> result = adoptRef(new GraphicsContext3D(attrs, hostWindow, renderStyle == RenderDirectlyToHostWindow));
     result->m_internal = internal.release();
     return result.release();

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -2370 +2370 @@
     }
 
-    RefPtr<GraphicsContext3D> context = m_temporaryOnscreenGraphicsContext3D.release();
+    PassRefPtr<GraphicsContext3D> context = m_temporaryOnscreenGraphicsContext3D.release();
     if (!context) {
         context = GraphicsContext3D::create(GraphicsContext3D::Attributes(), m_page->chrome(), GraphicsContext3D::RenderDirectlyToHostWindow);
@@ -2376 +2376 @@
             context->reshape(std::max(1, m_size.width), std::max(1, m_size.height));
     }
-    m_layerRenderer = LayerRendererChromium::create(context.release());
+    m_layerRenderer = LayerRendererChromium::create(context);
     if (m_layerRenderer) {
         m_isAcceleratedCompositingActive = true;