Diff
Modified: branches/safari-536.26-branch/Source/WebKit2/ChangeLog (125308 => 125309)
--- branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-10 18:49:27 UTC (rev 125309)
@@ -1,5 +1,10 @@
2012-08-010 Lucas Forschler <[email protected]>
+ Rollout r124956.
+ This was 124649 on trunk.
+
+2012-08-010 Lucas Forschler <[email protected]>
+
Rollout r124959.
This was 124652 on branch.
Modified: branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (125308 => 125309)
--- branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-08-10 18:49:27 UTC (rev 125309)
@@ -815,16 +815,6 @@
return toImpl(preferencesRef)->asynchronousPluginInitializationEnabled();
}
-void WKPreferencesSetAsynchronousPluginInitializationEnabledForAllPlugins(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setAsynchronousPluginInitializationEnabledForAllPlugins(enabled);
-}
-
-bool WKPreferencesGetAsynchronousPluginInitializationEnabledForAllPlugins(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->asynchronousPluginInitializationEnabledForAllPlugins();
-}
-
void WKPreferencesSetArtificialPluginInitializationDelayEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
toImpl(preferencesRef)->setArtificialPluginInitializationDelayEnabled(enabled);
Modified: branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (125308 => 125309)
--- branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2012-08-10 18:49:27 UTC (rev 125309)
@@ -188,10 +188,6 @@
WK_EXPORT bool WKPreferencesGetAsynchronousPluginInitializationEnabled(WKPreferencesRef preferencesRef);
// Defaults to false
-WK_EXPORT void WKPreferencesSetAsynchronousPluginInitializationEnabledForAllPlugins(WKPreferencesRef preferencesRef, bool enabled);
-WK_EXPORT bool WKPreferencesGetAsynchronousPluginInitializationEnabledForAllPlugins(WKPreferencesRef preferencesRef);
-
-// Defaults to false
WK_EXPORT void WKPreferencesSetArtificialPluginInitializationDelayEnabled(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesGetArtificialPluginInitializationDelayEnabled(WKPreferencesRef preferencesRef);
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (125308 => 125309)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-08-10 18:49:27 UTC (rev 125309)
@@ -125,30 +125,6 @@
// FIXME: Need an explicit way to set "WebKitTabToLinksPreferenceKey" directly in WebPage.
- if (preference == "WebKit2AsynchronousPluginInitializationEnabled") {
- WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::asynchronousPluginInitializationEnabledKey(), enabled);
- for (HashSet<Page*>::iterator i = pages.begin(); i != pages.end(); ++i) {
- WebPage* webPage = static_cast<WebFrameLoaderClient*>((*i)->mainFrame()->loader()->client())->webFrame()->page();
- webPage->setAsynchronousPluginInitializationEnabled(enabled);
- }
- }
-
- if (preference == "WebKit2AsynchronousPluginInitializationEnabledForAllPlugins") {
- WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::asynchronousPluginInitializationEnabledForAllPluginsKey(), enabled);
- for (HashSet<Page*>::iterator i = pages.begin(); i != pages.end(); ++i) {
- WebPage* webPage = static_cast<WebFrameLoaderClient*>((*i)->mainFrame()->loader()->client())->webFrame()->page();
- webPage->setAsynchronousPluginInitializationEnabledForAllPlugins(enabled);
- }
- }
-
- if (preference == "WebKit2ArtificialPluginInitializationDelayEnabled") {
- WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::artificialPluginInitializationDelayEnabledKey(), enabled);
- for (HashSet<Page*>::iterator i = pages.begin(); i != pages.end(); ++i) {
- WebPage* webPage = static_cast<WebFrameLoaderClient*>((*i)->mainFrame()->loader()->client())->webFrame()->page();
- webPage->setArtificialPluginInitializationDelayEnabled(enabled);
- }
- }
-
// Map the names used in LayoutTests with the names used in WebCore::Settings and WebPreferencesStore.
#define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \
macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (125308 => 125309)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-10 18:49:27 UTC (rev 125309)
@@ -190,7 +190,6 @@
, m_isClosed(false)
, m_tabToLinks(false)
, m_asynchronousPluginInitializationEnabled(false)
- , m_asynchronousPluginInitializationEnabledForAllPlugins(false)
, m_artificialPluginInitializationDelayEnabled(false)
#if PLATFORM(MAC)
, m_windowIsVisible(false)
@@ -1920,7 +1919,6 @@
m_tabToLinks = store.getBoolValueForKey(WebPreferencesKey::tabsToLinksKey());
m_asynchronousPluginInitializationEnabled = store.getBoolValueForKey(WebPreferencesKey::asynchronousPluginInitializationEnabledKey());
- m_asynchronousPluginInitializationEnabledForAllPlugins = store.getBoolValueForKey(WebPreferencesKey::asynchronousPluginInitializationEnabledForAllPluginsKey());
m_artificialPluginInitializationDelayEnabled = store.getBoolValueForKey(WebPreferencesKey::artificialPluginInitializationDelayEnabledKey());
// FIXME: This should be generated from macro expansion for all preferences,
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (125308 => 125309)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-08-10 18:49:27 UTC (rev 125309)
@@ -536,11 +536,7 @@
#endif
bool asynchronousPluginInitializationEnabled() const { return m_asynchronousPluginInitializationEnabled; }
- void setAsynchronousPluginInitializationEnabled(bool enabled) { m_asynchronousPluginInitializationEnabled = enabled; }
- bool asynchronousPluginInitializationEnabledForAllPlugins() const { return m_asynchronousPluginInitializationEnabledForAllPlugins; }
- void setAsynchronousPluginInitializationEnabledForAllPlugins(bool enabled) { m_asynchronousPluginInitializationEnabledForAllPlugins = enabled; }
bool artificialPluginInitializationDelayEnabled() const { return m_artificialPluginInitializationDelayEnabled; }
- void setArtificialPluginInitializationDelayEnabled(bool enabled) { m_artificialPluginInitializationDelayEnabled = enabled; }
private:
WebPage(uint64_t pageID, const WebPageCreationParameters&);
@@ -725,7 +721,6 @@
bool m_tabToLinks;
bool m_asynchronousPluginInitializationEnabled;
- bool m_asynchronousPluginInitializationEnabledForAllPlugins;
bool m_artificialPluginInitializationDelayEnabled;
#if PLATFORM(MAC)
Modified: branches/safari-536.26-branch/Tools/ChangeLog (125308 => 125309)
--- branches/safari-536.26-branch/Tools/ChangeLog 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Tools/ChangeLog 2012-08-10 18:49:27 UTC (rev 125309)
@@ -1,5 +1,10 @@
2012-08-010 Lucas Forschler <[email protected]>
+ Rollout r124956.
+ This was 124649 on trunk.
+
+2012-08-010 Lucas Forschler <[email protected]>
+
Rollout r124961.
This was 124815 on trunk.
Modified: branches/safari-536.26-branch/Tools/WebKitTestRunner/TestController.cpp (125308 => 125309)
--- branches/safari-536.26-branch/Tools/WebKitTestRunner/TestController.cpp 2012-08-10 18:47:02 UTC (rev 125308)
+++ branches/safari-536.26-branch/Tools/WebKitTestRunner/TestController.cpp 2012-08-10 18:49:27 UTC (rev 125309)
@@ -451,9 +451,6 @@
WKPreferencesSetFullScreenEnabled(preferences, true);
#endif
WKPreferencesSetPageCacheEnabled(preferences, false);
- WKPreferencesSetAsynchronousPluginInitializationEnabled(preferences, false);
- WKPreferencesSetAsynchronousPluginInitializationEnabledForAllPlugins(preferences, false);
- WKPreferencesSetArtificialPluginInitializationDelayEnabled(preferences, false);
// [Qt][WK2]REGRESSION(r104881):It broke hundreds of tests
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=76247
