DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include SkParagraph headers only when the enable-skshaper flag is on (#9758)

Browse Source 
These headers are currently causing errors in MSVC-based Windows builds.
This commit is contained in:
Jason Simmons 2019-07-10 16:32:02 -07:00 committed by GitHub
parent 2cd650d269
commit b22410ef6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
third_party/txt/src/txt/font_collection.h vendored
View File

@ -27,10 +27,13 @@
#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
#include "third_party/skia/include/core/SkFontMgr.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/modules/skparagraph/include/FontCollection.h"
#include "txt/asset_font_manager.h"
#include "txt/text_style.h"
#if FLUTTER_ENABLE_SKSHAPER
#include "third_party/skia/modules/skparagraph/include/FontCollection.h"
#endif
namespace txt {
class FontCollection : public std::enable_shared_from_this<FontCollection> {

5
third_party/txt/src/txt/paragraph_builder.cc vendored
View File

@ -15,11 +15,14 @@
*/
#include "paragraph_builder.h"
#include "flutter/third_party/txt/src/skia/paragraph_builder_skia.h"
#include "paragraph_builder_txt.h"
#include "paragraph_style.h"
#include "third_party/icu/source/common/unicode/unistr.h"
#if FLUTTER_ENABLE_SKSHAPER
#include "flutter/third_party/txt/src/skia/paragraph_builder_skia.h"
#endif
namespace txt {
std::unique_ptr<ParagraphBuilder> ParagraphBuilder::CreateTxtBuilder(