diff --git a/shell/platform/ohos/accessibility/ohos_accessibility_bridge.h b/shell/platform/ohos/accessibility/ohos_accessibility_bridge.h index 6cfb61aab83962a609690edb5f3c1d338dffe607..d947b14f14b223ce5d16474c8372cf60ff4ee5bb 100644 --- a/shell/platform/ohos/accessibility/ohos_accessibility_bridge.h +++ b/shell/platform/ohos/accessibility/ohos_accessibility_bridge.h @@ -333,59 +333,5 @@ private: void GetSemanticsDebugInfo(); void AccessibiltiyChangesWithXComponentId(); }; - -enum class AccessibilityAction : int32_t { - kTap = 1 << 0, - kLongPress = 1 << 1, - kScrollLeft = 1 << 2, - kScrollRight = 1 << 3, - kScrollUp = 1 << 4, - kScrollDown = 1 << 5, - kIncrease = 1 << 6, - kDecrease = 1 << 7, - kShowOnScreen = 1 << 8, - kMoveCursorForwardByCharacter = 1 << 9, - kMoveCursorBackwardByCharacter = 1 << 10, - kSetSelection = 1 << 11, - kCopy = 1 << 12, - kCut = 1 << 13, - kPaste = 1 << 14, - kDidGainAccessibilityFocus = 1 << 15, - kDidLoseAccessibilityFocus = 1 << 16, - kCustomAction = 1 << 17, - kDismiss = 1 << 18, - kMoveCursorForwardByWord = 1 << 19, - kMoveCursorBackwardByWord = 1 << 20, - kSetText = 1 << 21, -}; -enum class AccessibilityFlags : int32_t { - kHasCheckedState = 1 << 0, - kIsChecked = 1 << 1, - kIsSelected = 1 << 2, - kIsButton = 1 << 3, - kIsTextField = 1 << 4, - kIsFocused = 1 << 5, - kHasEnabledState = 1 << 6, - kIsEnabled = 1 << 7, - kIsInMutuallyExclusiveGroup = 1 << 8, - kIsHeader = 1 << 9, - kIsObscured = 1 << 10, - kScopesRoute = 1 << 11, - kNamesRoute = 1 << 12, - kIsHidden = 1 << 13, - kIsImage = 1 << 14, - kIsLiveRegion = 1 << 15, - kHasToggledState = 1 << 16, - kIsToggled = 1 << 17, - kHasImplicitScrolling = 1 << 18, - kIsMultiline = 1 << 19, - kIsReadOnly = 1 << 20, - kIsFocusable = 1 << 21, - kIsLink = 1 << 22, - kIsSlider = 1 << 23, - kIsKeyboardKey = 1 << 24, - kIsCheckStateMixed = 1 << 25, -}; - } // namespace flutter #endif // OHOS_ACCESSIBILITY_BRIDGE_H diff --git a/shell/platform/ohos/ohos_image_generator.h b/shell/platform/ohos/ohos_image_generator.h index f21ddfeabdbf0da3de260bc3401d75d666b3c231..cd677e20cc2e7658a765f400a0e87fb6f8605565 100755 --- a/shell/platform/ohos/ohos_image_generator.h +++ b/shell/platform/ohos/ohos_image_generator.h @@ -36,23 +36,17 @@ class OHOSImageGenerator : public ImageGenerator { ~OHOSImageGenerator(); - // |ImageGenerator| const SkImageInfo& GetInfo() override; - // |ImageGenerator| unsigned int GetFrameCount() const override; - // |ImageGenerator| unsigned int GetPlayCount() const override; - // |ImageGenerator| const ImageGenerator::FrameInfo GetFrameInfo( unsigned int frame_index) const override; - // |ImageGenerator| SkISize GetScaledDimensions(float desired_scale) override; - // |ImageGenerator| bool GetPixels(const SkImageInfo& info, void* pixels, size_t row_bytes, diff --git a/shell/platform/ohos/platform_message_response_ohos.h b/shell/platform/ohos/platform_message_response_ohos.h index ad38f75f0b4e81aa0903bd365bd062fa40344cb8..b113f4ac224ba6dfef6361888e40c90b95f07ebf 100644 --- a/shell/platform/ohos/platform_message_response_ohos.h +++ b/shell/platform/ohos/platform_message_response_ohos.h @@ -19,10 +19,9 @@ namespace flutter { class PlatformMessageResponseOHOS : public flutter::PlatformMessageResponse { public: - // |flutter::PlatformMessageResponse| + void Complete(std::unique_ptr data) override; - // |flutter::PlatformMessageResponse| void CompleteEmpty() override; private: diff --git a/shell/platform/ohos/platform_view_ohos.h b/shell/platform/ohos/platform_view_ohos.h index 7185fbfd6db5fdadc41f7993d4dfb80415226fe0..75e49c12c4e3ffdab6ece07c84666205eb4b7da2 100644 --- a/shell/platform/ohos/platform_view_ohos.h +++ b/shell/platform/ohos/platform_view_ohos.h @@ -107,17 +107,16 @@ class PlatformViewOHOS final : public PlatformView { // |PlatformView| PointerDataDispatcherMaker GetDispatcherMaker() override; - // |PlatformView| void LoadDartDeferredLibrary( intptr_t loading_unit_id, std::unique_ptr snapshot_data, std::unique_ptr snapshot_instructions) override; + // |PlatformView| void LoadDartDeferredLibraryError(intptr_t loading_unit_id, const std::string error_message, bool transient) override; - // |PlatformView| void UpdateAssetResolverByType( std::unique_ptr updated_asset_resolver, AssetResolver::AssetResolverType type) override; @@ -154,45 +153,33 @@ class PlatformViewOHOS final : public PlatformView { void SetDestroyed(bool isDestroyed_); - // |PlatformView| void UpdateSemantics( flutter::SemanticsNodeUpdates update, flutter::CustomAccessibilityActionUpdates actions) override; - // |PlatformView| void HandlePlatformMessage( std::unique_ptr message) override; - // |PlatformView| void OnPreEngineRestart() const override; - // |PlatformView| std::unique_ptr CreateVSyncWaiter() override; - // |PlatformView| std::unique_ptr CreateRenderingSurface() override; - // |PlatformView| std::shared_ptr CreateExternalViewEmbedder() override; - // |PlatformView| std::unique_ptr CreateSnapshotSurfaceProducer() override; - // |PlatformView| sk_sp CreateResourceContext() const override; - // |PlatformView| void ReleaseResourceContext() const override; - // |PlatformView| std::shared_ptr GetImpellerContext() const override; - // |PlatformView| std::unique_ptr> ComputePlatformResolvedLocales( const std::vector& supported_locale_data) override; - // |PlatformView| void RequestDartDeferredLibrary(intptr_t loading_unit_id) override; void InstallFirstFrameCallback();