Modified: branches/safari-536.26-branch/Source/WebKit2/ChangeLog (125307 => 125308)
--- branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-10 18:42:42 UTC (rev 125307)
+++ branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-10 18:47:02 UTC (rev 125308)
@@ -1,5 +1,10 @@
2012-08-010 Lucas Forschler <[email protected]>
+ Rollout r124959.
+ This was 124652 on branch.
+
+2012-08-010 Lucas Forschler <[email protected]>
+
Rollout r124961.
This was 124815 on trunk.
Modified: branches/safari-536.26-branch/Source/WebKit2/Shared/WebPreferencesStore.h (125307 => 125308)
--- branches/safari-536.26-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2012-08-10 18:42:42 UTC (rev 125307)
+++ branches/safari-536.26-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2012-08-10 18:47:02 UTC (rev 125308)
@@ -113,7 +113,6 @@
macro(WantsBalancedSetDefersLoadingBehavior, wantsBalancedSetDefersLoadingBehavior, Bool, bool, false) \
macro(DiagnosticLoggingEnabled, diagnosticLoggingEnabled, Bool, bool, false) \
macro(AsynchronousPluginInitializationEnabled, asynchronousPluginInitializationEnabled, Bool, bool, false) \
- macro(AsynchronousPluginInitializationEnabledForAllPlugins, asynchronousPluginInitializationEnabledForAllPlugins, Bool, bool, false) \
macro(ArtificialPluginInitializationDelayEnabled, artificialPluginInitializationDelayEnabled, Bool, bool, false) \
\
