fix: fix compile in android.

openwebf · Sep 27, 2024 · 076fa39 · 076fa39
1 parent 6a8b126
commit 076fa39
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 29 deletions.
diff --git a/bridge/core/css/css_at_rule_id.cc b/bridge/core/css/css_at_rule_id.cc
@@ -227,7 +227,7 @@ std::string CssAtRuleIDToString(CSSAtRuleID id) {
  case CSSAtRuleID::kCSSAtRuleFunction:
  return "@function";
  case CSSAtRuleID::kCSSAtRuleInvalid:
- assert_m(false, 'NOTREACHED_IN_MIGRATION');
+ assert_m(false, "NOTREACHED_IN_MIGRATION");
  // NOTREACHED_IN_MIGRATION();
  return "";
  };

diff --git a/bridge/core/css/css_math_expression_node.h b/bridge/core/css/css_math_expression_node.h
@@ -623,7 +623,7 @@ class CSSMathExpressionContainerFeature final : public CSSMathExpressionNode {
  std::shared_ptr<const CSSMathExpressionNode> PopulateWithTreeScope(const TreeScope* tree_scope) const final {
  std::shared_ptr<const CSSCustomIdentValue> container_name =
  container_name_
- ? reinterpret_pointer_cast<const CSSCustomIdentValue>(container_name_->EnsureScopedValue(tree_scope))
+ ? std::reinterpret_pointer_cast<const CSSCustomIdentValue>(container_name_->EnsureScopedValue(tree_scope))
  : nullptr;
  return std::make_shared<CSSMathExpressionContainerFeature>(size_feature_, container_name);
  }

diff --git a/bridge/core/css/css_selector.cc b/bridge/core/css/css_selector.cc
@@ -629,7 +629,6 @@ PseudoId CSSSelector::GetPseudoId(PseudoType type) {
  case kPseudoHorizontal:
  case kPseudoHost:
  case kPseudoHostContext:
- case kPseudoHostHasAppearance:
  case kPseudoHover:
  case kPseudoInRange:
  case kPseudoIncrement:
@@ -675,7 +674,6 @@ PseudoId CSSSelector::GetPseudoId(PseudoType type) {
  case kPseudoRoot:
  case kPseudoScope:
  case kPseudoSelectFallbackButton:
- case kPseudoSelectFallbackButtonIcon:
  case kPseudoSelectFallbackButtonText:
  case kPseudoSelectFallbackDatalist:
  case kPseudoSelectorFragmentAnchor:
@@ -738,7 +736,6 @@ const static NameToPseudoStruct kPseudoTypeWithoutArgumentsMap[] = {
  {"-internal-popover-in-top-layer", CSSSelector::kPseudoPopoverInTopLayer},
  {"-internal-relative-anchor", CSSSelector::kPseudoRelativeAnchor},
  {"-internal-selector-fragment-anchor", CSSSelector::kPseudoSelectorFragmentAnchor},
- {"-internal-shadow-host-has-appearance", CSSSelector::kPseudoHostHasAppearance},
  {"-internal-spatial-navigation-focus", CSSSelector::kPseudoSpatialNavigationFocus},
  {"-internal-video-persistent", CSSSelector::kPseudoVideoPersistent},
  {"-internal-video-persistent-ancestor", CSSSelector::kPseudoVideoPersistentAncestor},
@@ -825,7 +822,6 @@ const static NameToPseudoStruct kPseudoTypeWithoutArgumentsMap[] = {
  {"scroll-marker-group", CSSSelector::kPseudoScrollMarkerGroup},
  {"search-text", CSSSelector::kPseudoSearchText},
  {"select-fallback-button", CSSSelector::kPseudoSelectFallbackButton},
- {"select-fallback-button-icon", CSSSelector::kPseudoSelectFallbackButtonIcon},
  {"select-fallback-button-text", CSSSelector::kPseudoSelectFallbackButtonText},
  {"select-fallback-datalist", CSSSelector::kPseudoSelectFallbackDatalist},
  {"selection", CSSSelector::kPseudoSelection},
@@ -926,7 +922,6 @@ CSSSelector::PseudoType CSSSelector::NameToPseudoType(const std::string& name,
  }
 
  if ((match->type == CSSSelector::kPseudoSelectFallbackButton ||
- match->type == CSSSelector::kPseudoSelectFallbackButtonIcon ||
  match->type == CSSSelector::kPseudoSelectFallbackButtonText ||
  match->type == CSSSelector::kPseudoSelectFallbackDatalist)) {
  return CSSSelector::kPseudoUnknown;
@@ -979,7 +974,6 @@ void CSSSelector::UpdatePseudoType(const std::string& value,
  case kPseudoScrollMarker:
  case kPseudoScrollMarkerGroup:
  case kPseudoSelectFallbackButton:
- case kPseudoSelectFallbackButtonIcon:
  case kPseudoSelectFallbackButtonText:
  case kPseudoSelectFallbackDatalist:
  case kPseudoSelection:
@@ -1006,7 +1000,6 @@ void CSSSelector::UpdatePseudoType(const std::string& value,
  }
  break;
  case kPseudoHasDatalist:
- case kPseudoHostHasAppearance:
  case kPseudoIsHtml:
  case kPseudoListBox:
  case kPseudoMultiSelectFocus:
@@ -1291,7 +1284,6 @@ static bool ValidateSubSelector(const CSSSelector* selector) {
  case CSSSelector::kPseudoHasDatalist:
  case CSSSelector::kPseudoIsHtml:
  case CSSSelector::kPseudoListBox:
- case CSSSelector::kPseudoHostHasNonAutoAppearance:
  // TODO(https://crbug.com/1346456): Many pseudos should probably be
  // added to this list. The default: case below should also be removed
  // so that those adding new pseudos know they need to choose one path or
@@ -1406,8 +1398,6 @@ bool CSSSelector::IsAllowedAfterPart() const {
  case kPseudoScrollbarTrackPiece:
  case kPseudoScrollMarker:
  case kPseudoScrollMarkerGroup:
- case kPseudoScrollNextButton:
- case kPseudoScrollPrevButton:
  case kPseudoWebKitCustomElement:
  case kPseudoBlinkInternalElement:
  case kPseudoSlotted:
@@ -1559,7 +1549,6 @@ bool CSSSelector::IsAllowedAfterPart() const {
  case kPseudoHasDatalist:
  case kPseudoHost:
  case kPseudoHostContext:
- case kPseudoHostHasNonAutoAppearance:
  case kPseudoScope:
  return false;
 

diff --git a/bridge/core/css/css_selector.h b/bridge/core/css/css_selector.h
@@ -304,7 +304,6 @@ class CSSSelector {
  kPseudoScrollbarTrackPiece,
  kPseudoSearchText,
  kPseudoSelectFallbackButton,
- kPseudoSelectFallbackButtonIcon,
  kPseudoSelectFallbackButtonText,
  kPseudoSelectFallbackDatalist,
  kPseudoSelection,
@@ -359,8 +358,6 @@ class CSSSelector {
  kPseudoHighlight,
  kPseudoHost,
  kPseudoHostContext,
- kPseudoHostHasNonAutoAppearance,
- kPseudoHostHasAppearance,
  kPseudoIsHtml,
  kPseudoListBox,
  kPseudoMultiSelectFocus,
@@ -391,8 +388,6 @@ class CSSSelector {
  kPseudoScrollMarker,
  kPseudoScrollMarkerGroup,
  // Scroll button pseudos for Carousel
- kPseudoScrollNextButton,
- kPseudoScrollPrevButton,
  };
 
  enum class AttributeMatchType : int {

diff --git a/bridge/core/css/css_variable_data.h b/bridge/core/css/css_variable_data.h
@@ -14,7 +14,7 @@ namespace webf {
 
 enum class SecureContextMode;
 
-class CSSVariableData : public GarbageCollected<CSSVariableData> {
+class CSSVariableData {
  public:
  CSSVariableData()
  : length_(0),

diff --git a/bridge/core/css/parser/css_parser.cc b/bridge/core/css/parser/css_parser.cc
@@ -9,6 +9,7 @@
 #include "css_parser.h"
 #include "core/css/parser/css_parser_context.h"
 #include "core/css/parser/css_parser_fast_path.h"
+#include "core/base/memory/shared_ptr.h"
 #include "core/css/parser/css_parser_token_stream.h"
 #include "core/css/parser/css_property_parser.h"
 #include "core/css/parser/css_selector_parser.h"

diff --git a/bridge/core/css/parser/css_parser_impl.cc b/bridge/core/css/parser/css_parser_impl.cc
@@ -10,6 +10,7 @@
 
 #include <cassert>
 #include <vector>
+#include "core/base/memory/shared_ptr.h"
 #include "at_rule_descriptors.h"
 #include "core/base/auto_reset.h"
 #include "core/base/strings/string_util.h"

diff --git a/bridge/core/css/parser/css_property_parser.cc b/bridge/core/css/parser/css_property_parser.cc
@@ -221,7 +221,7 @@ bool CSSPropertyParser::ParseValue(CSSPropertyID unresolved_property,
  std::shared_ptr<const CSSParserContext> context,
  std::vector<CSSPropertyValue>& parsed_properties,
  StyleRule::RuleType rule_type) {
- CSSPropertyParser parser(stream, context, &parsed_properties);
+ CSSPropertyParser parser(stream, std::move(context), &parsed_properties);
  CSSPropertyID resolved_property = ResolveCSSPropertyID(unresolved_property);
 
  bool parse_success;
@@ -242,7 +242,7 @@ std::shared_ptr<const CSSValue> CSSPropertyParser::ParseSingleValue(CSSPropertyI
 
  std::shared_ptr<const CSSValue> value = css_parsing_utils::ConsumeCSSWideKeyword(stream);
  if (!value) {
- value = css_parsing_utils::ParseLonghand(property, CSSPropertyID::kInvalid, context, stream);
+ value = css_parsing_utils::ParseLonghand(property, CSSPropertyID::kInvalid, std::move(context), stream);
  }
  if (!value || !stream.AtEnd()) {
  return nullptr;

diff --git a/bridge/core/css/parser/css_selector_parser.cc b/bridge/core/css/parser/css_selector_parser.cc
@@ -77,7 +77,6 @@ CSSSelector::RelationType GetImplicitShadowCombinatorForMatching(CSSSelector::Ps
  case CSSSelector::PseudoType::kPseudoPlaceholder:
  case CSSSelector::PseudoType::kPseudoFileSelectorButton:
  case CSSSelector::PseudoType::kPseudoSelectFallbackButton:
- case CSSSelector::PseudoType::kPseudoSelectFallbackButtonIcon:
  case CSSSelector::PseudoType::kPseudoSelectFallbackButtonText:
  case CSSSelector::PseudoType::kPseudoSelectFallbackDatalist:
  return CSSSelector::RelationType::kUAShadow;
@@ -1077,7 +1076,6 @@ bool IsPseudoClassValidAfterPseudoElement(CSSSelector::PseudoType pseudo_class,
  case CSSSelector::kPseudoPart:
  // TODO(crbug.com/1511354): Add tests for the PseudoSelect cases here
  case CSSSelector::kPseudoSelectFallbackButton:
- case CSSSelector::kPseudoSelectFallbackButtonIcon:
  case CSSSelector::kPseudoSelectFallbackButtonText:
  case CSSSelector::kPseudoSelectFallbackDatalist:
  return IsUserActionPseudoClass(pseudo_class) || pseudo_class == CSSSelector::kPseudoState ||

diff --git a/bridge/core/html/collection_type.h b/bridge/core/html/collection_type.h
@@ -48,7 +48,6 @@ enum CollectionType {
  kDataListOptions,
  kMapAreas,
  kFormControls,
- kPopoverInvokers,
 
  // Named HTMLCollection types cached in the document.
  kWindowNamedItems,

diff --git a/bridge/core/html/html_collection.cc b/bridge/core/html/html_collection.cc
@@ -140,8 +140,6 @@ static NodeListInvalidationType InvalidationTypeExcludingIdAndNameAttributes(
  return kInvalidateForFormControls;
  case kClassCollectionType:
  return kInvalidateOnClassAttrChange;
- case kPopoverInvokers:
- return kInvalidateOnPopoverInvokerAttrChange;
  case kNameNodeListType:
  case kRadioNodeListType:
  case kRadioImgNodeListType:

diff --git a/bridge/foundation/strong_alias.h b/bridge/foundation/strong_alias.h
@@ -104,9 +104,6 @@ class StrongAlias {
 
  constexpr explicit operator const UnderlyingType&() const& { return value_; }
 
- friend bool operator==(const StrongAlias& lhs,
- const StrongAlias& rhs) = default;
-
  // Hasher to use in std::unordered_map, std::unordered_set, etc.
  //
  // Example usage: