firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[rapidjson] Fix import statements (flutter/engine#6418)

Browse Source
This commit is contained in:
Zachary Bush
2018-10-03 17:33:45 -07:00
committed by Chinmay Garde
parent 6e666dadf8
commit ae7481fbe2
7 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -135,7 +135,7 @@ deps = {
Var('fuchsia_git') + '/third_party/googletest' + '@' + '2072b0053d3537fa5e8d222e34c759987aae1320',
'src/third_party/rapidjson':
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '9defbb0209a534ffeb3a2b79d5ee440a77407292',
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '32d07c55db1bb6c2ae17cba4033491a667647753',
'src/third_party/harfbuzz':
Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + 'd837034f09a957faf2814002e8ebd81da6151d1b',

6
engine/src/flutter/lib/ui/plugins/callback_cache.cc
View File

@@ -9,9 +9,9 @@
#include "flutter/fml/logging.h"
#include "flutter/fml/paths.h"
#include "flutter/lib/ui/plugins/callback_cache.h"
#include "third_party/rapidjson/rapidjson/document.h"
#include "third_party/rapidjson/rapidjson/stringbuffer.h"
#include "third_party/rapidjson/rapidjson/writer.h"
#include "rapidjson/document.h"
#include "rapidjson/stringbuffer.h"
#include "rapidjson/writer.h"
#include "third_party/tonic/converter/dart_converter.h"
using rapidjson::Document;

4
engine/src/flutter/lib/ui/text/font_collection.cc
View File

@@ -8,8 +8,8 @@
#include "flutter/lib/ui/text/asset_manager_font_provider.h"
#include "flutter/runtime/test_font_data.h"
#include "third_party/rapidjson/rapidjson/document.h"
#include "third_party/rapidjson/rapidjson/rapidjson.h"
#include "rapidjson/document.h"
#include "rapidjson/rapidjson.h"
#include "third_party/skia/include/core/SkFontMgr.h"
#include "third_party/skia/include/core/SkGraphics.h"
#include "third_party/skia/include/core/SkStream.h"

5
engine/src/flutter/runtime/BUILD.gn
View File

@@ -95,11 +95,14 @@ source_set("runtime") {
"$flutter_root/third_party/txt",
"//third_party/dart/runtime:dart_api",
"//third_party/dart/runtime/bin:dart_io_api",
"//third_party/rapidjson",
"//third_party/skia",
"//third_party/tonic",
]
public_deps = [
"//third_party/rapidjson",
]
public_configs = [ "$flutter_root:config" ]
if (flutter_runtime_mode != "release" &&

2
engine/src/flutter/runtime/service_protocol.h
View File

@@ -15,7 +15,7 @@
#include "flutter/fml/string_view.h"
#include "flutter/fml/synchronization/thread_annotations.h"
#include "flutter/fml/task_runner.h"
#include "third_party/rapidjson/rapidjson/document.h"
#include "rapidjson/document.h"
namespace blink {

2
engine/src/flutter/shell/common/BUILD.gn
View File

@@ -100,7 +100,6 @@ source_set("common") {
"$flutter_root/runtime",
"$flutter_root/synchronization",
"//third_party/dart/runtime:dart_api",
"//third_party/rapidjson",
"//third_party/skia",
"//third_party/skia:gpu",
]
@@ -109,6 +108,7 @@ source_set("common") {
"$flutter_root/shell/version",
"$flutter_root/third_party/txt",
"//third_party/tonic",
"//third_party/rapidjson",
]
public_configs = [ "$flutter_root:config" ]

2
engine/src/flutter/shell/common/engine.cc
View File

@@ -19,7 +19,7 @@
#include "flutter/shell/common/animator.h"
#include "flutter/shell/common/platform_view.h"
#include "flutter/shell/common/shell.h"
#include "third_party/rapidjson/rapidjson/document.h"
#include "rapidjson/document.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"