Chromium Code Reviews| Index: Source/core/css/MediaValuesCached.cpp |
| diff --git a/Source/core/css/MediaValuesCached.cpp b/Source/core/css/MediaValuesCached.cpp |
| index b13634f5b9a2b383f79291f15bf1509704883994..05751cbfbdd28198b451cb62a44484c6a69e2a76 100644 |
| --- a/Source/core/css/MediaValuesCached.cpp |
| +++ b/Source/core/css/MediaValuesCached.cpp |
| @@ -12,29 +12,29 @@ |
| namespace blink { |
| -PassRefPtr<MediaValues> MediaValuesCached::create() |
| +PassRefPtrWillBeRawPtr<MediaValues> MediaValuesCached::create() |
| { |
| - return adoptRef(new MediaValuesCached()); |
| + return adoptRefWillBeNoop(new MediaValuesCached()); |
| } |
| -PassRefPtr<MediaValues> MediaValuesCached::create(MediaValuesCachedData& data) |
| +PassRefPtrWillBeRawPtr<MediaValues> MediaValuesCached::create(MediaValuesCachedData& data) |
| { |
| - return adoptRef(new MediaValuesCached(data)); |
| + return adoptRefWillBeNoop(new MediaValuesCached(data)); |
| } |
| -PassRefPtr<MediaValues> MediaValuesCached::create(Document& document) |
| +PassRefPtrWillBeRawPtr<MediaValues> MediaValuesCached::create(Document& document) |
| { |
| return MediaValuesCached::create(frameFrom(document)); |
| } |
| -PassRefPtr<MediaValues> MediaValuesCached::create(LocalFrame* frame) |
| +PassRefPtrWillBeRawPtr<MediaValues> MediaValuesCached::create(LocalFrame* frame) |
| { |
| // FIXME - Added an assert here so we can better understand when a frame is present without its view(). |
| ASSERT(!frame || frame->view()); |
| if (!frame || !frame->view()) |
| - return adoptRef(new MediaValuesCached()); |
| + return adoptRefWillBeNoop(new MediaValuesCached()); |
| ASSERT(frame->document() && frame->document()->layoutView()); |
| - return adoptRef(new MediaValuesCached(frame)); |
| + return adoptRefWillBeNoop(new MediaValuesCached(frame)); |
| } |
| MediaValuesCached::MediaValuesCached() |
| @@ -72,9 +72,9 @@ MediaValuesCached::MediaValuesCached(const MediaValuesCachedData& data) |
| { |
| } |
| -PassRefPtr<MediaValues> MediaValuesCached::copy() const |
| +PassRefPtrWillBeRawPtr<MediaValues> MediaValuesCached::copy() const |
| { |
| - return adoptRef(new MediaValuesCached(m_data)); |
| + return adoptRefWillBeNoop(new MediaValuesCached(m_data)); |
| } |
| bool MediaValuesCached::computeLength(double value, CSSPrimitiveValue::UnitType type, int& result) const |
| @@ -89,7 +89,11 @@ bool MediaValuesCached::computeLength(double value, CSSPrimitiveValue::UnitType |
| bool MediaValuesCached::isSafeToSendToAnotherThread() const |
| { |
| +#if ENABLE(OILPAN) |
| + return true; |
|
haraken
2015/08/06 08:54:34
Worth having a comment on why it is always safe to
keishi
2015/08/10 06:50:46
Done. Could you take a look and see if this is cor
|
| +#else |
| return hasOneRef(); |
| +#endif |
| } |
| int MediaValuesCached::viewportWidth() const |