<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191545] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191545">191545</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-10-24 22:59:16 -0700 (Sat, 24 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a way to add user style sheets to WKUserContentController
https://bugs.webkit.org/show_bug.cgi?id=150531
<rdar://problem/23191691>
Reviewed by Darin Adler.
* Shared/API/APIObject.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
Boilerplate for a new API::UserStyleSheet.
* UIProcess/API/APIUserStyleSheet.cpp: Added.
(API::generateIdentifier):
(API::UserStyleSheet::generateUniqueURL):
* UIProcess/API/APIUserStyleSheet.h: Added.
Added API::UserStyleSheet, borrowing URL generation code from API::UserScript.
* UIProcess/API/Cocoa/WKUserContentController.mm:
(-[WKUserContentController _addUserStyleSheet:]):
(-[WKUserContentController _removeAllUserStyleSheets]):
Forward add and remove-all to WebUserContentControllerProxy.
* UIProcess/API/Cocoa/WKUserContentControllerPrivate.h:
* UIProcess/API/Cocoa/_WKUserStyleSheet.h: Added.
* UIProcess/API/Cocoa/_WKUserStyleSheet.mm: Added.
(toWTFStrings):
(-[_WKUserStyleSheet initWithSource:whitelistedURLPatterns:blacklistedURLPatterns:forMainFrameOnly:]):
(-[_WKUserStyleSheet source]):
(-[_WKUserStyleSheet isForMainFrameOnly]):
(-[_WKUserStyleSheet copyWithZone:]):
(-[_WKUserStyleSheet _apiObject]):
* UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h: Added.
(API::wrapper):
* WebKit2.xcodeproj/project.pbxproj:
Add the new modern API object (as SPI for now).
* TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm:
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserScriptcpp">trunk/Source/WebKit2/UIProcess/API/APIUserScript.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserScripth">trunk/Source/WebKit2/UIProcess/API/APIUserScript.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformUtilitiescpp">trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaUserContentControllermm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserStyleSheetcpp">trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserStyleSheeth">trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKUserStyleSheeth">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKUserStyleSheetmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKUserStyleSheetInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2015-10-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Add a way to add user style sheets to WKUserContentController
+ https://bugs.webkit.org/show_bug.cgi?id=150531
+ <rdar://problem/23191691>
+
+ Reviewed by Darin Adler.
+
+ * Shared/API/APIObject.h:
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ Boilerplate for a new API::UserStyleSheet.
+
+ * UIProcess/API/APIUserStyleSheet.cpp: Added.
+ (API::generateIdentifier):
+ (API::UserStyleSheet::generateUniqueURL):
+ * UIProcess/API/APIUserStyleSheet.h: Added.
+ Added API::UserStyleSheet, borrowing URL generation code from API::UserScript.
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController _addUserStyleSheet:]):
+ (-[WKUserContentController _removeAllUserStyleSheets]):
+ Forward add and remove-all to WebUserContentControllerProxy.
+
+ * UIProcess/API/Cocoa/WKUserContentControllerPrivate.h:
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.h: Added.
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.mm: Added.
+ (toWTFStrings):
+ (-[_WKUserStyleSheet initWithSource:whitelistedURLPatterns:blacklistedURLPatterns:forMainFrameOnly:]):
+ (-[_WKUserStyleSheet source]):
+ (-[_WKUserStyleSheet isForMainFrameOnly]):
+ (-[_WKUserStyleSheet copyWithZone:]):
+ (-[_WKUserStyleSheet _apiObject]):
+ * UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h: Added.
+ (API::wrapper):
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add the new modern API object (as SPI for now).
+
+2015-10-24 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Expose more information about the exception in WKErrorJavaScriptExceptionOccurred errors
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150525
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> URLResponse,
</span><span class="cx"> UserContentURLPattern,
</span><span class="cx"> UserScript,
</span><ins>+ UserStyleSheet,
</ins><span class="cx"> WebArchive,
</span><span class="cx"> WebArchiveResource,
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> #import "_WKProcessPoolConfigurationInternal.h"
</span><span class="cx"> #import "_WKUserContentExtensionStoreInternal.h"
</span><span class="cx"> #import "_WKUserContentFilterInternal.h"
</span><ins>+#import "_WKUserStyleSheetInternal.h"
</ins><span class="cx"> #import "_WKVisitedLinkStoreInternal.h"
</span><span class="cx"> #import <objc/objc-auto.h>
</span><span class="cx">
</span><span class="lines">@@ -211,6 +212,10 @@
</span><span class="cx"> wrapper = [WKUserScript alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::UserStyleSheet:
+ wrapper = [_WKUserStyleSheet alloc];
+ break;
+
</ins><span class="cx"> case Type::VisitedLinkStore:
</span><span class="cx"> wrapper = [_WKVisitedLinkStore alloc];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserScript.cpp (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserScript.cpp 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserScript.cpp 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> StringBuilder urlStringBuilder;
</span><span class="cx"> urlStringBuilder.appendLiteral("user-script:");
</span><span class="cx"> urlStringBuilder.appendNumber(generateIdentifier());
</span><del>- return WebCore::URL { WebCore::URL { }, urlStringBuilder.toString() };
</del><ins>+ return { { }, urlStringBuilder.toString() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserScript.h (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserScript.h 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserScript.h 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> static Ref<UserScript> create(WebCore::UserScript userScript)
</span><span class="cx"> {
</span><del>- return adoptRef(*new UserScript(userScript));
</del><ins>+ return adoptRef(*new UserScript(WTF::move(userScript)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UserScript(WebCore::UserScript userScript)
</span><span class="lines">@@ -45,11 +45,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ~UserScript()
- {
- }
-
- WebCore::UserScript& userScript() { return m_userScript; }
</del><span class="cx"> const WebCore::UserScript& userScript() const { return m_userScript; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserStyleSheetcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.cpp (0 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.cpp 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "APIUserStyleSheet.h"
+
+#include <wtf/text/StringBuilder.h>
+
+namespace API {
+
+static uint64_t generateIdentifier()
+{
+ static uint64_t identifier;
+
+ return ++identifier;
+}
+
+WebCore::URL UserStyleSheet::generateUniqueURL()
+{
+ StringBuilder urlStringBuilder;
+ urlStringBuilder.appendLiteral("user-style-sheet:");
+ urlStringBuilder.appendNumber(generateIdentifier());
+ return { { }, urlStringBuilder.toString() };
+}
+
+
+} // namespace API
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserStyleSheeth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.h (0 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.h 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APIUserStyleSheet_h
+#define APIUserStyleSheet_h
+
+#include "APIObject.h"
+#include <WebCore/UserStyleSheet.h>
+
+namespace API {
+
+class UserStyleSheet final : public ObjectImpl<Object::Type::UserStyleSheet> {
+public:
+ static WebCore::URL generateUniqueURL();
+
+ UserStyleSheet(WebCore::UserStyleSheet userStyleSheet)
+ : m_userStyleSheet(userStyleSheet)
+ {
+ }
+
+ const WebCore::UserStyleSheet& userStyleSheet() const { return m_userStyleSheet; }
+
+private:
+ WebCore::UserStyleSheet m_userStyleSheet;
+};
+
+} // namespace API
+
+#endif // APIUserStyleSheet_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import "WebScriptMessageHandler.h"
</span><span class="cx"> #import "WebUserContentControllerProxy.h"
</span><span class="cx"> #import "_WKUserContentFilterInternal.h"
</span><ins>+#import "_WKUserStyleSheetInternal.h"
</ins><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="cx"> #import <WebCore/SecurityOriginData.h>
</span><span class="cx"> #import <WebCore/SerializedScriptValue.h>
</span><span class="lines">@@ -146,6 +147,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet
+{
+ _userContentControllerProxy->addUserStyleSheet(userStyleSheet->_userStyleSheet->userStyleSheet());
+}
+
+- (void)_removeAllUserStyleSheets
+{
+ _userContentControllerProxy->removeAllUserStyleSheets();
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> @class _WKUserContentFilter;
</span><ins>+@class _WKUserStyleSheet;
</ins><span class="cx">
</span><span class="cx"> @interface WKUserContentController (WKPrivate)
</span><span class="cx">
</span><span class="lines">@@ -35,6 +36,9 @@
</span><span class="cx"> - (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_AVAILABLE(10_11, 9_0);
</span><span class="cx"> - (void)_removeAllUserContentFilters WK_AVAILABLE(10_11, 9_0);
</span><span class="cx">
</span><ins>+- (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (void)_removeAllUserStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKUserStyleSheeth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h (0 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+WK_ASSUME_NONNULL_BEGIN
+
+WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
+@interface _WKUserStyleSheet : NSObject <NSCopying>
+
+@property (nonatomic, readonly, copy) NSString *source;
+
+@property (nonatomic, readonly, copy) WK_ARRAY(NSString *) *whitelistedURLPatterns;
+@property (nonatomic, readonly, copy) WK_ARRAY(NSString *) *blacklistedURLPatterns;
+
+@property (nonatomic, readonly, getter=isForMainFrameOnly) BOOL forMainFrameOnly;
+
+- (instancetype)initWithSource:(NSString *)source whitelistedURLPatterns:(WK_ARRAY(NSString *) *)whitelistedURLPatterns blacklistedURLPatterns:(WK_ARRAY(NSString *) *)blacklistedURLPatterns forMainFrameOnly:(BOOL)forMainFrameOnly;
+
+@end
+
+WK_ASSUME_NONNULL_END
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKUserStyleSheetmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm (0 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "_WKUserStyleSheetInternal.h"
+
+#import "APIArray.h"
+#import "WKNSArray.h"
+#import "WebKit2Initialize.h"
+
+#if WK_API_ENABLED
+
+@implementation _WKUserStyleSheet
+
+static Vector<String> toWTFStrings(NSArray *strings)
+{
+ Vector<String> result;
+ result.reserveInitialCapacity(strings.count);
+
+ for (NSString *string in strings)
+ result.uncheckedAppend(string);
+
+ return result;
+}
+
+- (instancetype)initWithSource:(NSString *)source whitelistedURLPatterns:(NSArray *)whitelistedURLPatterns blacklistedURLPatterns:(NSArray *)blacklistedURLPatterns forMainFrameOnly:(BOOL)forMainFrameOnly
+{
+ if (!(self = [super init]))
+ return nil;
+
+ // FIXME: In the API test, we can use generateUniqueURL below before the API::Object constructor has done this... where should this really be?
+ WebKit::InitializeWebKit2();
+
+ API::Object::constructInWrapper<API::UserStyleSheet>(self, WebCore::UserStyleSheet { WTF::String(source), API::UserStyleSheet::generateUniqueURL(), toWTFStrings(whitelistedURLPatterns), toWTFStrings(blacklistedURLPatterns), forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames, WebCore::UserStyleUserLevel });
+
+ return self;
+}
+
+- (NSString *)source
+{
+ return _userStyleSheet->userStyleSheet().source();
+}
+
+- (NSArray *)whitelistedURLPatterns
+{
+ return wrapper(API::Array::createStringArray(_userStyleSheet->userStyleSheet().whitelist()));
+}
+
+- (NSArray *)blacklistedURLPatterns
+{
+ return wrapper(API::Array::createStringArray(_userStyleSheet->userStyleSheet().blacklist()));
+}
+
+- (BOOL)isForMainFrameOnly
+{
+ return _userStyleSheet->userStyleSheet().injectedFrames() == WebCore::InjectInTopFrameOnly;
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+ return [self retain];
+}
+
+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_userStyleSheet;
+}
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKUserStyleSheetInternalh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h (0 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheetInternal.h 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "_WKUserStyleSheet.h"
+
+#if WK_API_ENABLED
+
+#import "APIUserStyleSheet.h"
+#import <wtf/RetainPtr.h>
+
+namespace API {
+
+inline _WKUserStyleSheet *wrapper(UserStyleSheet& userStyleSheet)
+{
+ ASSERT([userStyleSheet.wrapper() isKindOfClass:[_WKUserStyleSheet class]]);
+ return (_WKUserStyleSheet *)userStyleSheet.wrapper();
+}
+
+}
+
+@interface _WKUserStyleSheet () <WKObject> {
+@package
+ API::ObjectStorage<API::UserStyleSheet> _userStyleSheet;
+}
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -641,6 +641,11 @@
</span><span class="cx"> 2D870D1016234FFE000A3F20 /* PDFPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */; };
</span><span class="cx"> 2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.mm */; };
</span><span class="cx"> 2D8710171828415D0018FA01 /* PlatformCALayerRemoteCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8710151828415D0018FA01 /* PlatformCALayerRemoteCustom.h */; };
</span><ins>+ 2D87861D1BDB54BF00D02ABB /* _WKUserStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D87861B1BDB54BF00D02ABB /* _WKUserStyleSheet.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2D87861E1BDB54BF00D02ABB /* _WKUserStyleSheet.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D87861C1BDB54BF00D02ABB /* _WKUserStyleSheet.mm */; settings = {ASSET_TAGS = (); }; };
+ 2D8786201BDB57F500D02ABB /* _WKUserStyleSheetInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D87861F1BDB57F500D02ABB /* _WKUserStyleSheetInternal.h */; settings = {ASSET_TAGS = (); }; };
+ 2D8786231BDB58FF00D02ABB /* APIUserStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8786211BDB58FF00D02ABB /* APIUserStyleSheet.cpp */; settings = {ASSET_TAGS = (); }; };
+ 2D8786241BDB58FF00D02ABB /* APIUserStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8786221BDB58FF00D02ABB /* APIUserStyleSheet.h */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> 2D8949F0182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8949EE182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp */; };
</span><span class="cx"> 2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8949EF182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h */; };
</span><span class="cx"> 2D9EA30D1A96CB59002D2807 /* WKPageInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9EA30C1A96CB59002D2807 /* WKPageInjectedBundleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2805,6 +2810,11 @@
</span><span class="cx"> 2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPlugin.mm; path = PDF/PDFPlugin.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCALayerRemoteCustom.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D8710151828415D0018FA01 /* PlatformCALayerRemoteCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayerRemoteCustom.h; sourceTree = "<group>"; };
</span><ins>+ 2D87861B1BDB54BF00D02ABB /* _WKUserStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserStyleSheet.h; sourceTree = "<group>"; };
+ 2D87861C1BDB54BF00D02ABB /* _WKUserStyleSheet.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKUserStyleSheet.mm; sourceTree = "<group>"; };
+ 2D87861F1BDB57F500D02ABB /* _WKUserStyleSheetInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserStyleSheetInternal.h; sourceTree = "<group>"; };
+ 2D8786211BDB58FF00D02ABB /* APIUserStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIUserStyleSheet.cpp; sourceTree = "<group>"; };
+ 2D8786221BDB58FF00D02ABB /* APIUserStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserStyleSheet.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2D8949EE182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCALayerRemoteTiledBacking.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D8949EF182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayerRemoteTiledBacking.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D9EA30C1A96CB59002D2807 /* WKPageInjectedBundleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageInjectedBundleClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5361,6 +5371,9 @@
</span><span class="cx"> 7C89D2B81A6B0F2C003A5FDE /* _WKUserContentFilter.h */,
</span><span class="cx"> 7C89D2B71A6B0F2C003A5FDE /* _WKUserContentFilter.mm */,
</span><span class="cx"> 7C89D2BB1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h */,
</span><ins>+ 2D87861B1BDB54BF00D02ABB /* _WKUserStyleSheet.h */,
+ 2D87861C1BDB54BF00D02ABB /* _WKUserStyleSheet.mm */,
+ 2D87861F1BDB57F500D02ABB /* _WKUserStyleSheetInternal.h */,
</ins><span class="cx"> 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */,
</span><span class="cx"> 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */,
</span><span class="cx"> 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */,
</span><span class="lines">@@ -6302,6 +6315,8 @@
</span><span class="cx"> 7C3A06A61AAB903E009D74BA /* APIUserContentExtensionStore.h */,
</span><span class="cx"> 7C89D2A51A6789EA003A5FDE /* APIUserScript.cpp */,
</span><span class="cx"> 7C89D2921A67122F003A5FDE /* APIUserScript.h */,
</span><ins>+ 2D8786211BDB58FF00D02ABB /* APIUserStyleSheet.cpp */,
+ 2D8786221BDB58FF00D02ABB /* APIUserStyleSheet.h */,
</ins><span class="cx"> 1A4832C51A9BC13C008B4DFE /* APIWebsiteDataRecord.cpp */,
</span><span class="cx"> 1A4832C61A9BC13C008B4DFE /* APIWebsiteDataRecord.h */,
</span><span class="cx"> 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
</span><span class="lines">@@ -8071,6 +8086,7 @@
</span><span class="cx"> 93A88B461BC8829300ABA5C2 /* APIHitTestResult.h in Headers */,
</span><span class="cx"> 29D55DF2161BF9F10031A2E3 /* WebPageGroupProxyMessages.h in Headers */,
</span><span class="cx"> 2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */,
</span><ins>+ 2D8786201BDB57F500D02ABB /* _WKUserStyleSheetInternal.h in Headers */,
</ins><span class="cx"> C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */,
</span><span class="cx"> 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */,
</span><span class="cx"> BC032DD110F4389F0058C15A /* WebPageProxy.h in Headers */,
</span><span class="lines">@@ -8107,6 +8123,7 @@
</span><span class="cx"> 3760881F150413E900FC82C7 /* WebRenderObject.h in Headers */,
</span><span class="cx"> 510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */,
</span><span class="cx"> 51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */,
</span><ins>+ 2D87861D1BDB54BF00D02ABB /* _WKUserStyleSheet.h in Headers */,
</ins><span class="cx"> 7C361D731927FA360036A59D /* WebScriptMessageHandler.h in Headers */,
</span><span class="cx"> D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
</span><span class="cx"> 1A4832D71A9CDF96008B4DFE /* WebsiteData.h in Headers */,
</span><span class="lines">@@ -8321,6 +8338,7 @@
</span><span class="cx"> 1AB8A1EC1840080900E9AE69 /* WKPageLoaderClient.h in Headers */,
</span><span class="cx"> 93E6A4EE1BC5DD3900F8A0E7 /* _WKHitTestResult.h in Headers */,
</span><span class="cx"> BC2D021912AC426C00E732A3 /* WKPageLoadTypes.h in Headers */,
</span><ins>+ 2D8786241BDB58FF00D02ABB /* APIUserStyleSheet.h in Headers */,
</ins><span class="cx"> 93BDEB01171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h in Headers */,
</span><span class="cx"> 2D7303791A7C2B7500F8F487 /* WKPageNavigationClient.h in Headers */,
</span><span class="cx"> 1AB8A1EE18400ACB00E9AE69 /* WKPagePolicyClient.h in Headers */,
</span><span class="lines">@@ -9996,6 +10014,7 @@
</span><span class="cx"> 29232DF818B2A9AE00D0596F /* WKAccessibilityWebPageObjectIOS.mm in Sources */,
</span><span class="cx"> 29232DF918B2AB3A00D0596F /* WKAccessibilityWebPageObjectMac.mm in Sources */,
</span><span class="cx"> 0FCB4E4918BBE044000FCFC9 /* WKActionSheet.mm in Sources */,
</span><ins>+ 2D8786231BDB58FF00D02ABB /* APIUserStyleSheet.cpp in Sources */,
</ins><span class="cx"> 0FCB4E4B18BBE044000FCFC9 /* WKActionSheetAssistant.mm in Sources */,
</span><span class="cx"> C5FA1ED418E1062200B3F402 /* WKAirPlayRoutePicker.mm in Sources */,
</span><span class="cx"> 512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */,
</span><span class="lines">@@ -10080,6 +10099,7 @@
</span><span class="cx"> BCCF6AC212C91F34008F9C35 /* WKImage.cpp in Sources */,
</span><span class="cx"> BCCF6AC912C91F59008F9C35 /* WKImageCG.cpp in Sources */,
</span><span class="cx"> 933DF8301B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm in Sources */,
</span><ins>+ 2D87861E1BDB54BF00D02ABB /* _WKUserStyleSheet.mm in Sources */,
</ins><span class="cx"> 9321D5881A38EE74008052BE /* WKImmediateActionController.mm in Sources */,
</span><span class="cx"> 1C8E293A12761E5B00BC7BD0 /* WKInspector.cpp in Sources */,
</span><span class="cx"> 0F3C725C196F605200AEDD0C /* WKInspectorHighlightView.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Tools/ChangeLog 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-10-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Add a way to add user style sheets to WKUserContentController
+ https://bugs.webkit.org/show_bug.cgi?id=150531
+ <rdar://problem/23191691>
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm:
+ (TEST):
+
+2015-10-24 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Expose more information about the exception in WKErrorJavaScriptExceptionOccurred errors
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150525
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if WK_HAVE_C_SPI
-
</del><span class="cx"> #include "PlatformUtilities.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -34,6 +32,8 @@
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx"> namespace Util {
</span><span class="cx">
</span><ins>+#if WK_HAVE_C_SPI
+
</ins><span class="cx"> WKContextRef createContextWithInjectedBundle()
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> injectedBundlePath(AdoptWK, createInjectedBundlePath());
</span><span class="lines">@@ -79,17 +79,17 @@
</span><span class="cx"> return toSTD(string.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::string toSTD(const char* string)
</del><ins>+WKRetainPtr<WKStringRef> toWK(const char* utf8String)
</ins><span class="cx"> {
</span><del>- return std::string(string);
</del><ins>+ return WKRetainPtr<WKStringRef>(AdoptWK, WKStringCreateWithUTF8CString(utf8String));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WKRetainPtr<WKStringRef> toWK(const char* utf8String)
</del><ins>+#endif // WK_HAVE_C_SPI
+
+std::string toSTD(const char* string)
</ins><span class="cx"> {
</span><del>- return WKRetainPtr<WKStringRef>(AdoptWK, WKStringCreateWithUTF8CString(utf8String));
</del><ins>+ return std::string(string);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Util
</span><span class="cx"> } // namespace TestWebKitAPI
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm (191544 => 191545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm 2015-10-25 05:41:47 UTC (rev 191544)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm 2015-10-25 05:59:16 UTC (rev 191545)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "Test.h"
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><ins>+#import <WebKit/WKUserContentControllerPrivate.h>
+#import <WebKit/_WKUserStyleSheet.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="lines">@@ -212,4 +214,154 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static NSString *styleSheetSource = @"body { background-color: green !important; }";
+static NSString *backgroundColorScript = @"window.getComputedStyle(document.body, null).getPropertyValue('background-color')";
+static NSString *frameBackgroundColorScript = @"window.getComputedStyle(document.getElementsByTagName('iframe')[0].contentDocument.body, null).getPropertyValue('background-color')";
+static const char* greenInRGB = "rgb(0, 128, 0)";
+static const char* redInRGB = "rgb(255, 0, 0)";
+static const char* whiteInRGB = "rgba(0, 0, 0, 0)";
+
+static void expectScriptEvaluatesToColor(WKWebView *webView, NSString *script, const char* color)
+{
+ static bool didCheckBackgroundColor;
+
+ [webView evaluateJavaScript:script completionHandler:^ (id value, NSError * error) {
+ EXPECT_TRUE([value isKindOfClass:[NSString class]]);
+ EXPECT_WK_STREQ(color, value);
+ didCheckBackgroundColor = true;
+ }];
+
+ TestWebKitAPI::Util::run(&didCheckBackgroundColor);
+ didCheckBackgroundColor = false;
+}
+
+TEST(WKUserContentController, AddUserStyleSheetBeforeCreatingView)
+{
+ RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource whitelistedURLPatterns:@[ ] blacklistedURLPatterns:@[ ] forMainFrameOnly:YES]);
+ [[configuration userContentController] _addUserStyleSheet:styleSheet.get()];
+
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ RetainPtr<SimpleNavigationDelegate> delegate = adoptNS([[SimpleNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
+ [webView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:nil];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, greenInRGB);
+}
+
+TEST(WKUserContentController, AddUserStyleSheetAfterCreatingView)
+{
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+
+ RetainPtr<SimpleNavigationDelegate> delegate = adoptNS([[SimpleNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
+ [webView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:nil];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, redInRGB);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource whitelistedURLPatterns:@[ ] blacklistedURLPatterns:@[ ] forMainFrameOnly:YES]);
+ [[webView configuration].userContentController _addUserStyleSheet:styleSheet.get()];
+
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, greenInRGB);
+}
+
+TEST(WKUserContentController, UserStyleSheetWhiteAndBlackList)
+{
+ RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource whitelistedURLPatterns:@[ @"http://happy.example.com/", @"http://*.example2.com/" ] blacklistedURLPatterns:@[ @"http://sad.example.com/" ] forMainFrameOnly:YES]);
+ [[configuration userContentController] _addUserStyleSheet:styleSheet.get()];
+
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ RetainPtr<SimpleNavigationDelegate> delegate = adoptNS([[SimpleNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
+ // Try something on the whitelist:
+
+ [webView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:[NSURL URLWithString:@"http://happy.example.com/"]];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, greenInRGB);
+
+ // Try something on the blacklist:
+
+ [webView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:[NSURL URLWithString:@"http://sad.example.com/"]];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, redInRGB);
+
+ // Try something on neither list:
+
+ [webView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:[NSURL URLWithString:@"http://mediocre.example.com/"]];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, redInRGB);
+
+ // Try something that matches the globbing pattern in the whitelist:
+
+ [webView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:[NSURL URLWithString:@"http://anything.example2.com/"]];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, greenInRGB);
+}
+
+TEST(WKUserContentController, UserStyleSheetAffectingOnlyMainFrame)
+{
+ RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource whitelistedURLPatterns:@[ ] blacklistedURLPatterns:@[ ] forMainFrameOnly:YES]);
+ [[configuration userContentController] _addUserStyleSheet:styleSheet.get()];
+
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ RetainPtr<SimpleNavigationDelegate> delegate = adoptNS([[SimpleNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
+ [webView loadHTMLString:@"<body style='background-color: red;'><iframe></iframe></body>" baseURL:nil];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ // The main frame should be affected.
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, greenInRGB);
+
+ // The subframe shouldn't be affected.
+ expectScriptEvaluatesToColor(webView.get(), frameBackgroundColorScript, whiteInRGB);
+}
+
+TEST(WKUserContentController, UserStyleSheetAffectingAllFrames)
+{
+ RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource whitelistedURLPatterns:@[ ] blacklistedURLPatterns:@[ ] forMainFrameOnly:NO]);
+ [[configuration userContentController] _addUserStyleSheet:styleSheet.get()];
+
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ RetainPtr<SimpleNavigationDelegate> delegate = adoptNS([[SimpleNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
+ [webView loadHTMLString:@"<body style='background-color: red;'><iframe></iframe></body>" baseURL:nil];
+ TestWebKitAPI::Util::run(&isDoneWithNavigation);
+ isDoneWithNavigation = false;
+
+ // The main frame should be affected.
+ expectScriptEvaluatesToColor(webView.get(), backgroundColorScript, greenInRGB);
+
+ // The subframe should also be affected.
+ expectScriptEvaluatesToColor(webView.get(), frameBackgroundColorScript, greenInRGB);
+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>