Diff
Modified: trunk/Source/WebCore/ChangeLog (203108 => 203109)
--- 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)
@@ -1,3 +1,69 @@
+2016-07-11 Gyuyoung Kim <[email protected]>
+
+ 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:
+
2016-07-11 Frederic Wang <[email protected]>
Move parsing of mspace attributes to a MathMLSpaceElement class
Modified: trunk/Source/WebCore/platform/PasteboardStrategy.h (203108 => 203109)
--- 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)
@@ -20,7 +20,7 @@
* 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.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef PasteboardStrategy_h
@@ -60,11 +60,11 @@
virtual String uniqueName() = 0;
virtual Color color(const String& pasteboardName) = 0;
virtual URL url(const String& pasteboardName) = 0;
-
+
virtual long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) = 0;
virtual long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) = 0;
virtual long copy(const String& fromPasteboard, const String& toPasteboard) = 0;
- virtual long setBufferForType(PassRefPtr<SharedBuffer>, const String& pasteboardType, const String& pasteboardName) = 0;
+ virtual long setBufferForType(SharedBuffer*, const String& pasteboardType, const String& pasteboardName) = 0;
virtual long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) = 0;
virtual long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) = 0;
#endif
Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (203108 => 203109)
--- 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)
@@ -20,7 +20,7 @@
* 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.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef PlatformPasteboard_h
@@ -55,7 +55,7 @@
WEBCORE_EXPORT PlatformPasteboard();
#endif
WEBCORE_EXPORT static String uniqueName();
-
+
WEBCORE_EXPORT void getTypes(Vector<String>& types);
WEBCORE_EXPORT RefPtr<SharedBuffer> bufferForType(const String& pasteboardType);
WEBCORE_EXPORT void getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType);
@@ -70,7 +70,7 @@
// These methods will return 0 if pasteboard ownership has been taken from us.
WEBCORE_EXPORT long copy(const String& fromPasteboard);
- WEBCORE_EXPORT long setBufferForType(PassRefPtr<SharedBuffer>, const String& pasteboardType);
+ WEBCORE_EXPORT long setBufferForType(SharedBuffer*, const String& pasteboardType);
WEBCORE_EXPORT long setPathnamesForType(const Vector<String>& pathnames, const String& pasteboardType);
WEBCORE_EXPORT long setStringForType(const String&, const String& pasteboardType);
WEBCORE_EXPORT void write(const PasteboardWebContent&);
Modified: trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h (203108 => 203109)
--- 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)
@@ -71,13 +71,13 @@
// FIXME: We have multiple virtual functions just so we can support a mock for testing.
// Seems wasteful. Would be nice to find a better way.
WEBCORE_EXPORT virtual ~PlatformSpeechSynthesizer();
-
+
const Vector<RefPtr<PlatformSpeechSynthesisVoice>>& voiceList() const;
- virtual void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>);
+ virtual void speak(RefPtr<PlatformSpeechSynthesisUtterance>&&);
virtual void pause();
virtual void resume();
virtual void cancel();
-
+
PlatformSpeechSynthesizerClient* client() const { return m_speechSynthesizerClient; }
protected:
@@ -88,7 +88,7 @@
bool m_voiceListIsInitialized { false };
PlatformSpeechSynthesizerClient* m_speechSynthesizerClient;
-
+
#if PLATFORM(COCOA)
RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
#endif
@@ -96,7 +96,7 @@
std::unique_ptr<PlatformSpeechSynthesisProviderEfl> m_platformSpeechWrapper;
#endif
};
-
+
} // namespace WebCore
#endif // ENABLE(SPEECH_SYNTHESIS)
Modified: trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h (203108 => 203109)
--- 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)
@@ -39,7 +39,7 @@
virtual ~SerializedPlatformRepresentation() { }
virtual JSC::JSValue deserialize(JSC::ExecState*) const = 0;
- virtual PassRefPtr<ArrayBuffer> data() const = 0;
+ virtual RefPtr<ArrayBuffer> data() const = 0;
virtual bool isEqual(const SerializedPlatformRepresentation&) const = 0;
enum PlatformType {
Modified: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp (203108 => 203109)
--- 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)
@@ -136,7 +136,7 @@
notImplemented();
}
-void PlatformSpeechSynthesisProviderEfl::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+void PlatformSpeechSynthesisProviderEfl::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
{
if (!engineInit() || !utterance) {
fireSpeechEvent(SpeechError);
@@ -143,7 +143,7 @@
return;
}
- m_utterance = utterance;
+ m_utterance = WTFMove(utterance);
String voice = voiceName(m_utterance);
espeak_SetVoiceByName(voice.utf8().data());
espeak_SetParameter(espeakRATE, convertRateToEspeakValue(m_utterance->rate()), 0);
Modified: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h (203108 => 203109)
--- 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)
@@ -55,7 +55,7 @@
void initializeVoiceList(Vector<RefPtr<PlatformSpeechSynthesisVoice>>&);
void pause();
void resume();
- void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>);
+ void speak(RefPtr<PlatformSpeechSynthesisUtterance>&&);
void cancel();
private:
bool engineInit();
Modified: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp (203108 => 203109)
--- 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)
@@ -63,10 +63,10 @@
m_platformSpeechWrapper->resume();
}
-void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
{
ASSERT(m_platformSpeechWrapper);
- m_platformSpeechWrapper->speak(utterance);
+ m_platformSpeechWrapper->speak(WTFMove(utterance));
}
void PlatformSpeechSynthesizer::cancel()
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (203108 => 203109)
--- 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)
@@ -125,7 +125,7 @@
return 0;
}
-long PlatformPasteboard::setBufferForType(PassRefPtr<SharedBuffer>, const String&)
+long PlatformPasteboard::setBufferForType(SharedBuffer*, const String&)
{
return 0;
}
Modified: trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm (203108 => 203109)
--- 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)
@@ -9,7 +9,7 @@
* 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
@@ -55,7 +55,7 @@
WebCore::PlatformSpeechSynthesizer* m_synthesizerObject;
// Hold a Ref to the utterance so that it won't disappear until the synth is done with it.
RefPtr<WebCore::PlatformSpeechSynthesisUtterance> m_utterance;
-
+
RetainPtr<AVSpeechSynthesizer> m_synthesizer;
}
@@ -70,7 +70,7 @@
{
if (!(self = [super init]))
return nil;
-
+
m_synthesizerObject = synthesizer;
return self;
}
@@ -83,7 +83,7 @@
rate *= AVSpeechUtteranceDefaultSpeechRate;
else
rate = AVSpeechUtteranceDefaultSpeechRate + ((rate - 1) * (AVSpeechUtteranceMaximumSpeechRate - AVSpeechUtteranceDefaultSpeechRate));
-
+
return rate;
}
@@ -92,10 +92,10 @@
// When speak is called we should not have an existing speech utterance outstanding.
ASSERT(!m_utterance);
ASSERT(utterance);
-
+
if (!utterance)
return;
-
+
BEGIN_BLOCK_OBJC_EXCEPTIONS
if (!m_synthesizer) {
m_synthesizer = adoptNS([allocAVSpeechSynthesizerInstance() init]);
@@ -113,7 +113,7 @@
voiceLanguage = utterance->lang();
} else
voiceLanguage = utterance->voice()->lang();
-
+
AVSpeechSynthesisVoice *avVoice = nil;
if (voiceLanguage)
avVoice = [AVSpeechSynthesisVoiceClass voiceWithLanguage:voiceLanguage];
@@ -125,7 +125,7 @@
[avUtterance setPitchMultiplier:utterance->pitch()];
[avUtterance setVoice:avVoice];
m_utterance = utterance;
-
+
[m_synthesizer speakUtterance:avUtterance];
END_BLOCK_OBJC_EXCEPTIONS
}
@@ -134,7 +134,7 @@
{
if (!m_utterance)
return;
-
+
BEGIN_BLOCK_OBJC_EXCEPTIONS
[m_synthesizer pauseSpeakingAtBoundary:AVSpeechBoundaryImmediate];
END_BLOCK_OBJC_EXCEPTIONS
@@ -144,7 +144,7 @@
{
if (!m_utterance)
return;
-
+
BEGIN_BLOCK_OBJC_EXCEPTIONS
[m_synthesizer continueSpeaking];
END_BLOCK_OBJC_EXCEPTIONS
@@ -154,7 +154,7 @@
{
if (!m_utterance)
return;
-
+
BEGIN_BLOCK_OBJC_EXCEPTIONS
[m_synthesizer stopSpeakingAtBoundary:AVSpeechBoundaryImmediate];
END_BLOCK_OBJC_EXCEPTIONS
@@ -166,7 +166,7 @@
UNUSED_PARAM(utterance);
if (!m_utterance)
return;
-
+
m_synthesizerObject->client()->didStartSpeaking(m_utterance);
}
@@ -176,11 +176,11 @@
UNUSED_PARAM(utterance);
if (!m_utterance)
return;
-
+
// Clear the m_utterance variable in case finish speaking kicks off a new speaking job immediately.
RefPtr<WebCore::PlatformSpeechSynthesisUtterance> platformUtterance = m_utterance;
m_utterance = nullptr;
-
+
m_synthesizerObject->client()->didFinishSpeaking(platformUtterance);
}
@@ -190,7 +190,7 @@
UNUSED_PARAM(utterance);
if (!m_utterance)
return;
-
+
m_synthesizerObject->client()->didPauseSpeaking(m_utterance);
}
@@ -200,7 +200,7 @@
UNUSED_PARAM(utterance);
if (!m_utterance)
return;
-
+
m_synthesizerObject->client()->didResumeSpeaking(m_utterance);
}
@@ -210,11 +210,11 @@
UNUSED_PARAM(utterance);
if (!m_utterance)
return;
-
+
// Clear the m_utterance variable in case finish speaking kicks off a new speaking job immediately.
RefPtr<WebCore::PlatformSpeechSynthesisUtterance> platformUtterance = m_utterance;
m_utterance = nullptr;
-
+
m_synthesizerObject->client()->didFinishSpeaking(platformUtterance);
}
@@ -222,10 +222,10 @@
{
UNUSED_PARAM(synthesizer);
UNUSED_PARAM(utterance);
-
+
if (!m_utterance)
return;
-
+
// iOS only supports word boundaries.
m_synthesizerObject->client()->boundaryEventOccurred(m_utterance, WebCore::SpeechWordBoundary, characterRange.location);
}
@@ -266,11 +266,11 @@
[m_platformSpeechWrapper.get() resume];
}
-void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
{
if (!m_platformSpeechWrapper)
m_platformSpeechWrapper = adoptNS([[WebSpeechSynthesisWrapper alloc] initWithSpeechSynthesizer:this]);
-
+
[m_platformSpeechWrapper.get() speakUtterance:utterance.get()];
}
@@ -278,7 +278,7 @@
{
[m_platformSpeechWrapper.get() cancel];
}
-
+
} // namespace WebCore
#endif // ENABLE(SPEECH_SYNTHESIS)
Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (203108 => 203109)
--- 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)
@@ -169,15 +169,15 @@
ASSERT(content.clientTypes.size() == content.clientData.size());
for (size_t i = 0, size = content.clientTypes.size(); i < size; ++i)
- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.clientData[i], content.clientTypes[i], m_pasteboardName);
+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.clientData[i].get(), content.clientTypes[i], m_pasteboardName);
if (content.canSmartCopyOrDelete)
- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(0, WebSmartPastePboardType, m_pasteboardName);
+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(nullptr, WebSmartPastePboardType, m_pasteboardName);
if (content.dataInWebArchiveFormat)
- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInWebArchiveFormat, WebArchivePboardType, m_pasteboardName);
+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInWebArchiveFormat.get(), WebArchivePboardType, m_pasteboardName);
if (content.dataInRTFDFormat)
- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFDFormat, NSRTFDPboardType, m_pasteboardName);
+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFDFormat.get(), NSRTFDPboardType, m_pasteboardName);
if (content.dataInRTFFormat)
- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFFormat, NSRTFPboardType, m_pasteboardName);
+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.dataInRTFFormat.get(), NSRTFPboardType, m_pasteboardName);
if (!content.dataInStringFormat.isNull())
m_changeCount = platformStrategies()->pasteboardStrategy()->setStringForType(content.dataInStringFormat, NSStringPboardType, m_pasteboardName);
}
@@ -263,7 +263,7 @@
ASSERT(MIMETypeRegistry::isSupportedImageResourceMIMEType(pasteboardImage.resourceMIMEType));
m_changeCount = writeURLForTypes(writableTypesForImage(), m_pasteboardName, pasteboardImage.url);
- m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(SharedBuffer::wrapCFData(imageData), NSTIFFPboardType, m_pasteboardName);
+ m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(SharedBuffer::wrapCFData(imageData).ptr(), NSTIFFPboardType, m_pasteboardName);
writeFileWrapperAsRTFDAttachment(fileWrapper(pasteboardImage), m_pasteboardName, m_changeCount);
}
Modified: trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm (203108 => 203109)
--- 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)
@@ -40,7 +40,7 @@
void PlatformPasteboard::getTypes(Vector<String>& types)
{
NSArray *pasteboardTypes = [m_pasteboard.get() types];
-
+
for (NSUInteger i = 0; i < [pasteboardTypes count]; i++)
types.append([pasteboardTypes objectAtIndex:i]);
}
@@ -58,7 +58,7 @@
NSArray* paths = [m_pasteboard.get() propertyListForType:pasteboardType];
if ([paths isKindOfClass:[NSString class]]) {
pathnames.append((NSString *)paths);
- return;
+ return;
}
for (NSUInteger i = 0; i < [paths count]; i++)
pathnames.append([paths objectAtIndex:i]);
@@ -85,14 +85,14 @@
Color PlatformPasteboard::color()
{
NSColor *color = [NSColor colorFromPasteboard:m_pasteboard.get()];
-
- // The color may not be in an RGB colorspace. This commonly occurs when a color is
+
+ // The color may not be in an RGB colorspace. This commonly occurs when a color is
// dragged from the NSColorPanel grayscale picker.
if ([[color colorSpace] colorSpaceModel] != NSRGBColorSpaceModel)
color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
-
- 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));
+
+ 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));
}
URL PlatformPasteboard::url()
@@ -104,13 +104,13 @@
{
NSPasteboard* pasteboard = [NSPasteboard pasteboardWithName:fromPasteboard];
NSArray* types = [pasteboard types];
-
+
[m_pasteboard.get() addTypes:types owner:nil];
for (NSUInteger i = 0; i < [types count]; i++) {
NSString* type = [types objectAtIndex:i];
if (![m_pasteboard.get() setData:[pasteboard dataForType:type] forType:type])
return 0;
- }
+ }
return changeCount();
}
@@ -135,7 +135,7 @@
return [m_pasteboard.get() declareTypes:types.get() owner:nil];
}
-long PlatformPasteboard::setBufferForType(PassRefPtr<SharedBuffer> buffer, const String& pasteboardType)
+long PlatformPasteboard::setBufferForType(SharedBuffer* buffer, const String& pasteboardType)
{
BOOL didWriteData = [m_pasteboard setData:buffer ? buffer->createNSData().get() : nil forType:pasteboardType];
if (!didWriteData)
@@ -145,7 +145,7 @@
long PlatformPasteboard::setPathnamesForType(const Vector<String>& pathnames, const String& pasteboardType)
{
- RetainPtr<NSMutableArray> paths = adoptNS([[NSMutableArray alloc] init]);
+ RetainPtr<NSMutableArray> paths = adoptNS([[NSMutableArray alloc] init]);
for (size_t i = 0; i < pathnames.size(); ++i)
[paths.get() addObject:[NSArray arrayWithObject:pathnames[i]]];
BOOL didWriteData = [m_pasteboard.get() setPropertyList:paths.get() forType:pasteboardType];
Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (203108 => 203109)
--- 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)
@@ -30,7 +30,6 @@
#include "PlatformSpeechSynthesisVoice.h"
#include "WebCoreSystemInterface.h"
#include <AppKit/NSSpeechSynthesizer.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/RetainPtr.h>
#if ENABLE(SPEECH_SYNTHESIS)
@@ -40,7 +39,7 @@
WebCore::PlatformSpeechSynthesizer* m_synthesizerObject;
// Hold a Ref to the utterance so that it won't disappear until the synth is done with it.
WebCore::PlatformSpeechSynthesisUtterance* m_utterance;
-
+
RetainPtr<NSSpeechSynthesizer> m_synthesizer;
float m_basePitch;
}
@@ -56,7 +55,7 @@
{
if (!(self = [super init]))
return nil;
-
+
m_synthesizerObject = synthesizer;
[self updateBasePitchForSynthesizer];
return self;
@@ -88,16 +87,16 @@
// When speak is called we should not have an existing speech utterance outstanding.
ASSERT(!m_utterance);
ASSERT(utterance);
-
+
if (!m_synthesizer) {
m_synthesizer = adoptNS([[NSSpeechSynthesizer alloc] initWithVoice:nil]);
[m_synthesizer setDelegate:self];
}
-
+
// Find if we should use a specific voice based on the voiceURI in utterance.
// Otherwise, find the voice that matches the language. The Mac doesn't have a default voice per language, so the first
// one will have to do.
-
+
WebCore::PlatformSpeechSynthesisVoice* utteranceVoice = utterance->voice();
// If no voice was specified, try to match by language.
if (!utteranceVoice && !utterance->lang().isEmpty()) {
@@ -109,7 +108,7 @@
}
}
}
-
+
NSString *voiceURI = nil;
if (utteranceVoice)
voiceURI = utteranceVoice->voiceURI();
@@ -124,14 +123,14 @@
// Reset the base pitch whenever we change voices.
updatePitch = YES;
}
-
+
if (m_basePitch == 0 || updatePitch)
- [self updateBasePitchForSynthesizer];
-
+ [self updateBasePitchForSynthesizer];
+
[m_synthesizer setObject:[NSNumber numberWithFloat:[self convertPitchToNSSpeechValue:utterance->pitch()]] forProperty:NSSpeechPitchBaseProperty error:nil];
[m_synthesizer setRate:[self convertRateToWPM:utterance->rate()]];
[m_synthesizer setVolume:utterance->volume()];
-
+
m_utterance = utterance;
[m_synthesizer startSpeakingString:utterance->text()];
m_synthesizerObject->client()->didStartSpeaking(utterance);
@@ -141,7 +140,7 @@
{
if (!m_utterance)
return;
-
+
[m_synthesizer pauseSpeakingAtBoundary:NSSpeechImmediateBoundary];
m_synthesizerObject->client()->didPauseSpeaking(m_utterance);
}
@@ -150,7 +149,7 @@
{
if (!m_utterance)
return;
-
+
[m_synthesizer continueSpeaking];
m_synthesizerObject->client()->didResumeSpeaking(m_utterance);
}
@@ -159,7 +158,7 @@
{
if (!m_utterance)
return;
-
+
[m_synthesizer stopSpeakingAtBoundary:NSSpeechImmediateBoundary];
m_synthesizerObject->client()->speakingErrorOccurred(m_utterance);
m_utterance = 0;
@@ -176,13 +175,13 @@
{
if (!m_utterance)
return;
-
+
UNUSED_PARAM(sender);
-
+
// Clear the m_utterance variable in case finish speaking kicks off a new speaking job immediately.
WebCore::PlatformSpeechSynthesisUtterance* utterance = m_utterance;
m_utterance = 0;
-
+
if (finishedSpeaking)
m_synthesizerObject->client()->didFinishSpeaking(utterance);
else
@@ -222,7 +221,7 @@
for (NSUInteger k = 0; k < count; k++) {
NSString *voiceName = [availableVoices objectAtIndex:k];
NSDictionary *attributes = [NSSpeechSynthesizer attributesForVoice:voiceName];
-
+
NSString *voiceURI = [attributes objectForKey:NSVoiceIdentifier];
NSString *name = [attributes objectForKey:NSVoiceName];
NSString *language = [attributes objectForKey:NSVoiceLocaleIdentifier];
@@ -229,16 +228,16 @@
NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:language];
NSString *defaultVoiceURI = wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale(locale);
[locale release];
-
+
// Change to BCP-47 format as defined by spec.
language = [language stringByReplacingOccurrencesOfString:@"_" withString:@"-"];
-
+
bool isDefault = [defaultVoiceURI isEqualToString:voiceURI];
-
+
m_voiceList.append(PlatformSpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault));
}
}
-
+
void PlatformSpeechSynthesizer::pause()
{
[m_platformSpeechWrapper.get() pause];
@@ -248,12 +247,12 @@
{
[m_platformSpeechWrapper.get() resume];
}
-
-void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+
+void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
{
if (!m_platformSpeechWrapper)
m_platformSpeechWrapper = adoptNS([[WebSpeechSynthesisWrapper alloc] initWithSpeechSynthesizer:this]);
-
+
[m_platformSpeechWrapper.get() speakUtterance:utterance.get()];
}
@@ -261,7 +260,7 @@
{
[m_platformSpeechWrapper.get() cancel];
}
-
+
} // namespace WebCore
#endif // ENABLE(SPEECH_SYNTHESIS)
Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h (203108 => 203109)
--- 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)
@@ -42,7 +42,7 @@
static Ref<SerializedPlatformRepresentation> create(id);
JSC::JSValue deserialize(JSC::ExecState*) const override;
- PassRefPtr<ArrayBuffer> data() const override;
+ RefPtr<ArrayBuffer> data() const override;
bool isEqual(const SerializedPlatformRepresentation&) const override;
Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm (203108 => 203109)
--- 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)
@@ -72,7 +72,7 @@
return adoptRef(*new SerializedPlatformRepresentationMac(nativeValue));
}
-PassRefPtr<ArrayBuffer> SerializedPlatformRepresentationMac::data() const
+RefPtr<ArrayBuffer> SerializedPlatformRepresentationMac::data() const
{
return nullptr;
}
@@ -135,10 +135,10 @@
if ([value isKindOfClass:[NSData class]])
return jsValueWithDataInContext(value, context);
-
+
if ([value isKindOfClass:[AVMetadataItem class]])
return jsValueWithAVMetadataItemInContext(value, context);
-
+
return nil;
}
Modified: trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp (203108 => 203109)
--- 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)
@@ -36,7 +36,7 @@
, m_speakingFinishedTimer(*this, &PlatformSpeechSynthesizerMock::speakingFinished)
{
}
-
+
PlatformSpeechSynthesizerMock::~PlatformSpeechSynthesizerMock()
{
}
@@ -46,10 +46,10 @@
ASSERT(m_utterance.get());
RefPtr<PlatformSpeechSynthesisUtterance> protect(m_utterance);
m_utterance = nullptr;
-
+
client()->didFinishSpeaking(protect);
}
-
+
void PlatformSpeechSynthesizerMock::initializeVoiceList()
{
m_voiceList.append(PlatformSpeechSynthesisVoice::create(String("mock.voice.bruce"), String("bruce"), String("en-US"), true, true));
@@ -57,25 +57,25 @@
m_voiceList.append(PlatformSpeechSynthesisVoice::create(String("mock.voice.logan"), String("logan"), String("fr-CA"), true, true));
}
-void PlatformSpeechSynthesizerMock::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+void PlatformSpeechSynthesizerMock::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
{
ASSERT(!m_utterance);
- m_utterance = utterance;
+ m_utterance = WTFMove(utterance);
client()->didStartSpeaking(m_utterance);
-
+
// Fire a fake word and then sentence boundary event.
client()->boundaryEventOccurred(m_utterance, SpeechWordBoundary, 0);
client()->boundaryEventOccurred(m_utterance, SpeechSentenceBoundary, m_utterance->text().length());
-
+
// Give the fake speech job some time so that pause and other functions have time to be called.
m_speakingFinishedTimer.startOneShot(.1);
}
-
+
void PlatformSpeechSynthesizerMock::cancel()
{
if (!m_utterance)
return;
-
+
m_speakingFinishedTimer.stop();
client()->speakingErrorOccurred(m_utterance);
m_utterance = nullptr;
Modified: trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h (203108 => 203109)
--- 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)
@@ -32,25 +32,25 @@
#include "Timer.h"
namespace WebCore {
-
+
class PlatformSpeechSynthesizerMock : public PlatformSpeechSynthesizer {
public:
explicit PlatformSpeechSynthesizerMock(PlatformSpeechSynthesizerClient*);
virtual ~PlatformSpeechSynthesizerMock();
- virtual void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>);
+ virtual void speak(RefPtr<PlatformSpeechSynthesisUtterance>&&);
virtual void pause();
virtual void resume();
virtual void cancel();
-
+
private:
virtual void initializeVoiceList();
void speakingFinished();
-
+
Timer m_speakingFinishedTimer;
RefPtr<PlatformSpeechSynthesisUtterance> m_utterance;
};
-
+
} // namespace WebCore
#endif // ENABLE(SPEECH_SYNTHESIS)
Modified: trunk/Source/WebKit/mac/ChangeLog (203108 => 203109)
--- 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)
@@ -1,3 +1,16 @@
+2016-07-11 Gyuyoung Kim <[email protected]>
+
+ 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):
+
2016-07-11 Enrica Casucci <[email protected]>
Add synthetic click origin to WKNavigationAction.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (203108 => 203109)
--- 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)
@@ -91,7 +91,7 @@
long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
long copy(const String& fromPasteboard, const String& toPasteboard) override;
- long setBufferForType(PassRefPtr<WebCore::SharedBuffer>, const String& pasteboardType, const String& pasteboardName) override;
+ long setBufferForType(WebCore::SharedBuffer*, const String& pasteboardType, const String& pasteboardName) override;
long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) override;
long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
};
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (203108 => 203109)
--- 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)
@@ -216,7 +216,7 @@
return PlatformPasteboard(pasteboardName).setTypes(pasteboardTypes);
}
-long WebPlatformStrategies::setBufferForType(PassRefPtr<SharedBuffer> buffer, const String& pasteboardType, const String& pasteboardName)
+long WebPlatformStrategies::setBufferForType(SharedBuffer* buffer, const String& pasteboardType, const String& pasteboardName)
{
return PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
}
Modified: trunk/Source/WebKit2/ChangeLog (203108 => 203109)
--- 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)
@@ -1,3 +1,19 @@
+2016-07-11 Gyuyoung Kim <[email protected]>
+
+ 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:
+
2016-07-11 Chris Dumez <[email protected]>
[WK2][iOS] Intermittent crash in [UIApplication beginBackgroundTaskWithName] expiration handler
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (203108 => 203109)
--- 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)
@@ -116,7 +116,7 @@
}
RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
- newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
+ newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer.get(), pasteboardType);
}
#if PLATFORM(IOS)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (203108 => 203109)
--- 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)
@@ -452,7 +452,7 @@
return newChangeCount;
}
-long WebPlatformStrategies::setBufferForType(PassRefPtr<SharedBuffer> buffer, const String& pasteboardType, const String& pasteboardName)
+long WebPlatformStrategies::setBufferForType(SharedBuffer* buffer, const String& pasteboardType, const String& pasteboardName)
{
SharedMemory::Handle handle;
if (buffer) {
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (203108 => 203109)
--- 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)
@@ -98,7 +98,7 @@
long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
long copy(const String& fromPasteboard, const String& toPasteboard) override;
- long setBufferForType(PassRefPtr<WebCore::SharedBuffer>, const String& pasteboardType, const String& pasteboardName) override;
+ long setBufferForType(WebCore::SharedBuffer*, const String& pasteboardType, const String& pasteboardName) override;
long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) override;
long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
#endif
