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.

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

Revert "IOS Platform view transform/clipping (#9075)" #9480

Merged
merged 1 commit into from
Jun 25, 2019

Conversation

cbracken
Copy link
Member

This reverts commit ebb5b90.

Seeing the following breakage on host build:

../../flutter/flow/scene_update_context.cc:205:36: error: non-const lvalue reference to type 'flutter::MutatorsStack' cannot bind to a value of unrelated type 'const flutter::Stopwatch'
                                   frame.context().raster_time(),
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../flutter/flow/scene_update_context.cc:207:36: error: no viable conversion from 'flutter::TextureRegistry' to 'const flutter::Stopwatch'
                                   frame.context().texture_registry(),
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../flutter/flow/instrumentation.h:55:32: note: candidate constructor not viable: no known conversion from 'flutter::TextureRegistry' to 'const flutter::Stopwatch &' for 1st argument
  FML_DISALLOW_COPY_AND_ASSIGN(Stopwatch);
                               ^
../../flutter/fml/macros.h:28:3: note: expanded from macro 'FML_DISALLOW_COPY_AND_ASSIGN'
  TypeName(const TypeName&) = delete;          \
  ^
../../flutter/flow/scene_update_context.cc:208:36: error: non-const lvalue reference to type 'flutter::TextureRegistry' cannot bind to a temporary of type 'flutter::RasterCache *'
                                   &frame.context().raster_cache(),
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../flutter/flow/scene_update_context.cc:209:36: error: cannot initialize a member subobject of type 'const flutter::RasterCache *' with an rvalue of type 'bool'
                                   false};
                                   ^~~~~

This reverts commit ebb5b90.

Seeing the following breakage on host build:
```
../../flutter/flow/scene_update_context.cc:205:36: error: non-const lvalue reference to type 'flutter::MutatorsStack' cannot bind to a value of unrelated type 'const flutter::Stopwatch'
                                   frame.context().raster_time(),
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../flutter/flow/scene_update_context.cc:207:36: error: no viable conversion from 'flutter::TextureRegistry' to 'const flutter::Stopwatch'
                                   frame.context().texture_registry(),
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../flutter/flow/instrumentation.h:55:32: note: candidate constructor not viable: no known conversion from 'flutter::TextureRegistry' to 'const flutter::Stopwatch &' for 1st argument
  FML_DISALLOW_COPY_AND_ASSIGN(Stopwatch);
                               ^
../../flutter/fml/macros.h:28:3: note: expanded from macro 'FML_DISALLOW_COPY_AND_ASSIGN'
  TypeName(const TypeName&) = delete;          \
  ^
../../flutter/flow/scene_update_context.cc:208:36: error: non-const lvalue reference to type 'flutter::TextureRegistry' cannot bind to a temporary of type 'flutter::RasterCache *'
                                   &frame.context().raster_cache(),
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../flutter/flow/scene_update_context.cc:209:36: error: cannot initialize a member subobject of type 'const flutter::RasterCache *' with an rvalue of type 'bool'
                                   false};
                                   ^~~~~
```
@cbracken cbracken requested a review from cyanglaz June 25, 2019 17:47
@cyanglaz
Copy link
Contributor

LGTM

@cbracken cbracken merged commit 00d929f into flutter:master Jun 25, 2019
@cbracken cbracken deleted the revert branch June 25, 2019 17:48
cyanglaz pushed a commit to cyanglaz/engine that referenced this pull request Jun 25, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2019
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Jun 25, 2019
flutter/engine@ae8e6d9...107fe82

git log ae8e6d9..107fe82 --no-merges --oneline
107fe82 Add --observatory-host switch (flutter/engine#9485)
20a76de Roll src/third_party/skia ebbc82c02471..69881fb0b5fb (11 commits) (flutter/engine#9479)
00d929f Revert "IOS Platform view transform/clipping (#9075)" (flutter/engine#9480)
3390019 fix NPE when a touch event is sent to an unknown Android platform view (flutter/engine#9476)
ebb5b90 IOS Platform view transform/clipping (flutter/engine#9075)
13145e9 ios-unit-tests: Started using rsync instead of cp -R to copy frameworks. (flutter/engine#9471)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
cyanglaz pushed a commit that referenced this pull request Jun 25, 2019
…akage. (#9483)

* Revert "Revert "IOS Platform view transform/clipping (#9075)" (#9480)"

This reverts commit 00d929f.

* fix fuschia buid
johnsonmh pushed a commit to johnsonmh/flutter that referenced this pull request Jul 30, 2019
flutter/engine@ae8e6d9...107fe82

git log ae8e6d9..107fe82 --no-merges --oneline
107fe82 Add --observatory-host switch (flutter/engine#9485)
20a76de Roll src/third_party/skia ebbc82c02471..69881fb0b5fb (11 commits) (flutter/engine#9479)
00d929f Revert &flutter#34;IOS Platform view transform/clipping (flutter#9075)&flutter#34; (flutter/engine#9480)
3390019 fix NPE when a touch event is sent to an unknown Android platform view (flutter/engine#9476)
ebb5b90 IOS Platform view transform/clipping (flutter/engine#9075)
13145e9 ios-unit-tests: Started using rsync instead of cp -R to copy frameworks. (flutter/engine#9471)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants