| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 #include "sky/engine/platform/graphics/GraphicsContext.h" | 75 #include "sky/engine/platform/graphics/GraphicsContext.h" |
| 76 #include "sky/engine/platform/graphics/Image.h" | 76 #include "sky/engine/platform/graphics/Image.h" |
| 77 #include "sky/engine/platform/graphics/ImageBuffer.h" | 77 #include "sky/engine/platform/graphics/ImageBuffer.h" |
| 78 #include "sky/engine/platform/scroll/Scrollbar.h" | 78 #include "sky/engine/platform/scroll/Scrollbar.h" |
| 79 #include "sky/engine/public/platform/Platform.h" | 79 #include "sky/engine/public/platform/Platform.h" |
| 80 #include "sky/engine/public/platform/WebFloatPoint.h" | 80 #include "sky/engine/public/platform/WebFloatPoint.h" |
| 81 #include "sky/engine/public/platform/WebImage.h" | 81 #include "sky/engine/public/platform/WebImage.h" |
| 82 #include "sky/engine/public/platform/WebLayerTreeView.h" | 82 #include "sky/engine/public/platform/WebLayerTreeView.h" |
| 83 #include "sky/engine/public/platform/WebURLRequest.h" | 83 #include "sky/engine/public/platform/WebURLRequest.h" |
| 84 #include "sky/engine/public/platform/WebVector.h" | 84 #include "sky/engine/public/platform/WebVector.h" |
| 85 #include "sky/engine/public/web/WebActiveWheelFlingParameters.h" | |
| 86 #include "sky/engine/public/web/WebBeginFrameArgs.h" | 85 #include "sky/engine/public/web/WebBeginFrameArgs.h" |
| 87 #include "sky/engine/public/web/WebFrameClient.h" | 86 #include "sky/engine/public/web/WebFrameClient.h" |
| 88 #include "sky/engine/public/web/WebHitTestResult.h" | 87 #include "sky/engine/public/web/WebHitTestResult.h" |
| 89 #include "sky/engine/public/web/WebNode.h" | 88 #include "sky/engine/public/web/WebNode.h" |
| 90 #include "sky/engine/public/web/WebRange.h" | 89 #include "sky/engine/public/web/WebRange.h" |
| 91 #include "sky/engine/public/web/WebTextInputInfo.h" | 90 #include "sky/engine/public/web/WebTextInputInfo.h" |
| 92 #include "sky/engine/public/web/WebViewClient.h" | 91 #include "sky/engine/public/web/WebViewClient.h" |
| 93 #include "sky/engine/web/CompositionUnderlineVectorBuilder.h" | 92 #include "sky/engine/web/CompositionUnderlineVectorBuilder.h" |
| 94 #include "sky/engine/web/WebInputEventConversion.h" | 93 #include "sky/engine/web/WebInputEventConversion.h" |
| 95 #include "sky/engine/web/WebLocalFrameImpl.h" | 94 #include "sky/engine/web/WebLocalFrameImpl.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 bool eventSwallowed = false; | 208 bool eventSwallowed = false; |
| 210 bool eventCancelled = false; // for disambiguation | 209 bool eventCancelled = false; // for disambiguation |
| 211 | 210 |
| 212 PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), even
t); | 211 PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), even
t); |
| 213 | 212 |
| 214 // FIXME: Remove redundant hit tests by pushing the call to EventHandler::ta
rgetGestureEvent | 213 // FIXME: Remove redundant hit tests by pushing the call to EventHandler::ta
rgetGestureEvent |
| 215 // up to this point and pass GestureEventWithHitTestResults around. | 214 // up to this point and pass GestureEventWithHitTestResults around. |
| 216 | 215 |
| 217 switch (event.type) { | 216 switch (event.type) { |
| 218 case WebInputEvent::GestureTap: { | 217 case WebInputEvent::GestureTap: { |
| 219 m_client->cancelScheduledContentIntents(); | |
| 220 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); | 218 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); |
| 221 break; | 219 break; |
| 222 } | 220 } |
| 223 case WebInputEvent::GestureTwoFingerTap: | 221 case WebInputEvent::GestureTwoFingerTap: |
| 224 case WebInputEvent::GestureLongPress: | 222 case WebInputEvent::GestureLongPress: |
| 225 case WebInputEvent::GestureLongTap: { | 223 case WebInputEvent::GestureLongTap: { |
| 226 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 224 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 227 break; | 225 break; |
| 228 | |
| 229 m_client->cancelScheduledContentIntents(); | |
| 230 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); | 226 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); |
| 231 break; | 227 break; |
| 232 } | 228 } |
| 233 case WebInputEvent::GestureShowPress: { | 229 case WebInputEvent::GestureShowPress: { |
| 234 m_client->cancelScheduledContentIntents(); | |
| 235 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); | 230 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); |
| 236 break; | 231 break; |
| 237 } | 232 } |
| 238 case WebInputEvent::GestureDoubleTap: | 233 case WebInputEvent::GestureDoubleTap: |
| 239 // GestureDoubleTap is currently only used by Android for zooming. For W
ebCore, | 234 // GestureDoubleTap is currently only used by Android for zooming. For W
ebCore, |
| 240 // GestureTap with tap count = 2 is used instead. So we drop GestureDoub
leTap here. | 235 // GestureTap with tap count = 2 is used instead. So we drop GestureDoub
leTap here. |
| 241 eventSwallowed = true; | 236 eventSwallowed = true; |
| 242 break; | 237 break; |
| 243 case WebInputEvent::GestureScrollBegin: | 238 case WebInputEvent::GestureScrollBegin: |
| 244 case WebInputEvent::GesturePinchBegin: | 239 case WebInputEvent::GesturePinchBegin: |
| 245 m_client->cancelScheduledContentIntents(); | |
| 246 case WebInputEvent::GestureTapDown: | 240 case WebInputEvent::GestureTapDown: |
| 247 case WebInputEvent::GestureScrollEnd: | 241 case WebInputEvent::GestureScrollEnd: |
| 248 case WebInputEvent::GestureScrollUpdate: | 242 case WebInputEvent::GestureScrollUpdate: |
| 249 case WebInputEvent::GestureScrollUpdateWithoutPropagation: | 243 case WebInputEvent::GestureScrollUpdateWithoutPropagation: |
| 250 case WebInputEvent::GestureTapCancel: | 244 case WebInputEvent::GestureTapCancel: |
| 251 case WebInputEvent::GestureTapUnconfirmed: | 245 case WebInputEvent::GestureTapUnconfirmed: |
| 252 case WebInputEvent::GesturePinchEnd: | 246 case WebInputEvent::GesturePinchEnd: |
| 253 case WebInputEvent::GesturePinchUpdate: | 247 case WebInputEvent::GesturePinchUpdate: |
| 254 case WebInputEvent::GestureFlingStart: { | 248 case WebInputEvent::GestureFlingStart: { |
| 255 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); | 249 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureE
vent(platformEvent); |
| (...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1279 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState, | 1273 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState, |
| 1280 bool isInitialState) { | 1274 bool isInitialState) { |
| 1281 if (!page()) | 1275 if (!page()) |
| 1282 return; | 1276 return; |
| 1283 | 1277 |
| 1284 ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState =
= WebPageVisibilityStateHidden); | 1278 ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState =
= WebPageVisibilityStateHidden); |
| 1285 m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>
(visibilityState)), isInitialState); | 1279 m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>
(visibilityState)), isInitialState); |
| 1286 } | 1280 } |
| 1287 | 1281 |
| 1288 } // namespace blink | 1282 } // namespace blink |
| OLD | NEW |