Title: [178625] trunk/Source/WebKit2
- Revision
- 178625
- Author
- [email protected]
- Date
- 2015-01-17 08:49:53 -0800 (Sat, 17 Jan 2015)
Log Message
REGRESSION (r178618): Change to WKWebViewConfiguration broke iOS build
<https://bugs.webkit.org/show_bug.cgi?id=140559>
Blind fix to address the following build failure:
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:79:7: error: interface type cannot be statically allocated
T m_value;
^
*
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:94:55: note: in instantiation of template class 'LazyInitialized<WKWebViewContentProviderRegistry>' requested here
LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
^
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:53:21: error: assigning to 'WKWebViewContentProviderRegistry *' from incompatible type 'RetainPtr<WKWebViewContentProviderRegistry *>'
m_value = f();
^ ~~~
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:222:37: note: in instantiation of function template specialization 'LazyInitialized<WKWebViewContentProviderRegistry>::get<(lambda at Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:222:41)>' requested here
return _contentProviderRegistry.get([] { return adoptNS([[WKWebViewContentProviderRegistry alloc] init]); });
^
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:57:24: error: property 'get' not found on object of type 'WKWebViewContentProviderRegistry *'
return m_value.get();
^
3 errors generated.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm: Change
_contentProviderRegistry to be a LazyInitialized<RetainPtr<>> to
match other instance variables.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (178624 => 178625)
--- trunk/Source/WebKit2/ChangeLog 2015-01-17 10:48:58 UTC (rev 178624)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-17 16:49:53 UTC (rev 178625)
@@ -1,3 +1,32 @@
+2015-01-17 David Kilzer <[email protected]>
+
+ REGRESSION (r178618): Change to WKWebViewConfiguration broke iOS build
+ <https://bugs.webkit.org/show_bug.cgi?id=140559>
+
+ Blind fix to address the following build failure:
+
+ Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:79:7: error: interface type cannot be statically allocated
+ T m_value;
+ ^
+ *
+ Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:94:55: note: in instantiation of template class 'LazyInitialized<WKWebViewContentProviderRegistry>' requested here
+ LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
+ ^
+ Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:53:21: error: assigning to 'WKWebViewContentProviderRegistry *' from incompatible type 'RetainPtr<WKWebViewContentProviderRegistry *>'
+ m_value = f();
+ ^ ~~~
+ Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:222:37: note: in instantiation of function template specialization 'LazyInitialized<WKWebViewContentProviderRegistry>::get<(lambda at Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:222:41)>' requested here
+ return _contentProviderRegistry.get([] { return adoptNS([[WKWebViewContentProviderRegistry alloc] init]); });
+ ^
+ Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:57:24: error: property 'get' not found on object of type 'WKWebViewContentProviderRegistry *'
+ return m_value.get();
+ ^
+ 3 errors generated.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm: Change
+ _contentProviderRegistry to be a LazyInitialized<RetainPtr<>> to
+ match other instance variables.
+
2015-01-16 Sam Weinig <[email protected]>
Add a basic configuration object for WKView
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (178624 => 178625)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-01-17 10:48:58 UTC (rev 178624)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-01-17 16:49:53 UTC (rev 178625)
@@ -91,7 +91,7 @@
LazyInitialized<RetainPtr<NSString>> _applicationNameForUserAgent;
#if PLATFORM(IOS)
- LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
+ LazyInitialized<RetainPtr<WKWebViewContentProviderRegistry>> _contentProviderRegistry;
BOOL _allowsAlternateFullscreen;
BOOL _featureCounterEnabled;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
