Diff
Modified: branches/safari-536.26-branch/Source/WebKit2/ChangeLog (125310 => 125311)
--- branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-10 18:59:29 UTC (rev 125310)
+++ branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-10 19:06:59 UTC (rev 125311)
@@ -1,5 +1,10 @@
2012-08-010 Lucas Forschler <[email protected]>
+ Rollout r124944.
+ This was 124961 on trunk.
+
+2012-08-010 Lucas Forschler <[email protected]>
+
Rollout r124956.
This was 124649 on trunk.
Modified: branches/safari-536.26-branch/Source/WebKit2/Shared/WebPreferencesStore.h (125310 => 125311)
--- branches/safari-536.26-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2012-08-10 18:59:29 UTC (rev 125310)
+++ branches/safari-536.26-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2012-08-10 19:06:59 UTC (rev 125311)
@@ -112,8 +112,6 @@
macro(ShouldRespectImageOrientation, shouldRespectImageOrientation, Bool, bool, false) \
macro(WantsBalancedSetDefersLoadingBehavior, wantsBalancedSetDefersLoadingBehavior, Bool, bool, false) \
macro(DiagnosticLoggingEnabled, diagnosticLoggingEnabled, Bool, bool, false) \
- macro(AsynchronousPluginInitializationEnabled, asynchronousPluginInitializationEnabled, Bool, bool, false) \
- macro(ArtificialPluginInitializationDelayEnabled, artificialPluginInitializationDelayEnabled, Bool, bool, false) \
\
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
Modified: branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (125310 => 125311)
--- branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-08-10 18:59:29 UTC (rev 125310)
+++ branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-08-10 19:06:59 UTC (rev 125311)
@@ -804,23 +804,3 @@
{
return toImpl(preferencesRef)->diagnosticLoggingEnabled();
}
-
-void WKPreferencesSetAsynchronousPluginInitializationEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setAsynchronousPluginInitializationEnabled(enabled);
-}
-
-bool WKPreferencesGetAsynchronousPluginInitializationEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->asynchronousPluginInitializationEnabled();
-}
-
-void WKPreferencesSetArtificialPluginInitializationDelayEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setArtificialPluginInitializationDelayEnabled(enabled);
-}
-
-bool WKPreferencesGetArtificialPluginInitializationDelayEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->artificialPluginInitializationDelayEnabled();
-}
Modified: branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (125310 => 125311)
--- branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2012-08-10 18:59:29 UTC (rev 125310)
+++ branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2012-08-10 19:06:59 UTC (rev 125311)
@@ -183,14 +183,6 @@
WK_EXPORT void WKPreferencesSetDiagnosticLoggingEnabled(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesGetDiagnosticLoggingEnabled(WKPreferencesRef preferencesRef);
-// Defaults to false
-WK_EXPORT void WKPreferencesSetAsynchronousPluginInitializationEnabled(WKPreferencesRef preferencesRef, bool enabled);
-WK_EXPORT bool WKPreferencesGetAsynchronousPluginInitializationEnabled(WKPreferencesRef preferencesRef);
-
-// Defaults to false
-WK_EXPORT void WKPreferencesSetArtificialPluginInitializationDelayEnabled(WKPreferencesRef preferencesRef, bool enabled);
-WK_EXPORT bool WKPreferencesGetArtificialPluginInitializationDelayEnabled(WKPreferencesRef preferencesRef);
-
WK_EXPORT void WKPreferencesResetTestRunnerOverrides(WKPreferencesRef preferencesRef);
#ifdef __cplusplus
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (125310 => 125311)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-10 18:59:29 UTC (rev 125310)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-10 19:06:59 UTC (rev 125311)
@@ -189,8 +189,6 @@
, m_isInRedo(false)
, m_isClosed(false)
, m_tabToLinks(false)
- , m_asynchronousPluginInitializationEnabled(false)
- , m_artificialPluginInitializationDelayEnabled(false)
#if PLATFORM(MAC)
, m_windowIsVisible(false)
, m_isSmartInsertDeleteEnabled(parameters.isSmartInsertDeleteEnabled)
@@ -1918,8 +1916,6 @@
Settings* settings = m_page->settings();
m_tabToLinks = store.getBoolValueForKey(WebPreferencesKey::tabsToLinksKey());
- m_asynchronousPluginInitializationEnabled = store.getBoolValueForKey(WebPreferencesKey::asynchronousPluginInitializationEnabledKey());
- m_artificialPluginInitializationDelayEnabled = store.getBoolValueForKey(WebPreferencesKey::artificialPluginInitializationDelayEnabledKey());
// FIXME: This should be generated from macro expansion for all preferences,
// but we currently don't match the naming of WebCore exactly so we are
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (125310 => 125311)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-08-10 18:59:29 UTC (rev 125310)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-08-10 19:06:59 UTC (rev 125311)
@@ -535,9 +535,6 @@
void setVisibilityState(int visibilityState, bool isInitialState);
#endif
- bool asynchronousPluginInitializationEnabled() const { return m_asynchronousPluginInitializationEnabled; }
- bool artificialPluginInitializationDelayEnabled() const { return m_artificialPluginInitializationDelayEnabled; }
-
private:
WebPage(uint64_t pageID, const WebPageCreationParameters&);
@@ -719,9 +716,6 @@
bool m_isClosed;
bool m_tabToLinks;
-
- bool m_asynchronousPluginInitializationEnabled;
- bool m_artificialPluginInitializationDelayEnabled;
#if PLATFORM(MAC)
// Whether the containing window is visible or not.
