Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Eliminate std::string using directive #7433

Merged
merged 2 commits into from
Jan 10, 2019
Merged

Eliminate std::string using directive #7433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b46049
Avoid using std::string
cbracken Jan 10, 2019
d29cc32
Apply clang-format
cbracken Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions third_party/txt/src/minikin/Layout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
#include "LayoutUtils.h"
#include "MinikinInternal.h"

using std::string;
using std::vector;

namespace minikin {

const int kDirection_Mask = 0x1;
Expand Down Expand Up @@ -745,7 +742,8 @@ float Layout::doLayoutWord(const uint16_t* buf,
return advance;
}

static void addFeatures(const string& str, vector<hb_feature_t>* features) {
static void addFeatures(const std::string& str,
std::vector<hb_feature_t>* features) {
if (!str.size())
return;

Expand Down Expand Up @@ -925,10 +923,10 @@ void Layout::doLayoutRun(const uint16_t* buf,
LayoutContext* ctx,
const std::shared_ptr<FontCollection>& collection) {
hb_buffer_t* buffer = LayoutEngine::getInstance().hbBuffer;
vector<FontCollection::Run> items;
std::vector<FontCollection::Run> items;
collection->itemize(buf + start, count, ctx->style, &items);

vector<hb_feature_t> features;
std::vector<hb_feature_t> features;
// Disable default-on non-required ligature features if letter-spacing
// See http://dev.w3.org/csswg/css-text-3/#letter-spacing-property
// "When the effective spacing between two characters is not zero (due to
Expand Down