<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174392] releases/WebKitGTK/webkit-2.6/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174392">174392</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-07 00:42:40 -0700 (Tue, 07 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173776">r173776</a> - Multithreaded WebGL is a bad idea - remove it
https://bugs.webkit.org/show_bug.cgi?id=136964
<rdar://problem/18399858>
Reviewed by Brent Fulgham.
Source/WebCore:
We should not allow multithreaded GL access. Remove the
feature.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::create):
* page/Settings.in:
* platform/graphics/GraphicsContext3D.h:
(WebCore::GraphicsContext3D::Attributes::Attributes):
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Source/WebKit/mac:
Remove the setting to allow multithreaded WebGL.
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences multithreadedWebGLEnabled]): Deleted.
(-[WebPreferences setMultithreadedWebGLEnabled:]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Source/WebKit2:
Remove the setting to allow multithreaded WebGL.
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetMultithreadedWebGLEnabled): Deleted.
(WKPreferencesGetMultithreadedWebGLEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorehtmlcanvasWebGLRenderingContextcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorepageSettingsin">releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Settings.in</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsGraphicsContext3Dh">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKitmacChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebPreferenceKeysPrivateh">releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebPreferencesmm">releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebPreferencesPrivateh">releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebViewmm">releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2SharedWebPreferencesDefinitionsh">releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPICWKPreferencescpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2WebProcessWebPageWebPagecpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-09-19 Dean Jackson <dino@apple.com>
+
+ Multithreaded WebGL is a bad idea - remove it
+ https://bugs.webkit.org/show_bug.cgi?id=136964
+ <rdar://problem/18399858>
+
+ Reviewed by Brent Fulgham.
+
+ We should not allow multithreaded GL access. Remove the
+ feature.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::create):
+ * page/Settings.in:
+ * platform/graphics/GraphicsContext3D.h:
+ (WebCore::GraphicsContext3D::Attributes::Attributes):
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+
</ins><span class="cx"> 2014-09-26 Lorenzo Tilve <ltilve@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix support for the initial-letter CSS property to first-letter
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -431,9 +431,6 @@
</span><span class="cx"> attributes.shareResources = false;
</span><span class="cx"> attributes.preferDiscreteGPU = true;
</span><span class="cx">
</span><del>- if (frame->settings().multithreadedWebGLEnabled())
- attributes.multithreaded = true;
-
</del><span class="cx"> if (frame->settings().forceSoftwareWebGLRendering())
</span><span class="cx"> attributes.forceSoftwareRenderer = true;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Settings.in (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Settings.in 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Settings.in 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -100,7 +100,6 @@
</span><span class="cx"> webGLEnabled initial=false
</span><span class="cx"> webGLErrorsToConsoleEnabled initial=true
</span><span class="cx"> openGLMultisamplingEnabled initial=true
</span><del>-multithreadedWebGLEnabled initial=false
</del><span class="cx"> privilegedWebGLExtensionsEnabled initial=false
</span><span class="cx"> forceSoftwareWebGLRendering initial=false
</span><span class="cx"> accelerated2dCanvasEnabled initial=false
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/GraphicsContext3D.h (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -441,7 +441,6 @@
</span><span class="cx"> , noExtensions(false)
</span><span class="cx"> , shareResources(true)
</span><span class="cx"> , preferDiscreteGPU(false)
</span><del>- , multithreaded(false)
</del><span class="cx"> , forceSoftwareRenderer(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -455,7 +454,6 @@
</span><span class="cx"> bool noExtensions;
</span><span class="cx"> bool shareResources;
</span><span class="cx"> bool preferDiscreteGPU;
</span><del>- bool multithreaded;
</del><span class="cx"> bool forceSoftwareRenderer;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -207,14 +207,6 @@
</span><span class="cx"> // Set the current context to the one given to us.
</span><span class="cx"> CGLSetCurrentContext(m_contextObj);
</span><span class="cx">
</span><del>- if (attrs.multithreaded) {
- err = CGLEnable(m_contextObj, kCGLCEMPEngine);
- if (err != kCGLNoError) {
- // We could not create a multi-threaded context.
- m_contextObj = 0;
- return;
- }
- }
</del><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> validateAttributes();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/ChangeLog (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/ChangeLog 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/ChangeLog 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-09-19 Dean Jackson <dino@apple.com>
+
+ Multithreaded WebGL is a bad idea - remove it
+ https://bugs.webkit.org/show_bug.cgi?id=136964
+ <rdar://problem/18399858>
+
+ Reviewed by Brent Fulgham.
+
+ Remove the setting to allow multithreaded WebGL.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences multithreadedWebGLEnabled]): Deleted.
+ (-[WebPreferences setMultithreadedWebGLEnabled:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2014-09-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173695.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -106,7 +106,6 @@
</span><span class="cx"> #define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
</span><span class="cx"> #define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
</span><span class="cx"> #define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
</span><del>-#define WebKitMultithreadedWebGLEnabledPreferenceKey @"WebKitMultithreadedWebGLEnabled"
</del><span class="cx"> #define WebKitForceSoftwareWebGLRenderingPreferenceKey @"WebKitForceSoftwareWebGLRendering"
</span><span class="cx"> #define WebKitAccelerated2dCanvasEnabledPreferenceKey @"WebKitAccelerated2dCanvasEnabled"
</span><span class="cx"> #define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferences.mm (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferences.mm 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferences.mm 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -494,7 +494,6 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShowDebugBordersPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShowRepaintCounterPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitWebGLEnabledPreferenceKey,
</span><del>- [NSNumber numberWithBool:NO], WebKitMultithreadedWebGLEnabledPreferenceKey,
</del><span class="cx"> [NSNumber numberWithBool:NO], WebKitForceSoftwareWebGLRenderingPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAccelerated2dCanvasEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey,
</span><span class="lines">@@ -1874,16 +1873,6 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitWebGLEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)multithreadedWebGLEnabled
-{
- return [self _boolValueForKey:WebKitMultithreadedWebGLEnabledPreferenceKey];
-}
-
-- (void)setMultithreadedWebGLEnabled:(BOOL)enabled
-{
- [self _setBoolValue:enabled forKey:WebKitMultithreadedWebGLEnabledPreferenceKey];
-}
-
</del><span class="cx"> - (BOOL)forceSoftwareWebGLRendering
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitForceSoftwareWebGLRenderingPreferenceKey];
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -220,9 +220,6 @@
</span><span class="cx"> - (BOOL)webGLEnabled;
</span><span class="cx"> - (void)setWebGLEnabled:(BOOL)enabled;
</span><span class="cx">
</span><del>-- (BOOL)multithreadedWebGLEnabled;
-- (void)setMultithreadedWebGLEnabled:(BOOL)enabled;
-
</del><span class="cx"> - (BOOL)forceSoftwareWebGLRendering;
</span><span class="cx"> - (void)setForceSoftwareWebGLRendering:(BOOL)forced;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebView.mm (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebView.mm 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebView.mm 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -2333,9 +2333,6 @@
</span><span class="cx"> settings.setShowsURLsInToolTips([preferences showsURLsInToolTips]);
</span><span class="cx"> settings.setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
</span><span class="cx"> settings.setQTKitEnabled([preferences isQTKitEnabled]);
</span><del>-
- // FIXME: Should we enable this following <rdar://problem/15290404>?
- settings.setMultithreadedWebGLEnabled([preferences multithreadedWebGLEnabled]);
</del><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-19 Dean Jackson <dino@apple.com>
+
+ Multithreaded WebGL is a bad idea - remove it
+ https://bugs.webkit.org/show_bug.cgi?id=136964
+ <rdar://problem/18399858>
+
+ Reviewed by Brent Fulgham.
+
+ Remove the setting to allow multithreaded WebGL.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetMultithreadedWebGLEnabled): Deleted.
+ (WKPreferencesGetMultithreadedWebGLEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2014-09-29 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r172919): WebKitPluginProcess fails to scan GTK+2 plugins after r172919.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/WebPreferencesDefinitions.h (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx"> macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, DEFAULT_ACCELERATED_DRAWING_ENABLED) \
</span><span class="cx"> macro(CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing, Bool, bool, DEFAULT_CANVAS_USES_ACCELERATED_DRAWING) \
</span><span class="cx"> macro(WebGLEnabled, webGLEnabled, Bool, bool, true) \
</span><del>- macro(MultithreadedWebGLEnabled, multithreadedWebGLEnabled, Bool, bool, false) \
</del><span class="cx"> macro(ForceSoftwareWebGLRendering, forceSoftwareWebGLRendering, Bool, bool, false) \
</span><span class="cx"> macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \
</span><span class="cx"> macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -469,16 +469,6 @@
</span><span class="cx"> return toImpl(preferencesRef)->webGLEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetMultithreadedWebGLEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setMultithreadedWebGLEnabled(flag);
-}
-
-bool WKPreferencesGetMultithreadedWebGLEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->multithreadedWebGLEnabled();
-}
-
</del><span class="cx"> void WKPreferencesSetForceSoftwareWebGLRendering(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setForceSoftwareWebGLRendering(flag);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -93,10 +93,6 @@
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetWebGLEnabled(WKPreferencesRef);
</span><span class="cx">
</span><span class="cx"> // Defaults to false.
</span><del>-WK_EXPORT void WKPreferencesSetMultithreadedWebGLEnabled(WKPreferencesRef, bool);
-WK_EXPORT bool WKPreferencesGetMultithreadedWebGLEnabled(WKPreferencesRef);
-
-// Defaults to false.
</del><span class="cx"> WK_EXPORT void WKPreferencesSetForceSoftwareWebGLRendering(WKPreferencesRef, bool);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetForceSoftwareWebGLRendering(WKPreferencesRef);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (174391 => 174392)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-07 07:42:40 UTC (rev 174392)
</span><span class="lines">@@ -2702,7 +2702,6 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCompositingEnabledKey()));
</span><span class="cx"> settings.setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
</span><del>- settings.setMultithreadedWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::multithreadedWebGLEnabledKey()));
</del><span class="cx"> settings.setForceSoftwareWebGLRendering(store.getBoolValueForKey(WebPreferencesKey::forceSoftwareWebGLRenderingKey()));
</span><span class="cx"> settings.setAccelerated2dCanvasEnabled(store.getBoolValueForKey(WebPreferencesKey::accelerated2dCanvasEnabledKey()));
</span><span class="cx"> settings.setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
</span></span></pre>
</div>
</div>
</body>
</html>