Title: [167865] trunk/Source/WebKit2
- Revision
- 167865
- Author
- [email protected]
- Date
- 2014-04-27 16:13:05 -0700 (Sun, 27 Apr 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167864 => 167865)
--- trunk/Source/WebKit2/ChangeLog 2014-04-27 22:47:54 UTC (rev 167864)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-27 23:13:05 UTC (rev 167865)
@@ -1,3 +1,14 @@
+2014-04-27 Dan Bernstein <[email protected]>
+
+ [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 <[email protected]>
REGRESSION (r164702): Double tap doesn't stay under the new element once the animation finishes
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (167864 => 167865)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2014-04-27 22:47:54 UTC (rev 167864)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2014-04-27 23:13:05 UTC (rev 167865)
@@ -131,7 +131,10 @@
#if WK_API_ENABLED
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();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
