Sync for validator/cpp/engine (#33283)

* Fix missing dependencies in bazel PiperOrigin-RevId: 361950699 * Fix compile errors by using re2::StringPiece PiperOrigin-RevId: 362134025 Co-authored-by: Boxiao Cao <caoboxiao@google.com>
ampproject · Mar 16, 2021 · e3f6871 · e3f6871
1 parent f83aa2c
commit e3f6871
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/validator/cpp/engine/BUILD b/validator/cpp/engine/BUILD
@@ -303,6 +303,10 @@ cc_library(
     hdrs = [
         "testing-utils.h",
     ],
+    data = [
+        "@validator//:testdata_files",
+        "@amphtml-extensions//:testdata_files",
+    ],
     deps = [
         ":error-formatter",
         "@com_google_absl//absl/strings",

diff --git a/validator/cpp/engine/parse-layout.cc b/validator/cpp/engine/parse-layout.cc
@@ -63,7 +63,9 @@ CssLength::CssLength()
       is_fluid(false),
       numeral(std::numeric_limits<double>::quiet_NaN()),
       unit(kUnitPx) {}
-CssLength::CssLength(string_view input, bool allow_auto, bool allow_fluid)
+CssLength::CssLength(
+    re2::StringPiece input,
+    bool allow_auto, bool allow_fluid)
     : is_valid(false),
       is_set(false),
       is_auto(false),

diff --git a/validator/cpp/engine/parse-layout.h b/validator/cpp/engine/parse-layout.h
@@ -21,6 +21,7 @@
 
 #include "absl/strings/string_view.h"
 #include "validator.pb.h"
+#include "re2/re2.h"
 
 namespace amp::validator::parse_layout {
 
@@ -50,8 +51,9 @@ struct CssLength {
   // Parses a given |input| value. |allow_auto| determines whether 'auto'
   // is accepted as a value. |allow_fluid| determines whether 'fluid' is
   // accepted as a value.
-  explicit CssLength(absl::string_view input, bool allow_auto,
-                     bool allow_fluid);
+  explicit CssLength(
+      re2::StringPiece input,
+      bool allow_auto, bool allow_fluid);
 };
 
 // Interprets a |layout| string, such as fixed-height, as

diff --git a/validator/cpp/engine/parse-srcset.cc b/validator/cpp/engine/parse-srcset.cc
@@ -28,7 +28,9 @@ using std::vector;
 
 namespace amp::validator::parse_srcset {
 // If parsing fails, returns false in SrcsetParsingResult.status.
-SrcsetParsingResult ParseSourceSet(absl::string_view srcset) {
+SrcsetParsingResult ParseSourceSet(
+    re2::StringPiece srcset
+) {
   // Regex for leading spaces, followed by an optional comma and whitespace,
   // followed by an URL*, followed by an optional space, followed by an
   // optional width or pixel density**, followed by spaces, followed by an

diff --git a/validator/cpp/engine/parse-srcset.h b/validator/cpp/engine/parse-srcset.h
@@ -22,6 +22,7 @@
 
 #include "absl/strings/string_view.h"
 #include "validator.pb.h"
+#include "re2/re2.h"
 
 namespace amp::validator::parse_srcset {
 
@@ -56,7 +57,9 @@ struct SrcsetParsingResult {
 // will be non-empty.
 //
 // Returns SrcsetParsingResult.
-SrcsetParsingResult ParseSourceSet(absl::string_view srcset);
+SrcsetParsingResult ParseSourceSet(
+    re2::StringPiece srcset
+);
 
 }  // namespace amp::validator::parse_srcset