Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix windows SkParagraph compilation #19073

Merged
merged 4 commits into from Jun 17, 2020
Merged

Fix windows SkParagraph compilation #19073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e201a5e
skptemp
GaryQian Feb 6, 2020
f492e91
Remove config.gni true
GaryQian Feb 6, 2020
fbd751c
Fix windows build
GaryQian Jun 16, 2020
a54d16a
Remove default skparagraph enable
GaryQian Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion third_party/txt/src/skia/paragraph_builder_skia.cc
View file
Open in desktop
Expand Up @@ -176,7 +176,7 @@ void ParagraphBuilderSkia::AddPlaceholder(PlaceholderRun& span) {
}

std::unique_ptr<Paragraph> ParagraphBuilderSkia::Build() {
return std::make_unique<ParagraphSkia>(builder_->Build());
return std::unique_ptr<Paragraph>(new ParagraphSkia(builder_->Build()));
}

} // namespace txt
2 changes: 2 additions & 0 deletions third_party/txt/src/skia/paragraph_skia.h
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@
#ifndef LIB_TXT_SRC_PARAGRAPH_SKIA_H_
#define LIB_TXT_SRC_PARAGRAPH_SKIA_H_

#include <optional>

#include "txt/paragraph.h"

#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
Expand Down