Title: [197188] trunk/Source/WebKit2
- Revision
- 197188
- Author
- [email protected]
- Date
- 2016-02-26 11:45:11 -0800 (Fri, 26 Feb 2016)
Log Message
Try to fix the Yosemite build again.
* UIProcess/API/Cocoa/WKUserScript.mm:
(toStringVector):
(-[WKUserScript _initWithSource:injectionTime:forMainFrameOnly:legacyWhitelist:legacyBlacklist:userContentWorld:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197187 => 197188)
--- trunk/Source/WebKit2/ChangeLog 2016-02-26 19:37:52 UTC (rev 197187)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-26 19:45:11 UTC (rev 197188)
@@ -1,5 +1,13 @@
2016-02-26 Sam Weinig <[email protected]>
+ Try to fix the Yosemite build again.
+
+ * UIProcess/API/Cocoa/WKUserScript.mm:
+ (toStringVector):
+ (-[WKUserScript _initWithSource:injectionTime:forMainFrameOnly:legacyWhitelist:legacyBlacklist:userContentWorld:]):
+
+2016-02-26 Sam Weinig <[email protected]>
+
Try to fix the Yosemite build.
* UIProcess/API/Cocoa/WKUserScriptPrivate.h:
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm (197187 => 197188)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2016-02-26 19:37:52 UTC (rev 197187)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2016-02-26 19:45:11 UTC (rev 197188)
@@ -73,7 +73,7 @@
@implementation WKUserScript (WKPrivate)
-static Vector<WTF::String> toStringVector(NSArray<NSString *> *input)
+static Vector<WTF::String> toStringVector(NSArray *input)
{
Vector<WTF::String> vector;
@@ -82,12 +82,14 @@
return vector;
vector.reserveInitialCapacity(size);
- for (NSString *string : input)
- vector.uncheckedAppend(string);
+ for (id string : input) {
+ if ([string isKindOfClass:[NSString class]])
+ vector.uncheckedAppend(string);
+ }
return vector;
}
-- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
+- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray *)legacyWhitelist legacyBlacklist:(NSArray *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
{
if (!(self = [super init]))
return nil;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
