Commit ce335063 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Migrate to OS_MAC and OS_APPLE in pdf

Bug: 1105907
Change-Id: I27367f42ea8797dfac1add4d3568ed35fce558f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324893Reviewed-by: default avatardsinclair <dsinclair@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792716}
parent c21a2378
...@@ -277,7 +277,7 @@ bool IsLinkArea(PDFiumPage::Area area) { ...@@ -277,7 +277,7 @@ bool IsLinkArea(PDFiumPage::Area area) {
// button down events into a right button down events. // button down events into a right button down events.
MouseInputEvent NormalizeMouseEvent(const MouseInputEvent& event) { MouseInputEvent NormalizeMouseEvent(const MouseInputEvent& event) {
MouseInputEvent normalized_event = event; MouseInputEvent normalized_event = event;
#if defined(OS_MACOSX) #if defined(OS_MAC)
uint32_t modifiers = event.GetModifiers(); uint32_t modifiers = event.GetModifiers();
if ((event.GetModifiers() & kInputEventModifierControlKey) && if ((event.GetModifiers() & kInputEventModifierControlKey) &&
event.GetButton() == InputEventMouseButtonType::kLeft && event.GetButton() == InputEventMouseButtonType::kLeft &&
...@@ -1584,7 +1584,7 @@ bool PDFiumEngine::OnKeyDown(const KeyboardInputEvent& event) { ...@@ -1584,7 +1584,7 @@ bool PDFiumEngine::OnKeyDown(const KeyboardInputEvent& event) {
OnChar(synthesized); OnChar(synthesized);
} }
#if !defined(OS_MACOSX) #if !defined(OS_MAC)
// macOS doesn't have keyboard-triggered context menus. // macOS doesn't have keyboard-triggered context menus.
// Scroll focused annotation into view when context menu is invoked through // Scroll focused annotation into view when context menu is invoked through
// keyboard <Shift-F10>. // keyboard <Shift-F10>.
......
...@@ -87,7 +87,7 @@ TEST_F(FormFillerTest, DoURIActionWithKeyboardModifier) { ...@@ -87,7 +87,7 @@ TEST_F(FormFillerTest, DoURIActionWithKeyboardModifier) {
.Times(1); .Times(1);
} }
#if defined(OS_MACOSX) #if defined(OS_MAC)
#define modifier_key PP_INPUTEVENT_MODIFIER_METAKEY; #define modifier_key PP_INPUTEVENT_MODIFIER_METAKEY;
#else #else
#define modifier_key PP_INPUTEVENT_MODIFIER_CONTROLKEY #define modifier_key PP_INPUTEVENT_MODIFIER_CONTROLKEY
......
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