Source/web/WebInputEventConversion.cpp - Issue 14107015: Rename OS(DARWIN) to OS(MACOSX).

Side by Side Diff: Source/web/WebInputEventConversion.cpp

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « Source/web/WebFrameImpl.cpp ('k') | Source/web/WebPluginContainerImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 if (e.modifiers & WebInputEvent::ShiftKey)	131 if (e.modifiers & WebInputEvent::ShiftKey)

132 m_modifiers \|= PlatformEvent::ShiftKey;	132 m_modifiers \|= PlatformEvent::ShiftKey;

133 if (e.modifiers & WebInputEvent::ControlKey)	133 if (e.modifiers & WebInputEvent::ControlKey)

134 m_modifiers \|= PlatformEvent::CtrlKey;	134 m_modifiers \|= PlatformEvent::CtrlKey;

135 if (e.modifiers & WebInputEvent::AltKey)	135 if (e.modifiers & WebInputEvent::AltKey)

136 m_modifiers \|= PlatformEvent::AltKey;	136 m_modifiers \|= PlatformEvent::AltKey;

137 if (e.modifiers & WebInputEvent::MetaKey)	137 if (e.modifiers & WebInputEvent::MetaKey)

138 m_modifiers \|= PlatformEvent::MetaKey;	138 m_modifiers \|= PlatformEvent::MetaKey;

139	139

140 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas;	140 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas;

141 #if OS(DARWIN)	141 #if OS(MACOSX)

142 m_phase = static_cast<WebCore::PlatformWheelEventPhase>(e.phase);	142 m_phase = static_cast<WebCore::PlatformWheelEventPhase>(e.phase);

143 m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(e.momentumPh ase);	143 m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(e.momentumPh ase);

144 m_timestamp = e.timeStampSeconds;	144 m_timestamp = e.timeStampSeconds;

145 m_scrollCount = 0;	145 m_scrollCount = 0;

146 m_unacceleratedScrollingDeltaX = e.deltaX;	146 m_unacceleratedScrollingDeltaX = e.deltaX;

147 m_unacceleratedScrollingDeltaY = e.deltaY;	147 m_unacceleratedScrollingDeltaY = e.deltaY;

148 #endif	148 #endif

149 }	149 }

150	150

151 // PlatformGestureEventBuilder ------------------------------------------------- -	151 // PlatformGestureEventBuilder ------------------------------------------------- -

(...skipping 586 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
738 modifiers = getWebInputModifiers(event);	738 modifiers = getWebInputModifiers(event);

739	739

740 globalX = event.screenX();	740 globalX = event.screenX();

741 globalY = event.screenY();	741 globalY = event.screenY();

742 IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteL ocation(), *renderObject);	742 IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteL ocation(), *renderObject);

743 x = localPoint.x();	743 x = localPoint.x();

744 y = localPoint.y();	744 y = localPoint.y();

745 }	745 }

746	746

747 } // namespace WebKit	747 } // namespace WebKit

OLD	NEW