Changeset 93564 in webkit

Timestamp:

Aug 22, 2011 5:14:13 PM (13 years ago)

Author:

nduca@chromium.org

Message:

Make GraphicsContext3D::isResourceSafe a function and, on Chromium, determine its value lazily
​https://bugs.webkit.org/show_bug.cgi?id=66708

Reviewed by Kenneth Russell.

Source/WebCore:

• platform/graphics/GraphicsContext3D.cpp:

(WebCore::GraphicsContext3D::texImage2DResourceSafe):

• platform/graphics/GraphicsContext3D.h:
• platform/graphics/gtk/GraphicsContext3DGtk.cpp:

(WebCore::GraphicsContext3D::GraphicsContext3D):

• platform/graphics/mac/GraphicsContext3DMac.mm:

(WebCore::GraphicsContext3D::GraphicsContext3D):

• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::isResourceSafe):

• platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3D::GraphicsContext3D):

Source/WebKit/chromium:

• src/GraphicsContext3DChromium.cpp:

(WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal):
(WebCore::GraphicsContext3DInternal::isResourceSafe):
(WebCore::GraphicsContext3D::create):
(WebCore::GraphicsContext3D::isResourceSafe):

• src/GraphicsContext3DInternal.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext3D.cpp (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp (modified) (1 diff)
• WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (modified) (1 diff)
• WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (1 diff)
• WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/GraphicsContext3DChromium.cpp (modified) (4 diffs)
• WebKit/chromium/src/GraphicsContext3DInternal.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-22  Nat Duca  <nduca@chromium.org>
+
+        Make GraphicsContext3D::isResourceSafe a function and, on Chromium, determine its value lazily
+        https://bugs.webkit.org/show_bug.cgi?id=66708
+
+        Reviewed by Kenneth Russell.
+
+        * platform/graphics/GraphicsContext3D.cpp:
+        (WebCore::GraphicsContext3D::texImage2DResourceSafe):
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/gtk/GraphicsContext3DGtk.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::isResourceSafe):
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2011-08-22  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp

@@ -67 +67 @@
     ASSERT(unpackAlignment == 1 || unpackAlignment == 2 || unpackAlignment == 4 || unpackAlignment == 8);
     OwnArrayPtr<unsigned char> zero;
-    if (!m_isResourceSafe && width > 0 && height > 0) {
+    if (!isResourceSafe() && width > 0 && height > 0) {
         unsigned int size;
         GC3Denum error = computeImageSizeInBytes(format, type, width, height, unpackAlignment, &size, 0);

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -906 +906 @@
 
     int m_currentWidth, m_currentHeight;
-    bool m_isResourceSafe;
+    bool isResourceSafe();
 
 #if PLATFORM(MAC)

trunk/Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp

@@ -56 +56 @@
     : m_currentWidth(0)
     , m_currentHeight(0)
-    , m_isResourceSafe(false)
     , m_attrs(attributes)
     , m_texture(0)

trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm

@@ -91 +91 @@
     : m_currentWidth(0)
     , m_currentHeight(0)
-    , m_isResourceSafe(false)
     , m_contextObj(0)
     , m_attrs(attrs)

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

@@ -121 +121 @@
     if (mustRestoreFBO)
         ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
+}
+
+bool GraphicsContext3D::isResourceSafe()
+{
+    return false;
 }
 

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -294 +294 @@
     : m_currentWidth(0)
     , m_currentHeight(0)
-    , m_isResourceSafe(false)
     , m_attrs(attrs)
     , m_texture(0)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-22  Nat Duca  <nduca@chromium.org>
+
+        Make GraphicsContext3D::isResourceSafe a function and, on Chromium, determine its value lazily
+        https://bugs.webkit.org/show_bug.cgi?id=66708
+
+        Reviewed by Kenneth Russell.
+
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal):
+        (WebCore::GraphicsContext3DInternal::isResourceSafe):
+        (WebCore::GraphicsContext3D::create):
+        (WebCore::GraphicsContext3D::isResourceSafe):
+        * src/GraphicsContext3DInternal.h:
+
 2011-08-22  Adam Klein  <adamk@chromium.org>
 

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

@@ -88 +88 @@
     , m_initializedAvailableExtensions(false)
     , m_layerComposited(false)
+    , m_resourceSafety(ResourceSafetyUnknown)
 #if USE(SKIA)
     , m_grContext(0)
@@ -759 +760 @@
 }
 
+bool GraphicsContext3DInternal::isResourceSafe()
+{
+    if (m_resourceSafety == ResourceSafetyUnknown)
+        m_resourceSafety = getExtensions()->isEnabled("GL_CHROMIUM_resource_safe") ? ResourceSafe : ResourceUnsafe;
+    return m_resourceSafety == ResourceSafe;
+}
+
 namespace {
 
@@ -973 +981 @@
     RefPtr<GraphicsContext3D> result = adoptRef(new GraphicsContext3D(attrs, hostWindow, renderStyle == RenderDirectlyToHostWindow));
     result->m_internal = internal.release();
-    result->m_isResourceSafe = result->getExtensions()->isEnabled("GL_CHROMIUM_resource_safe");
     return result.release();
 }
@@ -1002 +1009 @@
 {
     return m_internal->getInternalFramebufferSize();
+}
+
+bool GraphicsContext3D::isResourceSafe()
+{
+    return m_internal->isResourceSafe();
 }
 

trunk/Source/WebKit/chromium/src/GraphicsContext3DInternal.h

@@ -76 +76 @@
     void reshape(int width, int height);
     IntSize getInternalFramebufferSize() const;
+    bool isResourceSafe();
 
     void markContextChanged();
@@ -299 +300 @@
     HashSet<String> m_requestableExtensions;
     bool m_layerComposited;
+
+    enum ResourceSafety {
+        ResourceSafetyUnknown,
+        ResourceSafe,
+        ResourceUnsafe
+    };
+    ResourceSafety m_resourceSafety;
+
 #if USE(ACCELERATED_COMPOSITING)
     RefPtr<WebGLLayerChromium> m_compositingLayer;