Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Unified Diff: third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
index 7712f846ced4c7a63f1f37c3a29ee39c40e1144e..8f90de97c35605f82924be1fea5b7b81d3a640e0 100644
--- a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -43,8 +43,6 @@
namespace blink {
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ViewportStyleResolver);
-
ViewportStyleResolver::ViewportStyleResolver(Document* document)
: m_document(document)
, m_hasAuthorStyle(false)
@@ -73,7 +71,7 @@ void ViewportStyleResolver::collectViewportRules(RuleSet* rules, Origin origin)
{
rules->compactRulesIfNeeded();
- const WillBeHeapVector<RawPtrWillBeMember<StyleRuleViewport>>& viewportRules = rules->viewportRules();
+ const HeapVector<Member<StyleRuleViewport>>& viewportRules = rules->viewportRules();
for (size_t i = 0; i < viewportRules.size(); ++i)
addViewportRule(viewportRules[i], origin);
}
@@ -135,7 +133,7 @@ float ViewportStyleResolver::viewportArgumentValue(CSSPropertyID id) const
if (id == CSSPropertyUserZoom)
defaultValue = 1;
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
+ RawPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
if (!value || !value->isPrimitiveValue())
return defaultValue;
@@ -185,7 +183,7 @@ Length ViewportStyleResolver::viewportLengthValue(CSSPropertyID id) const
|| id == CSSPropertyMaxWidth
|| id == CSSPropertyMinWidth);
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
+ RawPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
if (!value || !value->isPrimitiveValue())
return Length(); // auto

Powered by Google App Engine
This is Rietveld 408576698