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

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

Issue 2873433003: Move MediaQuery classes off BlinkGC heap (Closed)
Patch Set: Created 3 years, 7 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 0f7e7ead0c3634c244fc743f1872f461665bdb2c..e7d814e3147a1c1c51d1b15c4886d5b520dbf1fb 100644
--- a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -103,7 +103,7 @@ void ViewportStyleResolver::collectViewportChildRules(
} else if (rule->isMediaRule()) {
StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);
if (!mediaRule->mediaQueries() ||
- m_initialViewportMedium->eval(mediaRule->mediaQueries(),
+ m_initialViewportMedium->eval(*mediaRule->mediaQueries(),
&m_viewportDependentMediaQueryResults,
&m_deviceDependentMediaQueryResults))
collectViewportChildRules(mediaRule->childRules(), origin);
@@ -123,7 +123,7 @@ void ViewportStyleResolver::collectViewportRulesFromImports(
if (!importRule->styleSheet()->hasViewportRule())
continue;
if (importRule->mediaQueries() &&
- m_initialViewportMedium->eval(importRule->mediaQueries(),
+ m_initialViewportMedium->eval(*importRule->mediaQueries(),
&m_viewportDependentMediaQueryResults,
&m_deviceDependentMediaQueryResults))
collectViewportRulesFromAuthorSheetContents(*importRule->styleSheet());
@@ -144,7 +144,7 @@ void ViewportStyleResolver::collectViewportRulesFromAuthorSheet(
if (!contents.hasViewportRule() && contents.importRules().isEmpty())
return;
if (sheet.mediaQueries() &&
- !m_initialViewportMedium->eval(sheet.mediaQueries(),
+ !m_initialViewportMedium->eval(*sheet.mediaQueries(),
&m_viewportDependentMediaQueryResults,
&m_deviceDependentMediaQueryResults))
return;
@@ -304,8 +304,8 @@ void ViewportStyleResolver::initialViewportChanged() {
auto& results = m_viewportDependentMediaQueryResults;
for (unsigned i = 0; i < results.size(); i++) {
- if (m_initialViewportMedium->eval(results[i]->expression()) !=
- results[i]->result()) {
+ if (m_initialViewportMedium->eval(results[i].expression()) !=
+ results[i].result()) {
m_needsUpdate = CollectRules;
break;
}
@@ -338,8 +338,6 @@ DEFINE_TRACE(ViewportStyleResolver) {
visitor->trace(m_document);
visitor->trace(m_propertySet);
visitor->trace(m_initialViewportMedium);
- visitor->trace(m_viewportDependentMediaQueryResults);
- visitor->trace(m_deviceDependentMediaQueryResults);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698