[chromium] When GC3DPrivate::initializExtensions fails, dont keep retrying

natduca · natduca · commit 4d2344715b96 · 2011-11-09T04:03:39.000Z
https://bugs.webkit.org/show_bug.cgi?id=71637 Reviewed by Kenneth Russell. * src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContext3DPrivate::initializeExtensions): Canonical link: https://commits.webkit.org/88215@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@99648 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-08  Nat Duca  <nduca@chromium.org>
+
+        [chromium] When GC3DPrivate::initializExtensions fails, dont keep retrying
+        https://bugs.webkit.org/show_bug.cgi?id=71637
+
+        Reviewed by Kenneth Russell.
+
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DPrivate::initializeExtensions):
+
 2011-11-08  Adam Klein  <adamk@chromium.org>
 
         Use a typedef for ExceptionCode in all header files instead of including ExceptionCode.h
diff --git a/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp b/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
@@ -826,17 +826,20 @@ String mapExtensionName(const String& name)
 
 void GraphicsContext3DPrivate::initializeExtensions()
 {
+    if (m_initializedAvailableExtensions)
+        return;
+
+    m_initializedAvailableExtensions = true;
     bool success = makeContextCurrent();
     ASSERT(success);
-    if (success && !m_initializedAvailableExtensions) {
-        String extensionsString = getString(GraphicsContext3D::EXTENSIONS);
-        splitStringHelper(extensionsString, m_enabledExtensions);
+    if (!success)
+        return;
 
-        String requestableExtensionsString = m_impl->getRequestableExtensionsCHROMIUM();
-        splitStringHelper(requestableExtensionsString, m_requestableExtensions);
+    String extensionsString = getString(GraphicsContext3D::EXTENSIONS);
+    splitStringHelper(extensionsString, m_enabledExtensions);
 
-        m_initializedAvailableExtensions = true;
-    }
+    String requestableExtensionsString = m_impl->getRequestableExtensionsCHROMIUM();
+    splitStringHelper(requestableExtensionsString, m_requestableExtensions);
 }
 
 
