Changeset 133937 in webkit

Timestamp:

Nov 8, 2012, 1:09:48 PM (13 years ago)

Author:

Lucas Forschler

Message:

Merged r124393. <rdar://problem/12516369>

Location:

branches/safari-536.28-branch/Source/WebKit2

Files:

• ChangeLog (modified) (2 diffs)
• Shared/WebPreferencesStore.h (modified) (1 diff)
• UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• UIProcess/API/C/WKPreferencesPrivate.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)

branches/safari-536.28-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-08  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r124393
+
+    2012-08-01  Brady Eidson  <beidson@apple.com>
+
+            Small part of "Out-of-process plug-ins should support asynchronous initialization."
+            <rdar://problem/10598594> and https://bugs.webkit.org/show_bug.cgi?id=92919
+
+            Reviewed by Anders Carlsson.
+
+            Add API-level preferences for:
+            - Is asynchronous plug-in initialization enabled.
+            - Is an artificial initialization delay (for testing purposes) enabled.
+
+            * Shared/WebPreferencesStore.h:
+            (WebKit):
+
+            * UIProcess/API/C/WKPreferences.cpp:
+            (WKPreferencesSetAsynchronousPluginInitializationEnabled):
+            (WKPreferencesGetAsynchronousPluginInitializationEnabled):
+            (WKPreferencesSetArtificialPluginInitializationDelayEnabled):
+            (WKPreferencesGetArtificialPluginInitializationDelayEnabled):
+            * UIProcess/API/C/WKPreferencesPrivate.h:
+
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::WebPage):
+            (WebKit::WebPage::updatePreferences):
+            * WebProcess/WebPage/WebPage.h:
+            (WebKit::WebPage::asynchronousPluginInitializationEnabled):
+            (WebKit::WebPage::artificialPluginInitializationDelayEnabled):
+            (WebPage):
+
 2012-11-07  Lucas Forschler  <lforschler@apple.com>
 
@@ -47488 +47521 @@
 .
 .
+.

branches/safari-536.28-branch/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -113 +113 @@
     macro(WantsBalancedSetDefersLoadingBehavior, wantsBalancedSetDefersLoadingBehavior, Bool, bool, false) \
     macro(DiagnosticLoggingEnabled, diagnosticLoggingEnabled, Bool, bool, false) \
+    macro(AsynchronousPluginInitializationEnabled, asynchronousPluginInitializationEnabled, Bool, bool, false) \
+    macro(ArtificialPluginInitializationDelayEnabled, artificialPluginInitializationDelayEnabled, Bool, bool, false) \
     \
 

branches/safari-536.28-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -805 +805 @@
     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();
+}

branches/safari-536.28-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h

@@ -184 +184 @@
 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);
 

branches/safari-536.28-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -190 +190 @@
     , m_isClosed(false)
     , m_tabToLinks(false)
+    , m_asynchronousPluginInitializationEnabled(false)
+    , m_artificialPluginInitializationDelayEnabled(false)
 #if PLATFORM(MAC)
     , m_windowIsVisible(false)
@@ -1895 +1897 @@
 
     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,

branches/safari-536.28-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -534 +534 @@
 #endif
 
+    bool asynchronousPluginInitializationEnabled() const { return m_asynchronousPluginInitializationEnabled; }
+    bool artificialPluginInitializationDelayEnabled() const { return m_artificialPluginInitializationDelayEnabled; }
+
 private:
     WebPage(uint64_t pageID, const WebPageCreationParameters&);
@@ -715 +718 @@
 
     bool m_tabToLinks;
+    
+    bool m_asynchronousPluginInitializationEnabled;
+    bool m_artificialPluginInitializationDelayEnabled;
 
 #if PLATFORM(MAC)