Title: [99648] trunk/Source/WebKit/chromium
- Revision
- 99648
- Author
- nd...@chromium.org
- Date
- 2011-11-08 20:03:39 -0800 (Tue, 08 Nov 2011)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (99647 => 99648)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-09 03:02:14 UTC (rev 99647)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-09 04:03:39 UTC (rev 99648)
@@ -1,3 +1,13 @@
+2011-11-08 Nat Duca <nd...@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 <ad...@chromium.org>
Use a typedef for ExceptionCode in all header files instead of including ExceptionCode.h
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (99647 => 99648)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-11-09 03:02:14 UTC (rev 99647)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-11-09 04:03:39 UTC (rev 99648)
@@ -826,17 +826,20 @@
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);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
