| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Peter Kelly (pmk@post.com) | 4 * (C) 2001 Peter Kelly (pmk@post.com) |
| 5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 6 * (C) 2007 David Smith (catfish.man@gmail.com) | 6 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
All rights reserved. | 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
All rights reserved. |
| 8 * (C) 2007 Eric Seidel (eric@webkit.org) | 8 * (C) 2007 Eric Seidel (eric@webkit.org) |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 // other, this bookkeeping remains accurate. | 591 // other, this bookkeeping remains accurate. |
| 592 scrollState.setCurrentNativeScrollingElement(this); | 592 scrollState.setCurrentNativeScrollingElement(this); |
| 593 if (scrollState.fromUserInput()) { | 593 if (scrollState.fromUserInput()) { |
| 594 if (DocumentLoader* documentLoader = document().loader()) | 594 if (DocumentLoader* documentLoader = document().loader()) |
| 595 documentLoader->initialScrollState().wasScrolledByUser = true; | 595 documentLoader->initialScrollState().wasScrolledByUser = true; |
| 596 } | 596 } |
| 597 }; | 597 }; |
| 598 | 598 |
| 599 void Element::callApplyScroll(ScrollState& scrollState) | 599 void Element::callApplyScroll(ScrollState& scrollState) |
| 600 { | 600 { |
| 601 // Hits ASSERTs when trying to determine whether we need to scroll on main |
| 602 // or CC. http://crbug.com/625676. |
| 603 DisableCompositingQueryAsserts disabler; |
| 604 |
| 601 ScrollStateCallback* callback = scrollCustomizationCallbacks().getApplyScrol
l(this); | 605 ScrollStateCallback* callback = scrollCustomizationCallbacks().getApplyScrol
l(this); |
| 602 | 606 |
| 603 // TODO(bokan): Need to add tests before we allow calling custom callbacks | 607 // TODO(bokan): Need to add tests before we allow calling custom callbacks |
| 604 // for non-touch modalities. For now, just call into the native callback but | 608 // for non-touch modalities. For now, just call into the native callback but |
| 605 // allow the viewport scroll callback so we don't disable overscroll. | 609 // allow the viewport scroll callback so we don't disable overscroll. |
| 606 // crbug.com/623079. | 610 // crbug.com/623079. |
| 607 bool disableCustomCallbacks = !scrollState.isDirectManipulation() | 611 bool disableCustomCallbacks = !scrollState.isDirectManipulation() |
| 608 && !document().isViewportScrollCallback(callback); | 612 && !document().isViewportScrollCallback(callback); |
| 609 | 613 |
| 610 if (!callback || disableCustomCallbacks) { | 614 if (!callback || disableCustomCallbacks) { |
| (...skipping 3119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3730 | 3734 |
| 3731 DEFINE_TRACE_WRAPPERS(Element) | 3735 DEFINE_TRACE_WRAPPERS(Element) |
| 3732 { | 3736 { |
| 3733 if (hasRareData()) { | 3737 if (hasRareData()) { |
| 3734 visitor->traceWrappers(elementRareData()); | 3738 visitor->traceWrappers(elementRareData()); |
| 3735 } | 3739 } |
| 3736 ContainerNode::traceWrappers(visitor); | 3740 ContainerNode::traceWrappers(visitor); |
| 3737 } | 3741 } |
| 3738 | 3742 |
| 3739 } // namespace blink | 3743 } // namespace blink |
| OLD | NEW |