<!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>[203109] trunk/Source</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/203109">203109</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-11 23:24:30 -0700 (Mon, 11 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Purge PassRefPtr in platform/efl and platform/mac
https://bugs.webkit.org/show_bug.cgi?id=159548
Reviewed by Alex Christensen.
Remove all use of PassRefPtr and clean up unnecessary tabs and spaces.
Source/WebCore:
WebKit2 codes are also changed because of setBufferForType()'s modification.
No new tests, no behavior changes.
* platform/PasteboardStrategy.h:
* platform/PlatformPasteboard.h:
* platform/PlatformSpeechSynthesizer.h:
* platform/SerializedPlatformRepresentation.h:
* platform/efl/PlatformSpeechSynthesisProviderEfl.cpp:
(WebCore::PlatformSpeechSynthesisProviderEfl::speak):
* platform/efl/PlatformSpeechSynthesisProviderEfl.h:
* platform/efl/PlatformSpeechSynthesizerEfl.cpp:
(WebCore::PlatformSpeechSynthesizer::speak):
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::PlatformPasteboard::setBufferForType):
* platform/ios/PlatformSpeechSynthesizerIOS.mm:
(SOFT_LINK_CONSTANT):
(-[WebSpeechSynthesisWrapper initWithSpeechSynthesizer:]):
(-[WebSpeechSynthesisWrapper mapSpeechRateToPlatformRate:]):
(-[WebSpeechSynthesisWrapper speakUtterance:]):
(-[WebSpeechSynthesisWrapper pause]):
(-[WebSpeechSynthesisWrapper resume]):
(-[WebSpeechSynthesisWrapper cancel]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:didStartSpeechUtterance:]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:didFinishSpeechUtterance:]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:didPauseSpeechUtterance:]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:didContinueSpeechUtterance:]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:didCancelSpeechUtterance:]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:willSpeakRangeOfSpeechString:utterance:]):
(WebCore::PlatformSpeechSynthesizer::speak):
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::write):
* platform/mac/PlatformPasteboardMac.mm:
(WebCore::PlatformPasteboard::getTypes):
(WebCore::PlatformPasteboard::getPathnamesForType):
(WebCore::PlatformPasteboard::color):
(WebCore::PlatformPasteboard::copy):
(WebCore::PlatformPasteboard::setBufferForType):
(WebCore::PlatformPasteboard::setPathnamesForType):
* platform/mac/PlatformSpeechSynthesizerMac.mm:
(-[WebSpeechSynthesisWrapper initWithSpeechSynthesizer:]):
(-[WebSpeechSynthesisWrapper speakUtterance:]):
(-[WebSpeechSynthesisWrapper pause]):
(-[WebSpeechSynthesisWrapper resume]):
(-[WebSpeechSynthesisWrapper cancel]):
(-[WebSpeechSynthesisWrapper speechSynthesizer:didFinishSpeaking:]):
(WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
(WebCore::PlatformSpeechSynthesizer::speak):
* platform/mac/SerializedPlatformRepresentationMac.h:
* platform/mac/SerializedPlatformRepresentationMac.mm:
(WebCore::SerializedPlatformRepresentationMac::data):
(WebCore::jsValueWithValueInContext):
* platform/mock/PlatformSpeechSynthesizerMock.cpp:
(WebCore::PlatformSpeechSynthesizerMock::speakingFinished):
(WebCore::PlatformSpeechSynthesizerMock::speak):
(WebCore::PlatformSpeechSynthesizerMock::cancel):
* platform/mock/PlatformSpeechSynthesizerMock.h:
Source/WebKit/mac:
* WebCoreSupport/WebPlatformStrategies.h:
* WebCoreSupport/WebPlatformStrategies.mm:
(WebPlatformStrategies::setBufferForType):
Source/WebKit2:
WebKit2 codes are also changed because of setBufferForType()'s modification.
* UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
(WebKit::WebPasteboardProxy::setPasteboardBufferForType):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::setBufferForType):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardStrategyh">trunk/Source/WebCore/platform/PasteboardStrategy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformPasteboardh">trunk/Source/WebCore/platform/PlatformPasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformSpeechSynthesizerh">trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSerializedPlatformRepresentationh">trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflcpp">trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflh">trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflPlatformSpeechSynthesizerEflcpp">trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm">trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPasteboardMacmm">trunk/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformPasteboardMacmm">trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformSpeechSynthesizerMacmm">trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMach">trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMacmm">trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockcpp">trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockh">trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/ChangeLog 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -1,3 +1,69 @@
</span><ins>+2016-07-11 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Purge PassRefPtr in platform/efl and platform/mac
+ https://bugs.webkit.org/show_bug.cgi?id=159548
+
+ Reviewed by Alex Christensen.
+
+ Remove all use of PassRefPtr and clean up unnecessary tabs and spaces.
+ WebKit2 codes are also changed because of setBufferForType()'s modification.
+
+ No new tests, no behavior changes.
+
+ * platform/PasteboardStrategy.h:
+ * platform/PlatformPasteboard.h:
+ * platform/PlatformSpeechSynthesizer.h:
+ * platform/SerializedPlatformRepresentation.h:
+ * platform/efl/PlatformSpeechSynthesisProviderEfl.cpp:
+ (WebCore::PlatformSpeechSynthesisProviderEfl::speak):
+ * platform/efl/PlatformSpeechSynthesisProviderEfl.h:
+ * platform/efl/PlatformSpeechSynthesizerEfl.cpp:
+ (WebCore::PlatformSpeechSynthesizer::speak):
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::setBufferForType):
+ * platform/ios/PlatformSpeechSynthesizerIOS.mm:
+ (SOFT_LINK_CONSTANT):
+ (-[WebSpeechSynthesisWrapper initWithSpeechSynthesizer:]):
+ (-[WebSpeechSynthesisWrapper mapSpeechRateToPlatformRate:]):
+ (-[WebSpeechSynthesisWrapper speakUtterance:]):
+ (-[WebSpeechSynthesisWrapper pause]):
+ (-[WebSpeechSynthesisWrapper resume]):
+ (-[WebSpeechSynthesisWrapper cancel]):
+ (-[WebSpeechSynthesisWrapper speechSynthesizer:didStartSpeechUtterance:]):
+ (-[WebSpeechSynthesisWrapper speechSynthesizer:didFinishSpeechUtterance:]):
+ (-[WebSpeechSynthesisWrapper speechSynthesizer:didPauseSpeechUtterance:]):
+ (-[WebSpeechSynthesisWrapper speechSynthesizer:didContinueSpeechUtterance:]):
+ (-[WebSpeechSynthesisWrapper speechSynthesizer:didCancelSpeechUtterance:]):
+ (-[WebSpeechSynthesisWrapper speechSynthesizer:willSpeakRangeOfSpeechString:utterance:]):
+ (WebCore::PlatformSpeechSynthesizer::speak):
+ * platform/mac/PasteboardMac.mm:
+ (WebCore::Pasteboard::write):
+ * platform/mac/PlatformPasteboardMac.mm:
+ (WebCore::PlatformPasteboard::getTypes):
+ (WebCore::PlatformPasteboard::getPathnamesForType):
+ (WebCore::PlatformPasteboard::color):
+ (WebCore::PlatformPasteboard::copy):
+ (WebCore::PlatformPasteboard::setBufferForType):
+ (WebCore::PlatformPasteboard::setPathnamesForType):
+ * platform/mac/PlatformSpeechSynthesizerMac.mm:
+ (-[WebSpeechSynthesisWrapper initWithSpeechSynthesizer:]):
+ (-[WebSpeechSynthesisWrapper speakUtterance:]):
+ (-[WebSpeechSynthesisWrapper pause]):
+ (-[WebSpeechSynthesisWrapper resume]):
+ (-[WebSpeechSynthesisWrapper cancel]):
+ (-[WebSpeechSynthesisWrapper speechSynthesizer:didFinishSpeaking:]):
+ (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
+ (WebCore::PlatformSpeechSynthesizer::speak):
+ * platform/mac/SerializedPlatformRepresentationMac.h:
+ * platform/mac/SerializedPlatformRepresentationMac.mm:
+ (WebCore::SerializedPlatformRepresentationMac::data):
+ (WebCore::jsValueWithValueInContext):
+ * platform/mock/PlatformSpeechSynthesizerMock.cpp:
+ (WebCore::PlatformSpeechSynthesizerMock::speakingFinished):
+ (WebCore::PlatformSpeechSynthesizerMock::speak):
+ (WebCore::PlatformSpeechSynthesizerMock::cancel):
+ * platform/mock/PlatformSpeechSynthesizerMock.h:
+
</ins><span class="cx"> 2016-07-11 Frederic Wang <fwang@igalia.org>
</span><span class="cx">
</span><span class="cx"> Move parsing of mspace attributes to a MathMLSpaceElement class
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PasteboardStrategy.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardStrategy.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/PasteboardStrategy.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifndef PasteboardStrategy_h
</span><span class="lines">@@ -60,11 +60,11 @@
</span><span class="cx"> virtual String uniqueName() = 0;
</span><span class="cx"> virtual Color color(const String& pasteboardName) = 0;
</span><span class="cx"> virtual URL url(const String& pasteboardName) = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> virtual long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) = 0;
</span><span class="cx"> virtual long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) = 0;
</span><span class="cx"> virtual long copy(const String& fromPasteboard, const String& toPasteboard) = 0;
</span><del>- virtual long setBufferForType(PassRefPtr<SharedBuffer>, const String& pasteboardType, const String& pasteboardName) = 0;
</del><ins>+ virtual long setBufferForType(SharedBuffer*, const String& pasteboardType, const String& pasteboardName) = 0;
</ins><span class="cx"> virtual long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) = 0;
</span><span class="cx"> virtual long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) = 0;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformPasteboard.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/PlatformPasteboard.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifndef PlatformPasteboard_h
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WEBCORE_EXPORT PlatformPasteboard();
</span><span class="cx"> #endif
</span><span class="cx"> WEBCORE_EXPORT static String uniqueName();
</span><del>-
</del><ins>+
</ins><span class="cx"> WEBCORE_EXPORT void getTypes(Vector<String>& types);
</span><span class="cx"> WEBCORE_EXPORT RefPtr<SharedBuffer> bufferForType(const String& pasteboardType);
</span><span class="cx"> WEBCORE_EXPORT void getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType);
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> // These methods will return 0 if pasteboard ownership has been taken from us.
</span><span class="cx"> WEBCORE_EXPORT long copy(const String& fromPasteboard);
</span><del>- WEBCORE_EXPORT long setBufferForType(PassRefPtr<SharedBuffer>, const String& pasteboardType);
</del><ins>+ WEBCORE_EXPORT long setBufferForType(SharedBuffer*, const String& pasteboardType);
</ins><span class="cx"> WEBCORE_EXPORT long setPathnamesForType(const Vector<String>& pathnames, const String& pasteboardType);
</span><span class="cx"> WEBCORE_EXPORT long setStringForType(const String&, const String& pasteboardType);
</span><span class="cx"> WEBCORE_EXPORT void write(const PasteboardWebContent&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformSpeechSynthesizerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -71,13 +71,13 @@
</span><span class="cx"> // FIXME: We have multiple virtual functions just so we can support a mock for testing.
</span><span class="cx"> // Seems wasteful. Would be nice to find a better way.
</span><span class="cx"> WEBCORE_EXPORT virtual ~PlatformSpeechSynthesizer();
</span><del>-
</del><ins>+
</ins><span class="cx"> const Vector<RefPtr<PlatformSpeechSynthesisVoice>>& voiceList() const;
</span><del>- virtual void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>);
</del><ins>+ virtual void speak(RefPtr<PlatformSpeechSynthesisUtterance>&&);
</ins><span class="cx"> virtual void pause();
</span><span class="cx"> virtual void resume();
</span><span class="cx"> virtual void cancel();
</span><del>-
</del><ins>+
</ins><span class="cx"> PlatformSpeechSynthesizerClient* client() const { return m_speechSynthesizerClient; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_voiceListIsInitialized { false };
</span><span class="cx"> PlatformSpeechSynthesizerClient* m_speechSynthesizerClient;
</span><del>-
</del><ins>+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
</span><span class="cx"> #endif
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> std::unique_ptr<PlatformSpeechSynthesisProviderEfl> m_platformSpeechWrapper;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SPEECH_SYNTHESIS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSerializedPlatformRepresentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> virtual ~SerializedPlatformRepresentation() { }
</span><span class="cx">
</span><span class="cx"> virtual JSC::JSValue deserialize(JSC::ExecState*) const = 0;
</span><del>- virtual PassRefPtr<ArrayBuffer> data() const = 0;
</del><ins>+ virtual RefPtr<ArrayBuffer> data() const = 0;
</ins><span class="cx"> virtual bool isEqual(const SerializedPlatformRepresentation&) const = 0;
</span><span class="cx">
</span><span class="cx"> enum PlatformType {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformSpeechSynthesisProviderEfl::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
</del><ins>+void PlatformSpeechSynthesisProviderEfl::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
</ins><span class="cx"> {
</span><span class="cx"> if (!engineInit() || !utterance) {
</span><span class="cx"> fireSpeechEvent(SpeechError);
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_utterance = utterance;
</del><ins>+ m_utterance = WTFMove(utterance);
</ins><span class="cx"> String voice = voiceName(m_utterance);
</span><span class="cx"> espeak_SetVoiceByName(voice.utf8().data());
</span><span class="cx"> espeak_SetParameter(espeakRATE, convertRateToEspeakValue(m_utterance->rate()), 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> void initializeVoiceList(Vector<RefPtr<PlatformSpeechSynthesisVoice>>&);
</span><span class="cx"> void pause();
</span><span class="cx"> void resume();
</span><del>- void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>);
</del><ins>+ void speak(RefPtr<PlatformSpeechSynthesisUtterance>&&);
</ins><span class="cx"> void cancel();
</span><span class="cx"> private:
</span><span class="cx"> bool engineInit();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPlatformSpeechSynthesizerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx"> m_platformSpeechWrapper->resume();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
</del><ins>+void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_platformSpeechWrapper);
</span><del>- m_platformSpeechWrapper->speak(utterance);
</del><ins>+ m_platformSpeechWrapper->speak(WTFMove(utterance));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::cancel()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-long PlatformPasteboard::setBufferForType(PassRefPtr<SharedBuffer>, const String&)
</del><ins>+long PlatformPasteboard::setBufferForType(SharedBuffer*, const String&)
</ins><span class="cx"> {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> * documentation and/or other materials provided with the distribution.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="cx"> * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WebCore::PlatformSpeechSynthesizer* m_synthesizerObject;
</span><span class="cx"> // Hold a Ref to the utterance so that it won't disappear until the synth is done with it.
</span><span class="cx"> RefPtr<WebCore::PlatformSpeechSynthesisUtterance> m_utterance;
</span><del>-
</del><ins>+
</ins><span class="cx"> RetainPtr<AVSpeechSynthesizer> m_synthesizer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_synthesizerObject = synthesizer;
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> rate *= AVSpeechUtteranceDefaultSpeechRate;
</span><span class="cx"> else
</span><span class="cx"> rate = AVSpeechUtteranceDefaultSpeechRate + ((rate - 1) * (AVSpeechUtteranceMaximumSpeechRate - AVSpeechUtteranceDefaultSpeechRate));
</span><del>-
</del><ins>+
</ins><span class="cx"> return rate;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,10 +92,10 @@
</span><span class="cx"> // When speak is called we should not have an existing speech utterance outstanding.
</span><span class="cx"> ASSERT(!m_utterance);
</span><span class="cx"> ASSERT(utterance);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> if (!m_synthesizer) {
</span><span class="cx"> m_synthesizer = adoptNS([allocAVSpeechSynthesizerInstance() init]);
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> voiceLanguage = utterance->lang();
</span><span class="cx"> } else
</span><span class="cx"> voiceLanguage = utterance->voice()->lang();
</span><del>-
</del><ins>+
</ins><span class="cx"> AVSpeechSynthesisVoice *avVoice = nil;
</span><span class="cx"> if (voiceLanguage)
</span><span class="cx"> avVoice = [AVSpeechSynthesisVoiceClass voiceWithLanguage:voiceLanguage];
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> [avUtterance setPitchMultiplier:utterance->pitch()];
</span><span class="cx"> [avUtterance setVoice:avVoice];
</span><span class="cx"> m_utterance = utterance;
</span><del>-
</del><ins>+
</ins><span class="cx"> [m_synthesizer speakUtterance:avUtterance];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> [m_synthesizer pauseSpeakingAtBoundary:AVSpeechBoundaryImmediate];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> [m_synthesizer continueSpeaking];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> [m_synthesizer stopSpeakingAtBoundary:AVSpeechBoundaryImmediate];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> UNUSED_PARAM(utterance);
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_synthesizerObject->client()->didStartSpeaking(m_utterance);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -176,11 +176,11 @@
</span><span class="cx"> UNUSED_PARAM(utterance);
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clear the m_utterance variable in case finish speaking kicks off a new speaking job immediately.
</span><span class="cx"> RefPtr<WebCore::PlatformSpeechSynthesisUtterance> platformUtterance = m_utterance;
</span><span class="cx"> m_utterance = nullptr;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_synthesizerObject->client()->didFinishSpeaking(platformUtterance);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> UNUSED_PARAM(utterance);
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_synthesizerObject->client()->didPauseSpeaking(m_utterance);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> UNUSED_PARAM(utterance);
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_synthesizerObject->client()->didResumeSpeaking(m_utterance);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -210,11 +210,11 @@
</span><span class="cx"> UNUSED_PARAM(utterance);
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clear the m_utterance variable in case finish speaking kicks off a new speaking job immediately.
</span><span class="cx"> RefPtr<WebCore::PlatformSpeechSynthesisUtterance> platformUtterance = m_utterance;
</span><span class="cx"> m_utterance = nullptr;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_synthesizerObject->client()->didFinishSpeaking(platformUtterance);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -222,10 +222,10 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(synthesizer);
</span><span class="cx"> UNUSED_PARAM(utterance);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // iOS only supports word boundaries.
</span><span class="cx"> m_synthesizerObject->client()->boundaryEventOccurred(m_utterance, WebCore::SpeechWordBoundary, characterRange.location);
</span><span class="cx"> }
</span><span class="lines">@@ -266,11 +266,11 @@
</span><span class="cx"> [m_platformSpeechWrapper.get() resume];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
</del><ins>+void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_platformSpeechWrapper)
</span><span class="cx"> m_platformSpeechWrapper = adoptNS([[WebSpeechSynthesisWrapper alloc] initWithSpeechSynthesizer:this]);
</span><del>-
</del><ins>+
</ins><span class="cx"> [m_platformSpeechWrapper.get() speakUtterance:utterance.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> {
</span><span class="cx"> [m_platformSpeechWrapper.get() cancel];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SPEECH_SYNTHESIS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -169,15 +169,15 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(content.clientTypes.size() == content.clientData.size());
</span><span class="cx"> for (size_t i = 0, size = content.clientTypes.size(); i < size; ++i)
</span><del>- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.clientData[i], content.clientTypes[i], m_pasteboardName);
</del><ins>+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.clientData[i].get(), content.clientTypes[i], m_pasteboardName);
</ins><span class="cx"> if (content.canSmartCopyOrDelete)
</span><del>- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(0, WebSmartPastePboardType, m_pasteboardName);
</del><ins>+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(nullptr, WebSmartPastePboardType, m_pasteboardName);
</ins><span class="cx"> if (content.dataInWebArchiveFormat)
</span><del>- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInWebArchiveFormat, WebArchivePboardType, m_pasteboardName);
</del><ins>+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInWebArchiveFormat.get(), WebArchivePboardType, m_pasteboardName);
</ins><span class="cx"> if (content.dataInRTFDFormat)
</span><del>- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFDFormat, NSRTFDPboardType, m_pasteboardName);
</del><ins>+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFDFormat.get(), NSRTFDPboardType, m_pasteboardName);
</ins><span class="cx"> if (content.dataInRTFFormat)
</span><del>- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFFormat, NSRTFPboardType, m_pasteboardName);
</del><ins>+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFFormat.get(), NSRTFPboardType, m_pasteboardName);
</ins><span class="cx"> if (!content.dataInStringFormat.isNull())
</span><span class="cx"> m_changeCount = platformStrategies()->pasteboardStrategy()->setStringForType(content.dataInStringFormat, NSStringPboardType, m_pasteboardName);
</span><span class="cx"> }
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageResourceMIMEType(pasteboardImage.resourceMIMEType));
</span><span class="cx">
</span><span class="cx"> m_changeCount = writeURLForTypes(writableTypesForImage(), m_pasteboardName, pasteboardImage.url);
</span><del>- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(SharedBuffer::wrapCFData(imageData), NSTIFFPboardType, m_pasteboardName);
</del><ins>+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(SharedBuffer::wrapCFData(imageData).ptr(), NSTIFFPboardType, m_pasteboardName);
</ins><span class="cx"> writeFileWrapperAsRTFDAttachment(fileWrapper(pasteboardImage), m_pasteboardName, m_changeCount);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> void PlatformPasteboard::getTypes(Vector<String>& types)
</span><span class="cx"> {
</span><span class="cx"> NSArray *pasteboardTypes = [m_pasteboard.get() types];
</span><del>-
</del><ins>+
</ins><span class="cx"> for (NSUInteger i = 0; i < [pasteboardTypes count]; i++)
</span><span class="cx"> types.append([pasteboardTypes objectAtIndex:i]);
</span><span class="cx"> }
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> NSArray* paths = [m_pasteboard.get() propertyListForType:pasteboardType];
</span><span class="cx"> if ([paths isKindOfClass:[NSString class]]) {
</span><span class="cx"> pathnames.append((NSString *)paths);
</span><del>- return;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx"> for (NSUInteger i = 0; i < [paths count]; i++)
</span><span class="cx"> pathnames.append([paths objectAtIndex:i]);
</span><span class="lines">@@ -85,14 +85,14 @@
</span><span class="cx"> Color PlatformPasteboard::color()
</span><span class="cx"> {
</span><span class="cx"> NSColor *color = [NSColor colorFromPasteboard:m_pasteboard.get()];
</span><del>-
- // The color may not be in an RGB colorspace. This commonly occurs when a color is
</del><ins>+
+ // The color may not be in an RGB colorspace. This commonly occurs when a color is
</ins><span class="cx"> // dragged from the NSColorPanel grayscale picker.
</span><span class="cx"> if ([[color colorSpace] colorSpaceModel] != NSRGBColorSpaceModel)
</span><span class="cx"> color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
</span><del>-
- return makeRGBA((int)([color redComponent] * 255.0 + 0.5), (int)([color greenComponent] * 255.0 + 0.5),
- (int)([color blueComponent] * 255.0 + 0.5), (int)([color alphaComponent] * 255.0 + 0.5));
</del><ins>+
+ return makeRGBA((int)([color redComponent] * 255.0 + 0.5), (int)([color greenComponent] * 255.0 + 0.5),
+ (int)([color blueComponent] * 255.0 + 0.5), (int)([color alphaComponent] * 255.0 + 0.5));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL PlatformPasteboard::url()
</span><span class="lines">@@ -104,13 +104,13 @@
</span><span class="cx"> {
</span><span class="cx"> NSPasteboard* pasteboard = [NSPasteboard pasteboardWithName:fromPasteboard];
</span><span class="cx"> NSArray* types = [pasteboard types];
</span><del>-
</del><ins>+
</ins><span class="cx"> [m_pasteboard.get() addTypes:types owner:nil];
</span><span class="cx"> for (NSUInteger i = 0; i < [types count]; i++) {
</span><span class="cx"> NSString* type = [types objectAtIndex:i];
</span><span class="cx"> if (![m_pasteboard.get() setData:[pasteboard dataForType:type] forType:type])
</span><span class="cx"> return 0;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> return changeCount();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> return [m_pasteboard.get() declareTypes:types.get() owner:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-long PlatformPasteboard::setBufferForType(PassRefPtr<SharedBuffer> buffer, const String& pasteboardType)
</del><ins>+long PlatformPasteboard::setBufferForType(SharedBuffer* buffer, const String& pasteboardType)
</ins><span class="cx"> {
</span><span class="cx"> BOOL didWriteData = [m_pasteboard setData:buffer ? buffer->createNSData().get() : nil forType:pasteboardType];
</span><span class="cx"> if (!didWriteData)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> long PlatformPasteboard::setPathnamesForType(const Vector<String>& pathnames, const String& pasteboardType)
</span><span class="cx"> {
</span><del>- RetainPtr<NSMutableArray> paths = adoptNS([[NSMutableArray alloc] init]);
</del><ins>+ RetainPtr<NSMutableArray> paths = adoptNS([[NSMutableArray alloc] init]);
</ins><span class="cx"> for (size_t i = 0; i < pathnames.size(); ++i)
</span><span class="cx"> [paths.get() addObject:[NSArray arrayWithObject:pathnames[i]]];
</span><span class="cx"> BOOL didWriteData = [m_pasteboard.get() setPropertyList:paths.get() forType:pasteboardType];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformSpeechSynthesizerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "PlatformSpeechSynthesisVoice.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #include <AppKit/NSSpeechSynthesizer.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SPEECH_SYNTHESIS)
</span><span class="lines">@@ -40,7 +39,7 @@
</span><span class="cx"> WebCore::PlatformSpeechSynthesizer* m_synthesizerObject;
</span><span class="cx"> // Hold a Ref to the utterance so that it won't disappear until the synth is done with it.
</span><span class="cx"> WebCore::PlatformSpeechSynthesisUtterance* m_utterance;
</span><del>-
</del><ins>+
</ins><span class="cx"> RetainPtr<NSSpeechSynthesizer> m_synthesizer;
</span><span class="cx"> float m_basePitch;
</span><span class="cx"> }
</span><span class="lines">@@ -56,7 +55,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_synthesizerObject = synthesizer;
</span><span class="cx"> [self updateBasePitchForSynthesizer];
</span><span class="cx"> return self;
</span><span class="lines">@@ -88,16 +87,16 @@
</span><span class="cx"> // When speak is called we should not have an existing speech utterance outstanding.
</span><span class="cx"> ASSERT(!m_utterance);
</span><span class="cx"> ASSERT(utterance);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!m_synthesizer) {
</span><span class="cx"> m_synthesizer = adoptNS([[NSSpeechSynthesizer alloc] initWithVoice:nil]);
</span><span class="cx"> [m_synthesizer setDelegate:self];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Find if we should use a specific voice based on the voiceURI in utterance.
</span><span class="cx"> // Otherwise, find the voice that matches the language. The Mac doesn't have a default voice per language, so the first
</span><span class="cx"> // one will have to do.
</span><del>-
</del><ins>+
</ins><span class="cx"> WebCore::PlatformSpeechSynthesisVoice* utteranceVoice = utterance->voice();
</span><span class="cx"> // If no voice was specified, try to match by language.
</span><span class="cx"> if (!utteranceVoice && !utterance->lang().isEmpty()) {
</span><span class="lines">@@ -109,7 +108,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> NSString *voiceURI = nil;
</span><span class="cx"> if (utteranceVoice)
</span><span class="cx"> voiceURI = utteranceVoice->voiceURI();
</span><span class="lines">@@ -124,14 +123,14 @@
</span><span class="cx"> // Reset the base pitch whenever we change voices.
</span><span class="cx"> updatePitch = YES;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_basePitch == 0 || updatePitch)
</span><del>- [self updateBasePitchForSynthesizer];
-
</del><ins>+ [self updateBasePitchForSynthesizer];
+
</ins><span class="cx"> [m_synthesizer setObject:[NSNumber numberWithFloat:[self convertPitchToNSSpeechValue:utterance->pitch()]] forProperty:NSSpeechPitchBaseProperty error:nil];
</span><span class="cx"> [m_synthesizer setRate:[self convertRateToWPM:utterance->rate()]];
</span><span class="cx"> [m_synthesizer setVolume:utterance->volume()];
</span><del>-
</del><ins>+
</ins><span class="cx"> m_utterance = utterance;
</span><span class="cx"> [m_synthesizer startSpeakingString:utterance->text()];
</span><span class="cx"> m_synthesizerObject->client()->didStartSpeaking(utterance);
</span><span class="lines">@@ -141,7 +140,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> [m_synthesizer pauseSpeakingAtBoundary:NSSpeechImmediateBoundary];
</span><span class="cx"> m_synthesizerObject->client()->didPauseSpeaking(m_utterance);
</span><span class="cx"> }
</span><span class="lines">@@ -150,7 +149,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> [m_synthesizer continueSpeaking];
</span><span class="cx"> m_synthesizerObject->client()->didResumeSpeaking(m_utterance);
</span><span class="cx"> }
</span><span class="lines">@@ -159,7 +158,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> [m_synthesizer stopSpeakingAtBoundary:NSSpeechImmediateBoundary];
</span><span class="cx"> m_synthesizerObject->client()->speakingErrorOccurred(m_utterance);
</span><span class="cx"> m_utterance = 0;
</span><span class="lines">@@ -176,13 +175,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> UNUSED_PARAM(sender);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clear the m_utterance variable in case finish speaking kicks off a new speaking job immediately.
</span><span class="cx"> WebCore::PlatformSpeechSynthesisUtterance* utterance = m_utterance;
</span><span class="cx"> m_utterance = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (finishedSpeaking)
</span><span class="cx"> m_synthesizerObject->client()->didFinishSpeaking(utterance);
</span><span class="cx"> else
</span><span class="lines">@@ -222,7 +221,7 @@
</span><span class="cx"> for (NSUInteger k = 0; k < count; k++) {
</span><span class="cx"> NSString *voiceName = [availableVoices objectAtIndex:k];
</span><span class="cx"> NSDictionary *attributes = [NSSpeechSynthesizer attributesForVoice:voiceName];
</span><del>-
</del><ins>+
</ins><span class="cx"> NSString *voiceURI = [attributes objectForKey:NSVoiceIdentifier];
</span><span class="cx"> NSString *name = [attributes objectForKey:NSVoiceName];
</span><span class="cx"> NSString *language = [attributes objectForKey:NSVoiceLocaleIdentifier];
</span><span class="lines">@@ -229,16 +228,16 @@
</span><span class="cx"> NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:language];
</span><span class="cx"> NSString *defaultVoiceURI = wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale(locale);
</span><span class="cx"> [locale release];
</span><del>-
</del><ins>+
</ins><span class="cx"> // Change to BCP-47 format as defined by spec.
</span><span class="cx"> language = [language stringByReplacingOccurrencesOfString:@"_" withString:@"-"];
</span><del>-
</del><ins>+
</ins><span class="cx"> bool isDefault = [defaultVoiceURI isEqualToString:voiceURI];
</span><del>-
</del><ins>+
</ins><span class="cx"> m_voiceList.append(PlatformSpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault));
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void PlatformSpeechSynthesizer::pause()
</span><span class="cx"> {
</span><span class="cx"> [m_platformSpeechWrapper.get() pause];
</span><span class="lines">@@ -248,12 +247,12 @@
</span><span class="cx"> {
</span><span class="cx"> [m_platformSpeechWrapper.get() resume];
</span><span class="cx"> }
</span><del>-
-void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
</del><ins>+
+void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_platformSpeechWrapper)
</span><span class="cx"> m_platformSpeechWrapper = adoptNS([[WebSpeechSynthesisWrapper alloc] initWithSpeechSynthesizer:this]);
</span><del>-
</del><ins>+
</ins><span class="cx"> [m_platformSpeechWrapper.get() speakUtterance:utterance.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -261,7 +260,7 @@
</span><span class="cx"> {
</span><span class="cx"> [m_platformSpeechWrapper.get() cancel];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SPEECH_SYNTHESIS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> static Ref<SerializedPlatformRepresentation> create(id);
</span><span class="cx">
</span><span class="cx"> JSC::JSValue deserialize(JSC::ExecState*) const override;
</span><del>- PassRefPtr<ArrayBuffer> data() const override;
</del><ins>+ RefPtr<ArrayBuffer> data() const override;
</ins><span class="cx">
</span><span class="cx"> bool isEqual(const SerializedPlatformRepresentation&) const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return adoptRef(*new SerializedPlatformRepresentationMac(nativeValue));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ArrayBuffer> SerializedPlatformRepresentationMac::data() const
</del><ins>+RefPtr<ArrayBuffer> SerializedPlatformRepresentationMac::data() const
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -135,10 +135,10 @@
</span><span class="cx">
</span><span class="cx"> if ([value isKindOfClass:[NSData class]])
</span><span class="cx"> return jsValueWithDataInContext(value, context);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ([value isKindOfClass:[AVMetadataItem class]])
</span><span class="cx"> return jsValueWithAVMetadataItemInContext(value, context);
</span><del>-
</del><ins>+
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> , m_speakingFinishedTimer(*this, &PlatformSpeechSynthesizerMock::speakingFinished)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> PlatformSpeechSynthesizerMock::~PlatformSpeechSynthesizerMock()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -46,10 +46,10 @@
</span><span class="cx"> ASSERT(m_utterance.get());
</span><span class="cx"> RefPtr<PlatformSpeechSynthesisUtterance> protect(m_utterance);
</span><span class="cx"> m_utterance = nullptr;
</span><del>-
</del><ins>+
</ins><span class="cx"> client()->didFinishSpeaking(protect);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void PlatformSpeechSynthesizerMock::initializeVoiceList()
</span><span class="cx"> {
</span><span class="cx"> m_voiceList.append(PlatformSpeechSynthesisVoice::create(String("mock.voice.bruce"), String("bruce"), String("en-US"), true, true));
</span><span class="lines">@@ -57,25 +57,25 @@
</span><span class="cx"> m_voiceList.append(PlatformSpeechSynthesisVoice::create(String("mock.voice.logan"), String("logan"), String("fr-CA"), true, true));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformSpeechSynthesizerMock::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
</del><ins>+void PlatformSpeechSynthesizerMock::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_utterance);
</span><del>- m_utterance = utterance;
</del><ins>+ m_utterance = WTFMove(utterance);
</ins><span class="cx"> client()->didStartSpeaking(m_utterance);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Fire a fake word and then sentence boundary event.
</span><span class="cx"> client()->boundaryEventOccurred(m_utterance, SpeechWordBoundary, 0);
</span><span class="cx"> client()->boundaryEventOccurred(m_utterance, SpeechSentenceBoundary, m_utterance->text().length());
</span><del>-
</del><ins>+
</ins><span class="cx"> // Give the fake speech job some time so that pause and other functions have time to be called.
</span><span class="cx"> m_speakingFinishedTimer.startOneShot(.1);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void PlatformSpeechSynthesizerMock::cancel()
</span><span class="cx"> {
</span><span class="cx"> if (!m_utterance)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_speakingFinishedTimer.stop();
</span><span class="cx"> client()->speakingErrorOccurred(m_utterance);
</span><span class="cx"> m_utterance = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -32,25 +32,25 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
</del><ins>+
</ins><span class="cx"> class PlatformSpeechSynthesizerMock : public PlatformSpeechSynthesizer {
</span><span class="cx"> public:
</span><span class="cx"> explicit PlatformSpeechSynthesizerMock(PlatformSpeechSynthesizerClient*);
</span><span class="cx">
</span><span class="cx"> virtual ~PlatformSpeechSynthesizerMock();
</span><del>- virtual void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>);
</del><ins>+ virtual void speak(RefPtr<PlatformSpeechSynthesisUtterance>&&);
</ins><span class="cx"> virtual void pause();
</span><span class="cx"> virtual void resume();
</span><span class="cx"> virtual void cancel();
</span><del>-
</del><ins>+
</ins><span class="cx"> private:
</span><span class="cx"> virtual void initializeVoiceList();
</span><span class="cx"> void speakingFinished();
</span><del>-
</del><ins>+
</ins><span class="cx"> Timer m_speakingFinishedTimer;
</span><span class="cx"> RefPtr<PlatformSpeechSynthesisUtterance> m_utterance;
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SPEECH_SYNTHESIS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-11 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Purge PassRefPtr in platform/efl and platform/mac
+ https://bugs.webkit.org/show_bug.cgi?id=159548
+
+ Reviewed by Alex Christensen.
+
+ Remove all use of PassRefPtr and clean up unnecessary tabs and spaces.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::setBufferForType):
+
</ins><span class="cx"> 2016-07-11 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Add synthetic click origin to WKNavigationAction.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
</span><span class="cx"> long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
</span><span class="cx"> long copy(const String& fromPasteboard, const String& toPasteboard) override;
</span><del>- long setBufferForType(PassRefPtr<WebCore::SharedBuffer>, const String& pasteboardType, const String& pasteboardName) override;
</del><ins>+ long setBufferForType(WebCore::SharedBuffer*, const String& pasteboardType, const String& pasteboardName) override;
</ins><span class="cx"> long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) override;
</span><span class="cx"> long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> return PlatformPasteboard(pasteboardName).setTypes(pasteboardTypes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-long WebPlatformStrategies::setBufferForType(PassRefPtr<SharedBuffer> buffer, const String& pasteboardType, const String& pasteboardName)
</del><ins>+long WebPlatformStrategies::setBufferForType(SharedBuffer* buffer, const String& pasteboardType, const String& pasteboardName)
</ins><span class="cx"> {
</span><span class="cx"> return PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-07-11 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Purge PassRefPtr in platform/efl and platform/mac
+ https://bugs.webkit.org/show_bug.cgi?id=159548
+
+ Reviewed by Alex Christensen.
+
+ Remove all use of PassRefPtr and clean up unnecessary tabs and spaces.
+ WebKit2 codes are also changed because of setBufferForType()'s modification.
+
+ * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+ (WebKit::WebPasteboardProxy::setPasteboardBufferForType):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::setBufferForType):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
</ins><span class="cx"> 2016-07-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Intermittent crash in [UIApplication beginBackgroundTaskWithName] expiration handler
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> }
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
</span><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
</span><del>- newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
</del><ins>+ newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer.get(), pasteboardType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-long WebPlatformStrategies::setBufferForType(PassRefPtr<SharedBuffer> buffer, const String& pasteboardType, const String& pasteboardName)
</del><ins>+long WebPlatformStrategies::setBufferForType(SharedBuffer* buffer, const String& pasteboardType, const String& pasteboardName)
</ins><span class="cx"> {
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> if (buffer) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (203108 => 203109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-07-12 05:59:55 UTC (rev 203108)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-07-12 06:24:30 UTC (rev 203109)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
</span><span class="cx"> long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
</span><span class="cx"> long copy(const String& fromPasteboard, const String& toPasteboard) override;
</span><del>- long setBufferForType(PassRefPtr<WebCore::SharedBuffer>, const String& pasteboardType, const String& pasteboardName) override;
</del><ins>+ long setBufferForType(WebCore::SharedBuffer*, const String& pasteboardType, const String& pasteboardName) override;
</ins><span class="cx"> long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) override;
</span><span class="cx"> long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>