Title: [106881] trunk/Source/WebCore
- Revision
- 106881
- Author
- [email protected]
- Date
- 2012-02-06 17:09:43 -0800 (Mon, 06 Feb 2012)
Log Message
Add webGLErrorsToConsoleEnabled Settings flag
https://bugs.webkit.org/show_bug.cgi?id=77696
Patch by Gregg Tavares <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106880 => 106881)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 01:07:59 UTC (rev 106880)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 01:09:43 UTC (rev 106881)
@@ -1,3 +1,21 @@
+2012-02-06 Gregg Tavares <[email protected]>
+
+ 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 <[email protected]>
Convert PopupMenuClient::clientPadding over to new layout abstraction
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (106880 => 106881)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2012-02-07 01:07:59 UTC (rev 106880)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2012-02-07 01:09:43 UTC (rev 106881)
@@ -517,6 +517,10 @@
{
ASSERT(m_context);
+ Page* p = canvas()->document()->page();
+ if (p && p->settings()->webGLErrorsToConsoleEnabled())
+ m_synthesizedErrorsToConsole = true;
+
m_isGLES2Compliant = m_context->isGLES2Compliant();
m_isErrorGeneratedOnOutOfBoundsAccesses = m_context->getExtensions()->isEnabled("GL_CHROMIUM_strict_attribs");
m_isResourceSafe = m_context->getExtensions()->isEnabled("GL_CHROMIUM_resource_safe");
Modified: trunk/Source/WebCore/page/Settings.cpp (106880 => 106881)
--- trunk/Source/WebCore/page/Settings.cpp 2012-02-07 01:07:59 UTC (rev 106880)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-02-07 01:09:43 UTC (rev 106881)
@@ -189,6 +189,7 @@
, m_showRepaintCounter(false)
, m_experimentalNotificationsEnabled(false)
, m_webGLEnabled(false)
+ , m_webGLErrorsToConsoleEnabled(false)
, m_openGLMultisamplingEnabled(true)
, m_privilegedWebGLExtensionsEnabled(false)
, m_webAudioEnabled(false)
@@ -806,6 +807,11 @@
m_webGLEnabled = enabled;
}
+void Settings::setWebGLErrorsToConsoleEnabled(bool enabled)
+{
+ m_webGLErrorsToConsoleEnabled = enabled;
+}
+
void Settings::setOpenGLMultisamplingEnabled(bool enabled)
{
m_openGLMultisamplingEnabled = enabled;
Modified: trunk/Source/WebCore/page/Settings.h (106880 => 106881)
--- trunk/Source/WebCore/page/Settings.h 2012-02-07 01:07:59 UTC (rev 106880)
+++ trunk/Source/WebCore/page/Settings.h 2012-02-07 01:09:43 UTC (rev 106881)
@@ -357,6 +357,9 @@
void setWebGLEnabled(bool);
bool webGLEnabled() const { return m_webGLEnabled; }
+ void setWebGLErrorsToConsoleEnabled(bool);
+ bool webGLErrorsToConsoleEnabled() const { return m_webGLErrorsToConsoleEnabled; }
+
void setOpenGLMultisamplingEnabled(bool);
bool openGLMultisamplingEnabled() const { return m_openGLMultisamplingEnabled; }
@@ -623,6 +626,7 @@
bool m_showRepaintCounter : 1;
bool m_experimentalNotificationsEnabled : 1;
bool m_webGLEnabled : 1;
+ bool m_webGLErrorsToConsoleEnabled : 1;
bool m_openGLMultisamplingEnabled : 1;
bool m_privilegedWebGLExtensionsEnabled : 1;
bool m_webAudioEnabled : 1;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
