| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/css/MediaValuesDynamic.h" | 6 #include "core/css/MediaValuesDynamic.h" |
| 7 | 7 |
| 8 #include "core/css/CSSHelper.h" | 8 #include "core/css/CSSHelper.h" |
| 9 #include "core/css/CSSPrimitiveValue.h" | 9 #include "core/css/CSSPrimitiveValue.h" |
| 10 #include "core/css/CSSToLengthConversionData.h" | 10 #include "core/css/CSSToLengthConversionData.h" |
| 11 #include "core/css/MediaValuesCached.h" | 11 #include "core/css/MediaValuesCached.h" |
| 12 #include "core/dom/Document.h" | 12 #include "core/dom/Document.h" |
| 13 #include "core/frame/LocalFrame.h" | 13 #include "core/frame/LocalFrame.h" |
| 14 | 14 |
| 15 namespace blink { | 15 namespace blink { |
| 16 | 16 |
| 17 PassRefPtr<MediaValues> MediaValuesDynamic::create(Document& document) | 17 PassRefPtrWillBeRawPtr<MediaValues> MediaValuesDynamic::create(Document& documen
t) |
| 18 { | 18 { |
| 19 return MediaValuesDynamic::create(frameFrom(document)); | 19 return MediaValuesDynamic::create(frameFrom(document)); |
| 20 } | 20 } |
| 21 | 21 |
| 22 PassRefPtr<MediaValues> MediaValuesDynamic::create(LocalFrame* frame) | 22 PassRefPtrWillBeRawPtr<MediaValues> MediaValuesDynamic::create(LocalFrame* frame
) |
| 23 { | 23 { |
| 24 if (!frame || !frame->view() || !frame->document() || !frame->document()->la
youtView()) | 24 if (!frame || !frame->view() || !frame->document() || !frame->document()->la
youtView()) |
| 25 return MediaValuesCached::create(); | 25 return MediaValuesCached::create(); |
| 26 return adoptRef(new MediaValuesDynamic(frame)); | 26 return adoptRefWillBeNoop(new MediaValuesDynamic(frame)); |
| 27 } | 27 } |
| 28 | 28 |
| 29 MediaValuesDynamic::MediaValuesDynamic(LocalFrame* frame) | 29 MediaValuesDynamic::MediaValuesDynamic(LocalFrame* frame) |
| 30 : m_frame(frame) | 30 : m_frame(frame) |
| 31 { | 31 { |
| 32 ASSERT(m_frame); | 32 ASSERT(m_frame); |
| 33 } | 33 } |
| 34 | 34 |
| 35 PassRefPtr<MediaValues> MediaValuesDynamic::copy() const | 35 PassRefPtrWillBeRawPtr<MediaValues> MediaValuesDynamic::copy() const |
| 36 { | 36 { |
| 37 return adoptRef(new MediaValuesDynamic(m_frame)); | 37 return adoptRefWillBeNoop(new MediaValuesDynamic(m_frame)); |
| 38 } | 38 } |
| 39 | 39 |
| 40 bool MediaValuesDynamic::computeLength(double value, CSSPrimitiveValue::UnitType
type, int& result) const | 40 bool MediaValuesDynamic::computeLength(double value, CSSPrimitiveValue::UnitType
type, int& result) const |
| 41 { | 41 { |
| 42 return MediaValues::computeLength(value, | 42 return MediaValues::computeLength(value, |
| 43 type, | 43 type, |
| 44 calculateDefaultFontSize(m_frame), | 44 calculateDefaultFontSize(m_frame), |
| 45 calculateViewportWidth(m_frame), | 45 calculateViewportWidth(m_frame), |
| 46 calculateViewportHeight(m_frame), | 46 calculateViewportHeight(m_frame), |
| 47 result); | 47 result); |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 Document* MediaValuesDynamic::document() const | 140 Document* MediaValuesDynamic::document() const |
| 141 { | 141 { |
| 142 return m_frame->document(); | 142 return m_frame->document(); |
| 143 } | 143 } |
| 144 | 144 |
| 145 bool MediaValuesDynamic::hasValues() const | 145 bool MediaValuesDynamic::hasValues() const |
| 146 { | 146 { |
| 147 return m_frame; | 147 return m_frame; |
| 148 } | 148 } |
| 149 | 149 |
| 150 DEFINE_TRACE(MediaValuesDynamic) |
| 151 { |
| 152 visitor->trace(m_frame); |
| 153 MediaValues::trace(visitor); |
| 154 } |
| 155 |
| 150 } // namespace | 156 } // namespace |
| OLD | NEW |