Changeset 167865 in webkit

Timestamp:

Apr 27, 2014 4:13:05 PM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] -[WKWebProcessPlugInController parameters] returns nil if no parameters have been set yet
​https://bugs.webkit.org/show_bug.cgi?id=132223

Reviewed by Sam Weinig.

• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:

(WebKit::InjectedBundle::bundleParameters): Create the WKWebProcessBundleParameters if
needed.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-27  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] -[WKWebProcessPlugInController parameters] returns nil if no parameters have been set yet
+        https://bugs.webkit.org/show_bug.cgi?id=132223
+
+        Reviewed by Sam Weinig.
+
+        * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WebKit::InjectedBundle::bundleParameters): Create the WKWebProcessBundleParameters if
+        needed.
+
 2014-04-27  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm

@@ -132 +132 @@
 WKWebProcessBundleParameters *InjectedBundle::bundleParameters()
 {
-    ASSERT(m_bundleParameters);
+    // We must not return nil even if no parameters are currently set, in order to allow the client
+    // to use KVO.
+    if (!m_bundleParameters)
+        m_bundleParameters = adoptNS([[WKWebProcessBundleParameters alloc] initWithDictionary:@{ }]);
 
     return m_bundleParameters.get();