Changeset 106881 in webkit

Timestamp:

Feb 6, 2012 5:09:43 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Add webGLErrorsToConsoleEnabled Settings flag
​https://bugs.webkit.org/show_bug.cgi?id=77696

Patch by Gregg Tavares <​gman@google.com> on 2012-02-06
Reviewed by Kenneth Russell.

No new tests as there is no change in behavior.

• html/canvas/WebGLRenderingContext.cpp:

(WebCore):
(WebCore::WebGLRenderingContext::setupFlags):

• page/Settings.cpp:

(WebCore::Settings::Settings):

• page/Settings.h:

(Settings):
(WebCore::Settings::webGLErrorsToConsoleEnabled):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)
• page/Settings.cpp (modified) (2 diffs)
• page/Settings.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Gregg Tavares  <gman@google.com>
+
+        Add webGLErrorsToConsoleEnabled Settings flag
+        https://bugs.webkit.org/show_bug.cgi?id=77696
+
+        Reviewed by Kenneth Russell.
+
+        No new tests as there is no change in behavior.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        (WebCore::WebGLRenderingContext::setupFlags):
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        (Settings):
+        (WebCore::Settings::webGLErrorsToConsoleEnabled):
+
 2012-02-06  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -517 +517 @@
 {
     ASSERT(m_context);
+
+    Page* p = canvas()->document()->page();
+    if (p && p->settings()->webGLErrorsToConsoleEnabled())
+        m_synthesizedErrorsToConsole = true;
 
     m_isGLES2Compliant = m_context->isGLES2Compliant();

trunk/Source/WebCore/page/Settings.cpp

@@ -190 +190 @@
     , m_experimentalNotificationsEnabled(false)
     , m_webGLEnabled(false)
+    , m_webGLErrorsToConsoleEnabled(false)
     , m_openGLMultisamplingEnabled(true)
     , m_privilegedWebGLExtensionsEnabled(false)
@@ -807 +808 @@
 }
 
+void Settings::setWebGLErrorsToConsoleEnabled(bool enabled)
+{
+    m_webGLErrorsToConsoleEnabled = enabled;
+}
+
 void Settings::setOpenGLMultisamplingEnabled(bool enabled)
 {

trunk/Source/WebCore/page/Settings.h

@@ -357 +357 @@
         void setWebGLEnabled(bool);
         bool webGLEnabled() const { return m_webGLEnabled; }
+
+        void setWebGLErrorsToConsoleEnabled(bool);
+        bool webGLErrorsToConsoleEnabled() const { return m_webGLErrorsToConsoleEnabled; }
 
         void setOpenGLMultisamplingEnabled(bool);
@@ -624 +627 @@
         bool m_experimentalNotificationsEnabled : 1;
         bool m_webGLEnabled : 1;
+        bool m_webGLErrorsToConsoleEnabled : 1;
         bool m_openGLMultisamplingEnabled : 1;
         bool m_privilegedWebGLExtensionsEnabled : 1;