Changeset 85126 in webkit

Timestamp:

Apr 27, 2011 5:17:30 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-04-27 Adam Barth <​abarth@webkit.org>

Reviewed by David Levin.

Make GraphicsContext3DChromium play nice with strict OwnPtrs
​https://bugs.webkit.org/show_bug.cgi?id=59659

Attempt #2. Hopefully this time I won't make everything crash.

• src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContext3DInternal::initialize):

Location:

trunk/Source/WebKit/chromium

Files:

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

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by David Levin.
+
+        Make GraphicsContext3DChromium play nice with strict OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=59659
+
+        Attempt #2.  Hopefully this time I won't make everything crash.
+
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DInternal::initialize):
+
 2011-04-27  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@ -110 +110 @@
     webAttributes.premultipliedAlpha = attrs.premultipliedAlpha;
     webAttributes.canRecoverFromContextLoss = attrs.canRecoverFromContextLoss;
-    WebKit::WebGraphicsContext3D* webContext = WebKit::webKitClient()->createGraphicsContext3D();
+    OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::webKitClient()->createGraphicsContext3D());
     if (!webContext)
         return false;
@@ -121 +121 @@
     if (!m_webViewImpl)
         return false;
-    if (!webContext->initialize(webAttributes, m_webViewImpl, renderDirectlyToHostWindow)) {
-        delete webContext;
+    if (!webContext->initialize(webAttributes, m_webViewImpl, renderDirectlyToHostWindow))
         return false;
-    }
-    m_impl.set(webContext);
+    m_impl = webContext.release();
 
 #if USE(ACCELERATED_COMPOSITING)