| 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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 corner.moveBy(offset); | 757 corner.moveBy(offset); |
| 758 shouldHandleScrollGestureOnMainThreadRegion.unite(corner); | 758 shouldHandleScrollGestureOnMainThreadRegion.unite(corner); |
| 759 } | 759 } |
| 760 } | 760 } |
| 761 | 761 |
| 762 if (const HashSet<RefPtr<Widget> >* children = frameView->children()) { | 762 if (const HashSet<RefPtr<Widget> >* children = frameView->children()) { |
| 763 for (HashSet<RefPtr<Widget> >::const_iterator it = children->begin(), en
d = children->end(); it != end; ++it) { | 763 for (HashSet<RefPtr<Widget> >::const_iterator it = children->begin(), en
d = children->end(); it != end; ++it) { |
| 764 if (!(*it)->isPluginView()) | 764 if (!(*it)->isPluginView()) |
| 765 continue; | 765 continue; |
| 766 | 766 |
| 767 PluginView* pluginView = toPluginView((*it).get()); | 767 PluginView* pluginView = toPluginView(it->get()); |
| 768 if (pluginView->wantsWheelEvents()) | 768 if (pluginView->wantsWheelEvents()) |
| 769 shouldHandleScrollGestureOnMainThreadRegion.unite(pluginView->fr
ameRect()); | 769 shouldHandleScrollGestureOnMainThreadRegion.unite(pluginView->fr
ameRect()); |
| 770 } | 770 } |
| 771 } | 771 } |
| 772 | 772 |
| 773 const FrameTree& tree = frame->tree(); | 773 const FrameTree& tree = frame->tree(); |
| 774 for (LocalFrame* subFrame = tree.firstChild(); subFrame; subFrame = subFrame
->tree().nextSibling()) | 774 for (LocalFrame* subFrame = tree.firstChild(); subFrame; subFrame = subFrame
->tree().nextSibling()) |
| 775 shouldHandleScrollGestureOnMainThreadRegion.unite(computeShouldHandleScr
ollGestureOnMainThreadRegion(subFrame, offset)); | 775 shouldHandleScrollGestureOnMainThreadRegion.unite(computeShouldHandleScr
ollGestureOnMainThreadRegion(subFrame, offset)); |
| 776 | 776 |
| 777 return shouldHandleScrollGestureOnMainThreadRegion; | 777 return shouldHandleScrollGestureOnMainThreadRegion; |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 976 bool frameIsScrollable = frameView && frameView->isScrollable(); | 976 bool frameIsScrollable = frameView && frameView->isScrollable(); |
| 977 if (frameIsScrollable != m_wasFrameScrollable) | 977 if (frameIsScrollable != m_wasFrameScrollable) |
| 978 return true; | 978 return true; |
| 979 | 979 |
| 980 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) | 980 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) |
| 981 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); | 981 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); |
| 982 return false; | 982 return false; |
| 983 } | 983 } |
| 984 | 984 |
| 985 } // namespace WebCore | 985 } // namespace WebCore |
| OLD | NEW |