Skip to content

Commit

Permalink
Roll tonic and update #includes (flutter#8950)
Browse files Browse the repository at this point in the history
  • Loading branch information
mdempsky authored and chinmaygarde committed May 14, 2019
1 parent a895315 commit 6608730
Show file tree
Hide file tree
Showing 23 changed files with 60 additions and 38 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ deps = {
# and not have to specific specific hashes.

'src/third_party/tonic':
Var('fuchsia_git') + '/tonic' + '@' + 'c78c7a8c3e99a1d1882533b5a6daa7926cdeeb68',
Var('fuchsia_git') + '/tonic' + '@' + 'bd27b4549199df72fcaeefd259ebc12a31c2e4ee',

'src/third_party/benchmark':
Var('fuchsia_git') + '/third_party/benchmark' + '@' + '21f1eb3fe269ea43eba862bf6b699cde46587ade',
Expand Down
45 changes: 38 additions & 7 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 11a4c2378b67a211eb78f91d0f251d30
Signature: b20afbc397e016f35432399d87bb21b4

UNUSED LICENSES:

Expand Down Expand Up @@ -18099,6 +18099,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: tonic
ORIGIN: ../../../fuchsia/sdk/linux/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/tonic/typed_data/typed_list.cc
----------------------------------------------------------------------------------------------------
Copyright 2019 The Fuchsia Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: tonic
ORIGIN: ../../../third_party/tonic/LICENSE
Expand Down Expand Up @@ -18128,6 +18163,7 @@ FILE: ../../../third_party/tonic/scopes/dart_isolate_scope.cc
FILE: ../../../third_party/tonic/scopes/dart_isolate_scope.h
FILE: ../../../third_party/tonic/typed_data/dart_byte_data.h
FILE: ../../../third_party/tonic/typed_data/int32_list.h
FILE: ../../../third_party/tonic/typed_data/typed_list.h
FILE: ../../../third_party/tonic/typed_data/uint16_list.h
FILE: ../../../third_party/tonic/typed_data/uint8_list.h
----------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -18261,13 +18297,8 @@ FILE: ../../../third_party/tonic/dart_wrappable.cc
FILE: ../../../third_party/tonic/dart_wrappable.h
FILE: ../../../third_party/tonic/dart_wrapper_info.h
FILE: ../../../third_party/tonic/typed_data/dart_byte_data.cc
FILE: ../../../third_party/tonic/typed_data/float32_list.cc
FILE: ../../../third_party/tonic/typed_data/float32_list.h
FILE: ../../../third_party/tonic/typed_data/float64_list.cc
FILE: ../../../third_party/tonic/typed_data/float64_list.h
FILE: ../../../third_party/tonic/typed_data/int32_list.cc
FILE: ../../../third_party/tonic/typed_data/uint16_list.cc
FILE: ../../../third_party/tonic/typed_data/uint8_list.cc
----------------------------------------------------------------------------------------------------
Copyright 2015 The Fuchsia Authors. All rights reserved.

Expand Down Expand Up @@ -19218,4 +19249,4 @@ freely, subject to the following restrictions:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
Total license count: 320
Total license count: 321
2 changes: 1 addition & 1 deletion lib/ui/compositing/scene_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "flutter/lib/ui/painting/picture.h"
#include "flutter/lib/ui/painting/rrect.h"
#include "flutter/lib/ui/painting/shader.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

#if defined(OS_FUCHSIA)
#include "flutter/lib/ui/compositing/scene_host.h"
Expand Down
4 changes: 1 addition & 3 deletions lib/ui/painting/canvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
#include "flutter/lib/ui/painting/vertices.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/utils/SkShadowUtils.h"
#include "third_party/tonic/typed_data/float32_list.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/int32_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace tonic {
class DartLibraryNatives;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/codec.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "third_party/tonic/dart_library_natives.h"
#include "third_party/tonic/dart_state.h"
#include "third_party/tonic/logging/dart_invoke.h"
#include "third_party/tonic/typed_data/uint8_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

using tonic::DartInvoke;
using tonic::DartPersistentValue;
Expand Down
4 changes: 1 addition & 3 deletions lib/ui/painting/gradient.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
#include "flutter/lib/ui/painting/matrix.h"
#include "flutter/lib/ui/painting/shader.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
#include "third_party/tonic/typed_data/float32_list.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/int32_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace tonic {
class DartLibraryNatives;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/image_encoding.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/tonic/dart_persistent_value.h"
#include "third_party/tonic/logging/dart_invoke.h"
#include "third_party/tonic/typed_data/uint8_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

using tonic::DartInvoke;
using tonic::DartPersistentValue;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/image_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "flutter/lib/ui/painting/image.h"
#include "flutter/lib/ui/painting/picture.h"
#include "third_party/skia/include/core/SkImageFilter.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace flutter {

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/image_shader.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "flutter/lib/ui/painting/shader.h"
#include "third_party/skia/include/core/SkMatrix.h"
#include "third_party/skia/include/core/SkShader.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace tonic {
class DartLibraryNatives;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define FLUTTER_LIB_UI_PAINTING_MATRIX_H_

#include "third_party/skia/include/core/SkMatrix.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace flutter {

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/paint.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "third_party/skia/include/core/SkShader.h"
#include "third_party/skia/include/core/SkString.h"
#include "third_party/tonic/typed_data/dart_byte_data.h"
#include "third_party/tonic/typed_data/float32_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace flutter {

Expand Down
3 changes: 1 addition & 2 deletions lib/ui/painting/path.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
#include "flutter/lib/ui/painting/rrect.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/pathops/SkPathOps.h"
#include "third_party/tonic/typed_data/float32_list.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace tonic {
class DartLibraryNatives;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/path_measure.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "flutter/lib/ui/painting/path.h"
#include "third_party/skia/include/core/SkContourMeasure.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace tonic {
class DartLibraryNatives;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/rrect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "flutter/fml/logging.h"
#include "third_party/tonic/logging/dart_error.h"
#include "third_party/tonic/typed_data/float32_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

using namespace flutter;

Expand Down
4 changes: 1 addition & 3 deletions lib/ui/painting/vertices.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

#include "flutter/lib/ui/dart_wrapper.h"
#include "third_party/skia/include/core/SkVertices.h"
#include "third_party/tonic/typed_data/float32_list.h"
#include "third_party/tonic/typed_data/int32_list.h"
#include "third_party/tonic/typed_data/uint16_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace tonic {
class DartLibraryNatives;
Expand Down
3 changes: 1 addition & 2 deletions lib/ui/semantics/custom_accessibility_action.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

#include "third_party/tonic/dart_library_natives.h"
#include "third_party/tonic/dart_wrappable.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/int32_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace flutter {

Expand Down
3 changes: 1 addition & 2 deletions lib/ui/semantics/semantics_update_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

#include "flutter/lib/ui/dart_wrapper.h"
#include "flutter/lib/ui/semantics/semantics_update.h"
#include "third_party/tonic/typed_data/float64_list.h"
#include "third_party/tonic/typed_data/int32_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace flutter {

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/text/font_collection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "third_party/tonic/dart_args.h"
#include "third_party/tonic/dart_library_natives.h"
#include "third_party/tonic/logging/dart_invoke.h"
#include "third_party/tonic/typed_data/uint8_list.h"
#include "third_party/tonic/typed_data/typed_list.h"
#include "txt/asset_font_manager.h"
#include "txt/test_font_manager.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/text/paragraph_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "flutter/lib/ui/painting/paint.h"
#include "flutter/lib/ui/text/paragraph.h"
#include "flutter/third_party/txt/src/txt/paragraph_builder.h"
#include "third_party/tonic/typed_data/int32_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace tonic {
class DartLibraryNatives;
Expand Down
2 changes: 1 addition & 1 deletion runtime/dart_vm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "third_party/tonic/file_loader/file_loader.h"
#include "third_party/tonic/logging/dart_error.h"
#include "third_party/tonic/scopes/dart_api_scope.h"
#include "third_party/tonic/typed_data/uint8_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

namespace dart {
namespace observatory {
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "third_party/tonic/dart_library_natives.h"
#include "third_party/tonic/dart_state.h"
#include "third_party/tonic/logging/dart_invoke.h"
#include "third_party/tonic/typed_data/uint8_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

using tonic::ToDart;

Expand Down
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/natives.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "third_party/tonic/dart_library_natives.h"
#include "third_party/tonic/dart_state.h"
#include "third_party/tonic/logging/dart_invoke.h"
#include "third_party/tonic/typed_data/uint8_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

using tonic::ToDart;

Expand Down
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/dart/service_isolate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "third_party/tonic/dart_library_natives.h"
#include "third_party/tonic/dart_microtask_queue.h"
#include "third_party/tonic/dart_state.h"
#include "third_party/tonic/typed_data/uint8_list.h"
#include "third_party/tonic/typed_data/typed_list.h"

#include "builtin_libraries.h"
#include "dart_component_controller.h"
Expand Down

0 comments on commit 6608730

Please sign in to comment.