OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
998 scrollable_area->ResizerCornerRect(bounds, kResizerForTouch); | 998 scrollable_area->ResizerCornerRect(bounds, kResizerForTouch); |
999 // Map corner to top-frame coords. | 999 // Map corner to top-frame coords. |
1000 corner = scrollable_area->Box() | 1000 corner = scrollable_area->Box() |
1001 .LocalToAbsoluteQuad(FloatRect(corner), | 1001 .LocalToAbsoluteQuad(FloatRect(corner), |
1002 kTraverseDocumentBoundaries) | 1002 kTraverseDocumentBoundaries) |
1003 .EnclosingBoundingBox(); | 1003 .EnclosingBoundingBox(); |
1004 should_handle_scroll_gesture_on_main_thread_region.Unite(corner); | 1004 should_handle_scroll_gesture_on_main_thread_region.Unite(corner); |
1005 } | 1005 } |
1006 } | 1006 } |
1007 | 1007 |
1008 if (const FrameView::PluginsSet* plugins = frame_view->Plugins()) { | 1008 for (const auto& child : frame_view->Children()) { |
1009 for (const Member<PluginView>& plugin : *plugins) { | 1009 if (child->IsPluginView()) { |
| 1010 PluginView* plugin = ToPluginView(child); |
1010 if (plugin->WantsWheelEvents()) { | 1011 if (plugin->WantsWheelEvents()) { |
1011 IntRect box = frame_view->ConvertToRootFrame(plugin->FrameRect()); | 1012 IntRect box = frame_view->ConvertToRootFrame(plugin->FrameRect()); |
1012 should_handle_scroll_gesture_on_main_thread_region.Unite(box); | 1013 should_handle_scroll_gesture_on_main_thread_region.Unite(box); |
1013 } | 1014 } |
1014 } | 1015 } |
1015 } | 1016 } |
1016 | 1017 |
1017 const FrameTree& tree = frame->Tree(); | 1018 const FrameTree& tree = frame->Tree(); |
1018 for (Frame* sub_frame = tree.FirstChild(); sub_frame; | 1019 for (Frame* sub_frame = tree.FirstChild(); sub_frame; |
1019 sub_frame = sub_frame->Tree().NextSibling()) { | 1020 sub_frame = sub_frame->Tree().NextSibling()) { |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1201 ->LayerForScrolling()) | 1202 ->LayerForScrolling()) |
1202 : nullptr) { | 1203 : nullptr) { |
1203 return WebSize( | 1204 return WebSize( |
1204 frame_view->LayoutViewportScrollableArea()->ContentsSize()) != | 1205 frame_view->LayoutViewportScrollableArea()->ContentsSize()) != |
1205 scroll_layer->Bounds(); | 1206 scroll_layer->Bounds(); |
1206 } | 1207 } |
1207 return false; | 1208 return false; |
1208 } | 1209 } |
1209 | 1210 |
1210 } // namespace blink | 1211 } // namespace blink |
OLD | NEW |