Diff
Modified: trunk/Source/WebCore/ChangeLog (200788 => 200789)
--- trunk/Source/WebCore/ChangeLog 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/ChangeLog 2016-05-12 21:13:13 UTC (rev 200789)
@@ -1,3 +1,85 @@
+2016-05-12 Chris Dumez <[email protected]>
+
+ Drop toJS() overload taking a PassRefPtr<> parameter
+ https://bugs.webkit.org/show_bug.cgi?id=157627
+
+ Reviewed by Alex Christensen.
+
+ Update our implementation stop stop returning PassRefPtrs to the
+ JS bindings and drop the toJS() overload taking a PassRefPtr<>
+ parameter
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::buffered):
+ * Modules/mediasource/SourceBuffer.h:
+ * Modules/webaudio/AudioBuffer.cpp:
+ (WebCore::AudioBuffer::getChannelData):
+ * Modules/webaudio/AudioBuffer.h:
+ * animation/DocumentTimeline.cpp:
+ (WebCore::DocumentTimeline::create):
+ * animation/DocumentTimeline.h:
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::toJS): Deleted.
+ (WebCore::toJSNewlyCreated): Deleted.
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::getRGBColorValue):
+ * css/CSSPrimitiveValue.h:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::error):
+ * html/HTMLMediaElement.h:
+ * html/LabelableElement.cpp:
+ (WebCore::LabelableElement::labels):
+ * html/LabelableElement.h:
+ * html/canvas/WebGLGetInfo.cpp:
+ (WebCore::WebGLGetInfo::getWebGLBuffer):
+ (WebCore::WebGLGetInfo::getWebGLFloatArray):
+ (WebCore::WebGLGetInfo::getWebGLFramebuffer):
+ (WebCore::WebGLGetInfo::getWebGLIntArray):
+ (WebCore::WebGLGetInfo::getWebGLProgram):
+ (WebCore::WebGLGetInfo::getWebGLRenderbuffer):
+ (WebCore::WebGLGetInfo::getWebGLTexture):
+ (WebCore::WebGLGetInfo::getWebGLUnsignedByteArray):
+ (WebCore::WebGLGetInfo::getWebGLUnsignedIntArray):
+ (WebCore::WebGLGetInfo::getWebGLVertexArrayObjectOES):
+ (WebCore::WebGLGetInfo::getWebGLVertexArrayObject):
+ * html/canvas/WebGLGetInfo.h:
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::paintRenderingResultsToImageData):
+ (WebCore::WebGLRenderingContextBase::createBuffer):
+ (WebCore::WebGLRenderingContextBase::createFramebuffer):
+ (WebCore::WebGLRenderingContextBase::createTexture):
+ (WebCore::WebGLRenderingContextBase::createProgram):
+ (WebCore::WebGLRenderingContextBase::createRenderbuffer):
+ (WebCore::WebGLRenderingContextBase::createShader):
+ (WebCore::WebGLRenderingContextBase::getActiveAttrib):
+ (WebCore::WebGLRenderingContextBase::getActiveUniform):
+ (WebCore::WebGLRenderingContextBase::getShaderPrecisionFormat):
+ (WebCore::WebGLRenderingContextBase::getUniformLocation):
+ (WebCore::WebGLRenderingContextBase::drawImageIntoBuffer):
+ (WebCore::WebGLRenderingContextBase::videoFrameToImage):
+ * html/canvas/WebGLRenderingContextBase.h:
+ * html/track/TextTrackCue.cpp:
+ (WebCore::TextTrackCue::create):
+ * html/track/TextTrackCue.h:
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCueBox::create):
+ * html/track/VTTCue.h:
+ * page/DOMSelection.cpp:
+ (WebCore::DOMSelection::getRangeAt):
+ * page/DOMSelection.h:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::matchMedia):
+ (WebCore::DOMWindow::styleMedia):
+ (WebCore::DOMWindow::getComputedStyle):
+ (WebCore::DOMWindow::getMatchedCSSRules):
+ (WebCore::DOMWindow::webkitConvertPointFromNodeToPage):
+ (WebCore::DOMWindow::webkitConvertPointFromPageToNode):
+ (WebCore::DOMWindow::open):
+ * page/DOMWindow.h:
+ * page/Location.cpp:
+ (WebCore::Location::ancestorOrigins):
+ * page/Location.h:
+
2016-05-12 Ryosuke Niwa <[email protected]>
Touch.prototype is undefined on iOS
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (200788 => 200789)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -130,7 +130,7 @@
m_private->setClient(nullptr);
}
-PassRefPtr<TimeRanges> SourceBuffer::buffered(ExceptionCode& ec) const
+RefPtr<TimeRanges> SourceBuffer::buffered(ExceptionCode& ec) const
{
// Section 3.1 buffered attribute steps.
// https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#attributes-1
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h (200788 => 200789)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -66,7 +66,7 @@
// SourceBuffer.idl methods
bool updating() const { return m_updating; }
- PassRefPtr<TimeRanges> buffered(ExceptionCode&) const;
+ RefPtr<TimeRanges> buffered(ExceptionCode&) const;
const RefPtr<TimeRanges>& buffered() const;
double timestampOffset() const;
void setTimestampOffset(double, ExceptionCode&);
Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp (200788 => 200789)
--- trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -53,14 +53,14 @@
return result;
}
-const PassRefPtr<RTCStatsReport> RTCStatsReport::local()
+RTCStatsReport& RTCStatsReport::local()
{
- return this;
+ return *this;
}
-const PassRefPtr<RTCStatsReport> RTCStatsReport::remote()
+RTCStatsReport& RTCStatsReport::remote()
{
- return this;
+ return *this;
}
void RTCStatsReport::addStatistic(const String& name, const String& value)
Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.h (200788 => 200789)
--- trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -45,9 +45,9 @@
Vector<String> names() const;
// DEPRECATED
- const PassRefPtr<RTCStatsReport> local();
+ RTCStatsReport& local();
// DEPRECATED
- const PassRefPtr<RTCStatsReport> remote();
+ RTCStatsReport& remote();
void addStatistic(const String& name, const String& value);
Modified: trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp (200788 => 200789)
--- trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -95,7 +95,7 @@
m_channels.clear();
}
-PassRefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, ExceptionCode& ec)
+RefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, ExceptionCode& ec)
{
if (channelIndex >= m_channels.size()) {
ec = SYNTAX_ERR;
Modified: trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h (200788 => 200789)
--- trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -55,7 +55,7 @@
// Channel data access
unsigned numberOfChannels() const { return m_channels.size(); }
- PassRefPtr<Float32Array> getChannelData(unsigned channelIndex, ExceptionCode&);
+ RefPtr<Float32Array> getChannelData(unsigned channelIndex, ExceptionCode&);
Float32Array* getChannelData(unsigned channelIndex);
void zero();
Modified: trunk/Source/WebCore/animation/DocumentTimeline.cpp (200788 => 200789)
--- trunk/Source/WebCore/animation/DocumentTimeline.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/animation/DocumentTimeline.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -33,9 +33,9 @@
namespace WebCore {
-PassRefPtr<DocumentTimeline> DocumentTimeline::create(double originTime)
+Ref<DocumentTimeline> DocumentTimeline::create(double originTime)
{
- return adoptRef(new DocumentTimeline(originTime));
+ return adoptRef(*new DocumentTimeline(originTime));
}
DocumentTimeline::DocumentTimeline(double originTime)
Modified: trunk/Source/WebCore/animation/DocumentTimeline.h (200788 => 200789)
--- trunk/Source/WebCore/animation/DocumentTimeline.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/animation/DocumentTimeline.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -37,7 +37,7 @@
class DocumentTimeline final : public AnimationTimeline {
public:
- static PassRefPtr<DocumentTimeline> create(double);
+ static Ref<DocumentTimeline> create(double);
~DocumentTimeline();
protected:
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (200788 => 200789)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -252,10 +252,8 @@
JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSC::ArrayBufferView*);
JSC::JSValue toJS(JSC::ExecState*, JSC::JSGlobalObject*, JSC::ArrayBufferView*);
template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const RefPtr<T>&);
-template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const PassRefPtr<T>&);
template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Ref<T>&);
template<typename T> JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, const RefPtr<T>&);
-template<typename T> JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, const PassRefPtr<T>&);
template<typename T> JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, const Ref<T>&);
template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Vector<T>&);
template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Vector<RefPtr<T>>&);
@@ -549,11 +547,6 @@
return toJS(exec, globalObject, ptr.get());
}
-template<typename T> inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const PassRefPtr<T>& ptr)
-{
- return toJS(exec, globalObject, ptr.get());
-}
-
template<typename T> inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Ref<T>& ptr)
{
return toJS(exec, globalObject, const_cast<T&>(ptr.get()));
@@ -564,11 +557,6 @@
return toJSNewlyCreated(exec, globalObject, ptr.get());
}
-template<typename T> inline JSC::JSValue toJSNewlyCreated(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const PassRefPtr<T>& ptr)
-{
- return toJSNewlyCreated(exec, globalObject, ptr.get());
-}
-
template<typename T> inline JSC::JSValue toJSNewlyCreated(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Ref<T>& ptr)
{
return toJSNewlyCreated(exec, globalObject, const_cast<T&>(ptr.get()));
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (200788 => 200789)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -940,12 +940,11 @@
}
#endif
-PassRefPtr<RGBColor> CSSPrimitiveValue::getRGBColorValue(ExceptionCode& ec) const
+RefPtr<RGBColor> CSSPrimitiveValue::getRGBColorValue(ExceptionCode& ec) const
{
- ec = 0;
if (m_primitiveUnitType != CSS_RGBCOLOR) {
ec = INVALID_ACCESS_ERR;
- return 0;
+ return nullptr;
}
// FIMXE: This should not return a new object for each invocation.
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (200788 => 200789)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -347,7 +347,7 @@
LengthRepeat* getLengthRepeatValue() const { return m_primitiveUnitType != CSS_LENGTH_REPEAT ? 0 : m_value.lengthRepeat; }
#endif
- PassRefPtr<RGBColor> getRGBColorValue(ExceptionCode&) const;
+ RefPtr<RGBColor> getRGBColorValue(ExceptionCode&) const;
RGBA32 getRGBA32Value() const { return m_primitiveUnitType != CSS_RGBCOLOR ? 0 : m_value.rgbcolor; }
Pair* getPairValue(ExceptionCode&) const;
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (200788 => 200789)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -967,9 +967,9 @@
mediaEngineWasUpdated();
}
-PassRefPtr<MediaError> HTMLMediaElement::error() const
+MediaError* HTMLMediaElement::error() const
{
- return m_error;
+ return m_error.get();
}
void HTMLMediaElement::setSrc(const String& url)
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (200788 => 200789)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -157,7 +157,7 @@
// DOM API
// error state
- PassRefPtr<MediaError> error() const;
+ MediaError* error() const;
void setSrc(const String&);
const URL& currentSrc() const { return m_currentSrc; }
Modified: trunk/Source/WebCore/html/LabelableElement.cpp (200788 => 200789)
--- trunk/Source/WebCore/html/LabelableElement.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/LabelableElement.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -40,10 +40,10 @@
{
}
-PassRefPtr<NodeList> LabelableElement::labels()
+RefPtr<NodeList> LabelableElement::labels()
{
if (!supportLabels())
- return 0;
+ return nullptr;
return ensureRareData().ensureNodeLists().addCacheWithAtomicName<LabelsNodeList>(*this, starAtom);
}
Modified: trunk/Source/WebCore/html/LabelableElement.h (200788 => 200789)
--- trunk/Source/WebCore/html/LabelableElement.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/LabelableElement.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -40,7 +40,7 @@
public:
virtual ~LabelableElement();
- PassRefPtr<NodeList> labels();
+ RefPtr<NodeList> labels();
virtual bool supportLabels() const { return false; }
protected:
Modified: trunk/Source/WebCore/html/canvas/WebGLGetInfo.cpp (200788 => 200789)
--- trunk/Source/WebCore/html/canvas/WebGLGetInfo.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/canvas/WebGLGetInfo.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -298,71 +298,71 @@
return m_int64;
}
-PassRefPtr<WebGLBuffer> WebGLGetInfo::getWebGLBuffer() const
+WebGLBuffer* WebGLGetInfo::getWebGLBuffer() const
{
ASSERT(getType() == kTypeWebGLBuffer);
- return m_webglBuffer;
+ return m_webglBuffer.get();
}
-PassRefPtr<Float32Array> WebGLGetInfo::getWebGLFloatArray() const
+Float32Array* WebGLGetInfo::getWebGLFloatArray() const
{
ASSERT(getType() == kTypeWebGLFloatArray);
- return m_webglFloatArray;
+ return m_webglFloatArray.get();
}
-PassRefPtr<WebGLFramebuffer> WebGLGetInfo::getWebGLFramebuffer() const
+WebGLFramebuffer* WebGLGetInfo::getWebGLFramebuffer() const
{
ASSERT(getType() == kTypeWebGLFramebuffer);
- return m_webglFramebuffer;
+ return m_webglFramebuffer.get();
}
-PassRefPtr<Int32Array> WebGLGetInfo::getWebGLIntArray() const
+Int32Array* WebGLGetInfo::getWebGLIntArray() const
{
ASSERT(getType() == kTypeWebGLIntArray);
- return m_webglIntArray;
+ return m_webglIntArray.get();
}
-PassRefPtr<WebGLProgram> WebGLGetInfo::getWebGLProgram() const
+WebGLProgram* WebGLGetInfo::getWebGLProgram() const
{
ASSERT(getType() == kTypeWebGLProgram);
- return m_webglProgram;
+ return m_webglProgram.get();
}
-PassRefPtr<WebGLRenderbuffer> WebGLGetInfo::getWebGLRenderbuffer() const
+WebGLRenderbuffer* WebGLGetInfo::getWebGLRenderbuffer() const
{
ASSERT(getType() == kTypeWebGLRenderbuffer);
- return m_webglRenderbuffer;
+ return m_webglRenderbuffer.get();
}
-PassRefPtr<WebGLTexture> WebGLGetInfo::getWebGLTexture() const
+WebGLTexture* WebGLGetInfo::getWebGLTexture() const
{
ASSERT(getType() == kTypeWebGLTexture);
- return m_webglTexture;
+ return m_webglTexture.get();
}
-PassRefPtr<Uint8Array> WebGLGetInfo::getWebGLUnsignedByteArray() const
+Uint8Array* WebGLGetInfo::getWebGLUnsignedByteArray() const
{
ASSERT(getType() == kTypeWebGLUnsignedByteArray);
- return m_webglUnsignedByteArray;
+ return m_webglUnsignedByteArray.get();
}
-PassRefPtr<Uint32Array> WebGLGetInfo::getWebGLUnsignedIntArray() const
+Uint32Array* WebGLGetInfo::getWebGLUnsignedIntArray() const
{
ASSERT(getType() == kTypeWebGLUnsignedIntArray);
- return m_webglUnsignedIntArray;
+ return m_webglUnsignedIntArray.get();
}
-PassRefPtr<WebGLVertexArrayObjectOES> WebGLGetInfo::getWebGLVertexArrayObjectOES() const
+WebGLVertexArrayObjectOES* WebGLGetInfo::getWebGLVertexArrayObjectOES() const
{
ASSERT(getType() == kTypeWebGLVertexArrayObjectOES);
- return m_webglVertexArrayObjectOES;
+ return m_webglVertexArrayObjectOES.get();
}
#if ENABLE(WEBGL2)
-PassRefPtr<WebGLVertexArrayObject> WebGLGetInfo::getWebGLVertexArrayObject() const
+WebGLVertexArrayObject* WebGLGetInfo::getWebGLVertexArrayObject() const
{
ASSERT(getType() == kTypeWebGLVertexArrayObject);
- return m_webglVertexArrayObject;
+ return m_webglVertexArrayObject.get();
}
#endif
Modified: trunk/Source/WebCore/html/canvas/WebGLGetInfo.h (200788 => 200789)
--- trunk/Source/WebCore/html/canvas/WebGLGetInfo.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/canvas/WebGLGetInfo.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -112,20 +112,20 @@
const String& getString() const;
unsigned int getUnsignedInt() const;
long long getInt64() const;
- PassRefPtr<WebGLBuffer> getWebGLBuffer() const;
- PassRefPtr<Float32Array> getWebGLFloatArray() const;
- PassRefPtr<WebGLFramebuffer> getWebGLFramebuffer() const;
- PassRefPtr<Int32Array> getWebGLIntArray() const;
+ WebGLBuffer* getWebGLBuffer() const;
+ Float32Array* getWebGLFloatArray() const;
+ WebGLFramebuffer* getWebGLFramebuffer() const;
+ Int32Array* getWebGLIntArray() const;
// FIXME: implement WebGLObjectArray
- // PassRefPtr<WebGLObjectArray> getWebGLObjectArray() const;
- PassRefPtr<WebGLProgram> getWebGLProgram() const;
- PassRefPtr<WebGLRenderbuffer> getWebGLRenderbuffer() const;
- PassRefPtr<WebGLTexture> getWebGLTexture() const;
- PassRefPtr<Uint8Array> getWebGLUnsignedByteArray() const;
- PassRefPtr<Uint32Array> getWebGLUnsignedIntArray() const;
- PassRefPtr<WebGLVertexArrayObjectOES> getWebGLVertexArrayObjectOES() const;
+ // WebGLObjectArray* getWebGLObjectArray() const;
+ WebGLProgram* getWebGLProgram() const;
+ WebGLRenderbuffer* getWebGLRenderbuffer() const;
+ WebGLTexture* getWebGLTexture() const;
+ Uint8Array* getWebGLUnsignedByteArray() const;
+ Uint32Array* getWebGLUnsignedIntArray() const;
+ WebGLVertexArrayObjectOES* getWebGLVertexArrayObjectOES() const;
#if ENABLE(WEBGL2)
- PassRefPtr<WebGLVertexArrayObject> getWebGLVertexArrayObject() const;
+ WebGLVertexArrayObject* getWebGLVertexArrayObject() const;
#endif
private:
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (200788 => 200789)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -752,7 +752,7 @@
m_context->paintRenderingResultsToCanvas(canvas()->buffer());
}
-PassRefPtr<ImageData> WebGLRenderingContextBase::paintRenderingResultsToImageData()
+RefPtr<ImageData> WebGLRenderingContextBase::paintRenderingResultsToImageData()
{
if (isContextLostOrPending())
return nullptr;
@@ -1386,52 +1386,52 @@
}
}
-PassRefPtr<WebGLBuffer> WebGLRenderingContextBase::createBuffer()
+RefPtr<WebGLBuffer> WebGLRenderingContextBase::createBuffer()
{
if (isContextLostOrPending())
return nullptr;
- RefPtr<WebGLBuffer> o = WebGLBuffer::create(this);
- addSharedObject(o.get());
- return o;
+ auto buffer = WebGLBuffer::create(this);
+ addSharedObject(buffer.ptr());
+ return WTFMove(buffer);
}
-PassRefPtr<WebGLFramebuffer> WebGLRenderingContextBase::createFramebuffer()
+RefPtr<WebGLFramebuffer> WebGLRenderingContextBase::createFramebuffer()
{
if (isContextLostOrPending())
return nullptr;
- RefPtr<WebGLFramebuffer> o = WebGLFramebuffer::create(this);
- addContextObject(o.get());
- return o;
+ auto buffer = WebGLFramebuffer::create(this);
+ addContextObject(buffer.ptr());
+ return WTFMove(buffer);
}
-PassRefPtr<WebGLTexture> WebGLRenderingContextBase::createTexture()
+RefPtr<WebGLTexture> WebGLRenderingContextBase::createTexture()
{
if (isContextLostOrPending())
return nullptr;
- RefPtr<WebGLTexture> o = WebGLTexture::create(this);
- addSharedObject(o.get());
- return o;
+ auto texture = WebGLTexture::create(this);
+ addSharedObject(texture.ptr());
+ return WTFMove(texture);
}
-PassRefPtr<WebGLProgram> WebGLRenderingContextBase::createProgram()
+RefPtr<WebGLProgram> WebGLRenderingContextBase::createProgram()
{
if (isContextLostOrPending())
return nullptr;
- RefPtr<WebGLProgram> o = WebGLProgram::create(this);
- addSharedObject(o.get());
- return o;
+ auto program = WebGLProgram::create(this);
+ addSharedObject(program.ptr());
+ return WTFMove(program);
}
-PassRefPtr<WebGLRenderbuffer> WebGLRenderingContextBase::createRenderbuffer()
+RefPtr<WebGLRenderbuffer> WebGLRenderingContextBase::createRenderbuffer()
{
if (isContextLostOrPending())
return nullptr;
- RefPtr<WebGLRenderbuffer> o = WebGLRenderbuffer::create(this);
- addSharedObject(o.get());
- return o;
+ auto buffer = WebGLRenderbuffer::create(this);
+ addSharedObject(buffer.ptr());
+ return WTFMove(buffer);
}
-PassRefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type, ExceptionCode&)
+RefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type, ExceptionCode&)
{
if (isContextLostOrPending())
return nullptr;
@@ -1440,9 +1440,9 @@
return nullptr;
}
- RefPtr<WebGLShader> o = WebGLShader::create(this, type);
- addSharedObject(o.get());
- return o;
+ auto shader = WebGLShader::create(this, type);
+ addSharedObject(shader.ptr());
+ return WTFMove(shader);
}
void WebGLRenderingContextBase::cullFace(GC3Denum mode)
@@ -2116,7 +2116,7 @@
tex->generateMipmapLevelInfo();
}
-PassRefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index, ExceptionCode&)
+RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index, ExceptionCode&)
{
if (isContextLostOrPending() || !validateWebGLObject("getActiveAttrib", program))
return nullptr;
@@ -2129,10 +2129,10 @@
return WebGLActiveInfo::create(info.name, info.type, info.size);
}
-PassRefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index, ExceptionCode&)
+RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index, ExceptionCode&)
{
if (isContextLostOrPending() || !validateWebGLObject("getActiveUniform", program))
- return 0;
+ return nullptr;
ActiveInfo info;
if (!m_context->getActiveUniform(objectOrZero(program), index, info))
return nullptr;
@@ -2352,7 +2352,7 @@
return ensureNotNull(m_context->getShaderInfoLog(objectOrZero(shader)));
}
-PassRefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&)
+RefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&)
{
if (isContextLostOrPending())
return nullptr;
@@ -2545,7 +2545,7 @@
return WebGLGetInfo();
}
-PassRefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name, ExceptionCode&)
+RefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name, ExceptionCode&)
{
if (isContextLostOrPending() || !validateWebGLObject("getUniformLocation", program))
return nullptr;
@@ -3152,7 +3152,7 @@
m_context->pixelStorei(GraphicsContext3D::UNPACK_ALIGNMENT, m_unpackAlignment);
}
-PassRefPtr<Image> WebGLRenderingContextBase::drawImageIntoBuffer(Image& image, int width, int height, int deviceScaleFactor)
+RefPtr<Image> WebGLRenderingContextBase::drawImageIntoBuffer(Image& image, int width, int height, int deviceScaleFactor)
{
IntSize size(width, height);
size.scale(deviceScaleFactor);
@@ -3220,7 +3220,7 @@
}
#if ENABLE(VIDEO)
-PassRefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy, ExceptionCode&)
+RefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy, ExceptionCode&)
{
IntSize size(video->videoWidth(), video->videoHeight());
ImageBuffer* buf = m_generatedImageCache.imageBuffer(size);
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (200788 => 200789)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -158,12 +158,12 @@
virtual void copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border) = 0;
void copyTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
- PassRefPtr<WebGLBuffer> createBuffer();
- PassRefPtr<WebGLFramebuffer> createFramebuffer();
- PassRefPtr<WebGLProgram> createProgram();
- PassRefPtr<WebGLRenderbuffer> createRenderbuffer();
- PassRefPtr<WebGLShader> createShader(GC3Denum type, ExceptionCode&);
- PassRefPtr<WebGLTexture> createTexture();
+ RefPtr<WebGLBuffer> createBuffer();
+ RefPtr<WebGLFramebuffer> createFramebuffer();
+ RefPtr<WebGLProgram> createProgram();
+ RefPtr<WebGLRenderbuffer> createRenderbuffer();
+ RefPtr<WebGLShader> createShader(GC3Denum type, ExceptionCode&);
+ RefPtr<WebGLTexture> createTexture();
void cullFace(GC3Denum mode);
@@ -192,8 +192,8 @@
void frontFace(GC3Denum mode);
void generateMipmap(GC3Denum target);
- PassRefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index, ExceptionCode&);
- PassRefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index, ExceptionCode&);
+ RefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index, ExceptionCode&);
+ RefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index, ExceptionCode&);
bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader>>&, ExceptionCode&);
GC3Dint getAttribLocation(WebGLProgram*, const String& name);
WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&);
@@ -207,12 +207,12 @@
WebGLGetInfo getRenderbufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&);
WebGLGetInfo getShaderParameter(WebGLShader*, GC3Denum pname, ExceptionCode&);
String getShaderInfoLog(WebGLShader*, ExceptionCode&);
- PassRefPtr<WebGLShaderPrecisionFormat> getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&);
+ RefPtr<WebGLShaderPrecisionFormat> getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&);
String getShaderSource(WebGLShader*, ExceptionCode&);
virtual Vector<String> getSupportedExtensions() = 0;
WebGLGetInfo getTexParameter(GC3Denum target, GC3Denum pname, ExceptionCode&);
WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation*, ExceptionCode&);
- PassRefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&, ExceptionCode&);
+ RefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&, ExceptionCode&);
WebGLGetInfo getVertexAttrib(GC3Duint index, GC3Denum pname, ExceptionCode&);
long long getVertexAttribOffset(GC3Duint index, GC3Denum pname);
@@ -346,7 +346,7 @@
void markLayerComposited();
void paintRenderingResultsToCanvas() override;
- PassRefPtr<ImageData> paintRenderingResultsToImageData();
+ RefPtr<ImageData> paintRenderingResultsToImageData();
void removeSharedObject(WebGLSharedObject*);
void removeContextObject(WebGLContextObject*);
@@ -426,10 +426,10 @@
// Adds a compressed texture format.
void addCompressedTextureFormat(GC3Denum);
- PassRefPtr<Image> drawImageIntoBuffer(Image&, int width, int height, int deviceScaleFactor);
+ RefPtr<Image> drawImageIntoBuffer(Image&, int width, int height, int deviceScaleFactor);
#if ENABLE(VIDEO)
- PassRefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy, ExceptionCode&);
+ RefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy, ExceptionCode&);
#endif
WebGLTexture::TextureExtensionFlag textureExtensionFlags() const;
Modified: trunk/Source/WebCore/html/track/TextTrackCue.cpp (200788 => 200789)
--- trunk/Source/WebCore/html/track/TextTrackCue.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/track/TextTrackCue.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -55,12 +55,12 @@
static const int invalidCueIndex = -1;
-PassRefPtr<TextTrackCue> TextTrackCue::create(ScriptExecutionContext& context, double start, double end, const String& content)
+Ref<TextTrackCue> TextTrackCue::create(ScriptExecutionContext& context, double start, double end, const String& content)
{
return create(context, MediaTime::createWithDouble(start), MediaTime::createWithDouble(end), content);
}
-PassRefPtr<TextTrackCue> TextTrackCue::create(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, const String& content)
+Ref<TextTrackCue> TextTrackCue::create(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, const String& content)
{
return VTTCue::create(context, start, end, content);
}
Modified: trunk/Source/WebCore/html/track/TextTrackCue.h (200788 => 200789)
--- trunk/Source/WebCore/html/track/TextTrackCue.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/track/TextTrackCue.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -46,8 +46,8 @@
class TextTrackCue : public RefCounted<TextTrackCue>, public EventTargetWithInlineData {
public:
- static PassRefPtr<TextTrackCue> create(ScriptExecutionContext&, double start, double end, const String& content);
- static PassRefPtr<TextTrackCue> create(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, const String& content);
+ static Ref<TextTrackCue> create(ScriptExecutionContext&, double start, double end, const String& content);
+ static Ref<TextTrackCue> create(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, const String& content);
static const AtomicString& cueShadowPseudoId()
{
Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (200788 => 200789)
--- trunk/Source/WebCore/html/track/VTTCue.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -119,10 +119,10 @@
// ----------------------------
-PassRefPtr<VTTCueBox> VTTCueBox::create(Document& document, VTTCue& cue)
+Ref<VTTCueBox> VTTCueBox::create(Document& document, VTTCue& cue)
{
- VTTCueBox* cueBox = new VTTCueBox(document, cue);
- cueBox->setPseudo(VTTCueBox::vttCueBoxShadowPseudoId());
+ VTTCueBox& cueBox = *new VTTCueBox(document, cue);
+ cueBox.setPseudo(VTTCueBox::vttCueBoxShadowPseudoId());
return adoptRef(cueBox);
}
Modified: trunk/Source/WebCore/html/track/VTTCue.h (200788 => 200789)
--- trunk/Source/WebCore/html/track/VTTCue.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/html/track/VTTCue.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -53,7 +53,7 @@
class VTTCueBox : public HTMLElement {
public:
- static PassRefPtr<VTTCueBox> create(Document&, VTTCue&);
+ static Ref<VTTCueBox> create(Document&, VTTCue&);
VTTCue* getCue() const;
virtual void applyCSSProperties(const IntSize& videoSize);
Modified: trunk/Source/WebCore/page/DOMSelection.cpp (200788 => 200789)
--- trunk/Source/WebCore/page/DOMSelection.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/page/DOMSelection.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -344,14 +344,14 @@
m_frame->selection().setExtent(createLegacyEditingPosition(&node, offset), DOWNSTREAM);
}
-PassRefPtr<Range> DOMSelection::getRangeAt(int index, ExceptionCode& ec)
+RefPtr<Range> DOMSelection::getRangeAt(int index, ExceptionCode& ec)
{
if (!m_frame)
- return 0;
+ return nullptr;
if (index < 0 || index >= rangeCount()) {
ec = INDEX_SIZE_ERR;
- return 0;
+ return nullptr;
}
// If you're hitting this, you've added broken multi-range selection support
Modified: trunk/Source/WebCore/page/DOMSelection.h (200788 => 200789)
--- trunk/Source/WebCore/page/DOMSelection.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/page/DOMSelection.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -80,7 +80,7 @@
void collapseToEnd(ExceptionCode&);
void collapseToStart(ExceptionCode&);
void extend(Node&, int offset, ExceptionCode&);
- PassRefPtr<Range> getRangeAt(int, ExceptionCode&);
+ RefPtr<Range> getRangeAt(int, ExceptionCode&);
void removeAllRanges();
void addRange(Range*);
void deleteFromDocument();
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (200788 => 200789)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -463,9 +463,9 @@
return this;
}
-PassRefPtr<MediaQueryList> DOMWindow::matchMedia(const String& media)
+RefPtr<MediaQueryList> DOMWindow::matchMedia(const String& media)
{
- return document() ? document()->mediaQueryMatcher().matchMedia(media) : 0;
+ return document() ? document()->mediaQueryMatcher().matchMedia(media) : nullptr;
}
Page* DOMWindow::page()
@@ -1405,16 +1405,16 @@
return downcast<Document>(context);
}
-PassRefPtr<StyleMedia> DOMWindow::styleMedia() const
+RefPtr<StyleMedia> DOMWindow::styleMedia() const
{
if (!isCurrentlyDisplayedInFrame())
return nullptr;
if (!m_media)
m_media = StyleMedia::create(m_frame);
- return m_media.get();
+ return m_media;
}
-PassRefPtr<CSSStyleDeclaration> DOMWindow::getComputedStyle(Element* element, const String& pseudoElt) const
+RefPtr<CSSStyleDeclaration> DOMWindow::getComputedStyle(Element* element, const String& pseudoElt) const
{
if (!element)
return nullptr;
@@ -1422,15 +1422,15 @@
return CSSComputedStyleDeclaration::create(element, false, pseudoElt);
}
-PassRefPtr<CSSRuleList> DOMWindow::getMatchedCSSRules(Element* element, const String& pseudoElement, bool authorOnly) const
+RefPtr<CSSRuleList> DOMWindow::getMatchedCSSRules(Element* element, const String& pseudoElement, bool authorOnly) const
{
if (!isCurrentlyDisplayedInFrame())
- return 0;
+ return nullptr;
unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0;
CSSSelector::PseudoElementType pseudoType = CSSSelector::parsePseudoElementType(pseudoElement.substringSharingImpl(colonStart));
if (pseudoType == CSSSelector::PseudoElementUnknown && !pseudoElement.isEmpty())
- return 0;
+ return nullptr;
unsigned rulesToInclude = StyleResolver::AuthorCSSRules;
if (!authorOnly)
@@ -1442,22 +1442,22 @@
auto matchedRules = m_frame->document()->ensureStyleResolver().pseudoStyleRulesForElement(element, pseudoId, rulesToInclude);
if (matchedRules.isEmpty())
- return 0;
+ return nullptr;
RefPtr<StaticCSSRuleList> ruleList = StaticCSSRuleList::create();
for (auto& rule : matchedRules)
ruleList->rules().append(rule->createCSSOMWrapper());
- return ruleList.release();
+ return ruleList;
}
-PassRefPtr<WebKitPoint> DOMWindow::webkitConvertPointFromNodeToPage(Node* node, const WebKitPoint* p) const
+RefPtr<WebKitPoint> DOMWindow::webkitConvertPointFromNodeToPage(Node* node, const WebKitPoint* p) const
{
if (!node || !p)
- return 0;
+ return nullptr;
if (!document())
- return 0;
+ return nullptr;
document()->updateLayoutIgnorePendingStylesheets();
@@ -1466,13 +1466,13 @@
return WebKitPoint::create(pagePoint.x(), pagePoint.y());
}
-PassRefPtr<WebKitPoint> DOMWindow::webkitConvertPointFromPageToNode(Node* node, const WebKitPoint* p) const
+RefPtr<WebKitPoint> DOMWindow::webkitConvertPointFromPageToNode(Node* node, const WebKitPoint* p) const
{
if (!node || !p)
- return 0;
+ return nullptr;
if (!document())
- return 0;
+ return nullptr;
document()->updateLayoutIgnorePendingStylesheets();
@@ -2140,7 +2140,7 @@
return newFrame;
}
-PassRefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
+RefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
DOMWindow& activeWindow, DOMWindow& firstWindow)
{
if (!isCurrentlyDisplayedInFrame())
Modified: trunk/Source/WebCore/page/DOMWindow.h (200788 => 200789)
--- trunk/Source/WebCore/page/DOMWindow.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/page/DOMWindow.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -123,7 +123,7 @@
void suspendForDocumentSuspension();
void resumeFromDocumentSuspension();
- PassRefPtr<MediaQueryList> matchMedia(const String&);
+ RefPtr<MediaQueryList> matchMedia(const String&);
WEBCORE_EXPORT unsigned pendingUnloadEventListeners() const;
@@ -167,7 +167,7 @@
void print();
void stop();
- WEBCORE_EXPORT PassRefPtr<DOMWindow> open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
+ WEBCORE_EXPORT RefPtr<DOMWindow> open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
DOMWindow& activeWindow, DOMWindow& firstWindow);
void showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, std::function<void (DOMWindow&)> prepareDialogFunction);
@@ -223,19 +223,19 @@
// CSSOM View Module
- PassRefPtr<StyleMedia> styleMedia() const;
+ RefPtr<StyleMedia> styleMedia() const;
// DOM Level 2 Style Interface
- PassRefPtr<CSSStyleDeclaration> getComputedStyle(Element*, const String& pseudoElt) const;
+ RefPtr<CSSStyleDeclaration> getComputedStyle(Element*, const String& pseudoElt) const;
// WebKit extensions
- PassRefPtr<CSSRuleList> getMatchedCSSRules(Element*, const String& pseudoElt, bool authorOnly = true) const;
+ RefPtr<CSSRuleList> getMatchedCSSRules(Element*, const String& pseudoElt, bool authorOnly = true) const;
double devicePixelRatio() const;
- PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node*, const WebKitPoint*) const;
- PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node*, const WebKitPoint*) const;
+ RefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node*, const WebKitPoint*) const;
+ RefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node*, const WebKitPoint*) const;
PageConsoleClient* console() const;
Modified: trunk/Source/WebCore/page/Location.cpp (200788 => 200789)
--- trunk/Source/WebCore/page/Location.cpp 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/page/Location.cpp 2016-05-12 21:13:13 UTC (rev 200789)
@@ -124,14 +124,14 @@
return SecurityOrigin::create(url())->toString();
}
-PassRefPtr<DOMStringList> Location::ancestorOrigins() const
+Ref<DOMStringList> Location::ancestorOrigins() const
{
- RefPtr<DOMStringList> origins = DOMStringList::create();
+ auto origins = DOMStringList::create();
if (!m_frame)
- return origins.release();
+ return origins;
for (Frame* frame = m_frame->tree().parent(); frame; frame = frame->tree().parent())
origins->append(frame->document()->securityOrigin()->toString());
- return origins.release();
+ return origins;
}
String Location::hash() const
Modified: trunk/Source/WebCore/page/Location.h (200788 => 200789)
--- trunk/Source/WebCore/page/Location.h 2016-05-12 19:54:51 UTC (rev 200788)
+++ trunk/Source/WebCore/page/Location.h 2016-05-12 21:13:13 UTC (rev 200789)
@@ -73,7 +73,7 @@
String toString() const { return href(); }
- PassRefPtr<DOMStringList> ancestorOrigins() const;
+ Ref<DOMStringList> ancestorOrigins() const;
private:
explicit Location(Frame*);
