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

Unified Diff: Source/core/css/resolver/FontBuilder.cpp

Issue 444333005: Remove custom style building for -webkit-font-feature-settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « Source/core/css/resolver/FontBuilder.h ('k') | Source/core/css/resolver/StyleBuilderConverter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/FontBuilder.cpp
diff --git a/Source/core/css/resolver/FontBuilder.cpp b/Source/core/css/resolver/FontBuilder.cpp
index a148871e9fb6f1410883ae53b5b035ebcbf79a3e..03b07328256de5683cd6f3cd7ca072a8ba40ce5a 100644
--- a/Source/core/css/resolver/FontBuilder.cpp
+++ b/Source/core/css/resolver/FontBuilder.cpp
@@ -24,7 +24,6 @@
#include "core/css/resolver/FontBuilder.h"
#include "core/css/CSSCalculationValue.h"
-#include "core/css/CSSFontFeatureValue.h"
#include "core/css/CSSToLengthConversionData.h"
#include "core/css/FontSize.h"
#include "core/frame/LocalFrame.h"
@@ -417,29 +416,11 @@ void FontBuilder::setFontSmoothing(FontSmoothingMode foontSmoothingMode)
scope.fontDescription().setFontSmoothing(foontSmoothingMode);
}
-void FontBuilder::setFeatureSettingsNormal()
+void FontBuilder::setFeatureSettings(PassRefPtr<FontFeatureSettings> settings)
{
FontDescriptionChangeScope scope(this);
- // FIXME: Eliminate FontDescription::makeNormalFeatureSettings. It's useless.
- scope.set(scope.fontDescription().makeNormalFeatureSettings());
-}
-
-void FontBuilder::setFeatureSettingsValue(CSSValue* value)
-{
- FontDescriptionChangeScope scope(this);
-
- CSSValueList* list = toCSSValueList(value);
- RefPtr<FontFeatureSettings> settings = FontFeatureSettings::create();
- int len = list->length();
- for (int i = 0; i < len; ++i) {
- CSSValue* item = list->item(i);
- if (!item->isFontFeatureValue())
- continue;
- CSSFontFeatureValue* feature = toCSSFontFeatureValue(item);
- settings->append(FontFeature(feature->tag(), feature->value()));
- }
- scope.fontDescription().setFeatureSettings(settings.release());
+ scope.fontDescription().setFeatureSettings(settings);
}
void FontBuilder::setSize(FontDescription& fontDescription, float effectiveZoom, float size)
« no previous file with comments | « Source/core/css/resolver/FontBuilder.h ('k') | Source/core/css/resolver/StyleBuilderConverter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698