Skip to content

GitLab

T
tangled
Commit fd64fa21 authored by Ankit Kumar 🌪️'s avatar Ankit Kumar 🌪️ Committed by Commit Bot
Browse files
Options

Migrate PP_Point to gfx::Point in tests 

Replace usage of PP_Point to gfx::Point in test files.

Bug: 1101101
Change-Id: I1f7031e5b1845e0c8f063f3bfbcee877ff591c15
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2413689
Commit-Queue: Ankit Kumar 🌪️ <ankk@microsoft.com>
Reviewed-by: default avatarK. Moon <kmoon@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808513}
parent a18a2825
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
pdf/pdfium/pdfium_engine_unittest.cc
View file @ fd64fa21
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "pdf/ppapi_migration/input_event_conversions.h" #include "pdf/ppapi_migration/input_event_conversions.h"
#include "pdf/test/test_client.h" #include "pdf/test/test_client.h"
#include "pdf/test/test_document_loader.h" #include "pdf/test/test_document_loader.h"
#include "ppapi/cpp/size.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size.h"
...@@ -946,13 +946,13 @@ TEST_F(PDFiumEngineTabbingTest, MaintainViewportWhenFocusIsUpdated) { ...@@ -946,13 +946,13 @@ TEST_F(PDFiumEngineTabbingTest, MaintainViewportWhenFocusIsUpdated) {
{ {
InSequence sequence; InSequence sequence;
static constexpr PP_Point kScrollValue = {510, 478}; static constexpr gfx::Point kScrollValue = {510, 478};
EXPECT_CALL(client, ScrollToY(kScrollValue.y, false)) EXPECT_CALL(client, ScrollToY(kScrollValue.y(), false))
.WillOnce(Invoke( .WillOnce(Invoke(
[&engine]() { engine->ScrolledToYPosition(kScrollValue.y); })); [&engine]() { engine->ScrolledToYPosition(kScrollValue.y()); }));
EXPECT_CALL(client, ScrollToX(kScrollValue.x)).WillOnce(Invoke([&engine]() { EXPECT_CALL(client, ScrollToX(kScrollValue.x()))
engine->ScrolledToXPosition(kScrollValue.x); .WillOnce(Invoke(
})); [&engine]() { engine->ScrolledToXPosition(kScrollValue.x()); }));
} }
EXPECT_EQ(PDFiumEngine::FocusElementType::kNone, EXPECT_EQ(PDFiumEngine::FocusElementType::kNone,
...@@ -970,9 +970,9 @@ TEST_F(PDFiumEngineTabbingTest, MaintainViewportWhenFocusIsUpdated) { ...@@ -970,9 +970,9 @@ TEST_F(PDFiumEngineTabbingTest, MaintainViewportWhenFocusIsUpdated) {
GetFocusedElementType(engine.get())); GetFocusedElementType(engine.get()));
// Scroll focused annotation out of viewport. // Scroll focused annotation out of viewport.
static constexpr PP_Point kScrollPosition = {242, 746}; static constexpr gfx::Point kScrollPosition = {242, 746};
engine->ScrolledToXPosition(kScrollPosition.x); engine->ScrolledToXPosition(kScrollPosition.x());
engine->ScrolledToYPosition(kScrollPosition.y); engine->ScrolledToYPosition(kScrollPosition.y());
engine->UpdateFocus(/*has_focus=*/false); engine->UpdateFocus(/*has_focus=*/false);
EXPECT_EQ(PDFiumEngine::FocusElementType::kPage, EXPECT_EQ(PDFiumEngine::FocusElementType::kPage,
...@@ -999,16 +999,16 @@ TEST_F(PDFiumEngineTabbingTest, ScrollFocusedAnnotationIntoView) { ...@@ -999,16 +999,16 @@ TEST_F(PDFiumEngineTabbingTest, ScrollFocusedAnnotationIntoView) {
{ {
InSequence sequence; InSequence sequence;
static constexpr PP_Point kScrollValues[] = {{510, 478}, {510, 478}}; static constexpr gfx::Point kScrollValues[] = {{510, 478}, {510, 478}};
for (const auto& scroll_value : kScrollValues) { for (const auto& scroll_value : kScrollValues) {
EXPECT_CALL(client, ScrollToY(scroll_value.y, false)) EXPECT_CALL(client, ScrollToY(scroll_value.y(), false))
.WillOnce(Invoke([&engine, &scroll_value]() { .WillOnce(Invoke([&engine, &scroll_value]() {
engine->ScrolledToYPosition(scroll_value.y); engine->ScrolledToYPosition(scroll_value.y());
})); }));
EXPECT_CALL(client, ScrollToX(scroll_value.x)) EXPECT_CALL(client, ScrollToX(scroll_value.x()))
.WillOnce(Invoke([&engine, &scroll_value]() { .WillOnce(Invoke([&engine, &scroll_value]() {
engine->ScrolledToXPosition(scroll_value.x); engine->ScrolledToXPosition(scroll_value.x());
})); }));
} }
} }
...@@ -1028,9 +1028,9 @@ TEST_F(PDFiumEngineTabbingTest, ScrollFocusedAnnotationIntoView) { ...@@ -1028,9 +1028,9 @@ TEST_F(PDFiumEngineTabbingTest, ScrollFocusedAnnotationIntoView) {
GetFocusedElementType(engine.get())); GetFocusedElementType(engine.get()));
// Scroll focused annotation out of viewport. // Scroll focused annotation out of viewport.
static constexpr PP_Point kScrollPosition = {242, 746}; static constexpr gfx::Point kScrollPosition = {242, 746};
engine->ScrolledToXPosition(kScrollPosition.x); engine->ScrolledToXPosition(kScrollPosition.x());
engine->ScrolledToYPosition(kScrollPosition.y); engine->ScrolledToYPosition(kScrollPosition.y());
// Scroll the focused annotation into view. // Scroll the focused annotation into view.
ScrollFocusedAnnotationIntoView(engine.get()); ScrollFocusedAnnotationIntoView(engine.get());
......
pdf/pdfium/pdfium_form_filler_unittest.cc
View file @ fd64fa21
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include "pdf/pdfium/pdfium_test_base.h" #include "pdf/pdfium/pdfium_test_base.h"
#include "pdf/ppapi_migration/input_event_conversions.h" #include "pdf/ppapi_migration/input_event_conversions.h"
#include "pdf/test/test_client.h" #include "pdf/test/test_client.h"
#include "ppapi/c/pp_point.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "third_party/pdfium/public/fpdf_annot.h" #include "third_party/pdfium/public/fpdf_annot.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size.h"
using testing::InSequence; using testing::InSequence;
...@@ -114,14 +114,14 @@ TEST_F(FormFillerTest, DoURIActionWithKeyboardModifier) { ...@@ -114,14 +114,14 @@ TEST_F(FormFillerTest, DoURIActionWithKeyboardModifier) {
TEST_F(FormFillerTest, FormOnFocusChange) { TEST_F(FormFillerTest, FormOnFocusChange) {
struct { struct {
// Initial scroll position of the document. // Initial scroll position of the document.
PP_Point initial_position; gfx::Point initial_position;
// Page number on which the annotation is present. // Page number on which the annotation is present.
int page_index; int page_index;
// The index of test annotation on page_index. // The index of test annotation on page_index.
int annot_index; int annot_index;
// The scroll position to bring the annotation into view. (0,0) if the // The scroll position to bring the annotation into view. (0,0) if the
// annotation is already in view. // annotation is already in view.
PP_Point final_scroll_position; gfx::Point final_scroll_position;
} static constexpr test_cases[] = { } static constexpr test_cases[] = {
{{0, 0}, 0, 0, {242, 746}}, {{0, 0}, 0, 1, {510, 478}}, {{0, 0}, 0, 0, {242, 746}}, {{0, 0}, 0, 1, {510, 478}},
{{242, 40}, 0, 0, {0, 746}}, {{60, 758}, 0, 0, {242, 0}}, {{242, 40}, 0, 0, {0, 746}}, {{60, 758}, 0, 0, {242, 0}},
...@@ -139,19 +139,19 @@ TEST_F(FormFillerTest, FormOnFocusChange) { ...@@ -139,19 +139,19 @@ TEST_F(FormFillerTest, FormOnFocusChange) {
InSequence sequence; InSequence sequence;
for (const auto& test_case : test_cases) { for (const auto& test_case : test_cases) {
if (test_case.final_scroll_position.y != 0) { if (test_case.final_scroll_position.y() != 0) {
EXPECT_CALL(client, EXPECT_CALL(client,
ScrollToY(test_case.final_scroll_position.y, false)); ScrollToY(test_case.final_scroll_position.y(), false));
} }
if (test_case.final_scroll_position.x != 0) if (test_case.final_scroll_position.x() != 0)
EXPECT_CALL(client, ScrollToX(test_case.final_scroll_position.x)); EXPECT_CALL(client, ScrollToX(test_case.final_scroll_position.x()));
} }
} }
for (const auto& test_case : test_cases) { for (const auto& test_case : test_cases) {
// Setting up the initial scroll positions. // Setting up the initial scroll positions.
engine->ScrolledToXPosition(test_case.initial_position.x); engine->ScrolledToXPosition(test_case.initial_position.x());
engine->ScrolledToYPosition(test_case.initial_position.y); engine->ScrolledToYPosition(test_case.initial_position.y());
PDFiumPage& page = GetPDFiumPageForTest(*engine, test_case.page_index); PDFiumPage& page = GetPDFiumPageForTest(*engine, test_case.page_index);
ScopedFPDFAnnotation annot( ScopedFPDFAnnotation annot(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment