| 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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 if (document().frame()->applyScrollDelta(delta, scrollState.isBeginning(
))) { | 530 if (document().frame()->applyScrollDelta(delta, scrollState.isBeginning(
))) { |
| 531 scrolled = true; | 531 scrolled = true; |
| 532 scrollState.consumeDeltaNative(scrollState.deltaX(), scrollState.del
taY()); | 532 scrollState.consumeDeltaNative(scrollState.deltaX(), scrollState.del
taY()); |
| 533 } | 533 } |
| 534 } else { | 534 } else { |
| 535 if (!layoutObject()) | 535 if (!layoutObject()) |
| 536 return; | 536 return; |
| 537 LayoutBox* curBox = layoutObject()->enclosingBox(); | 537 LayoutBox* curBox = layoutObject()->enclosingBox(); |
| 538 // FIXME: Native scrollers should only consume the scroll they | 538 // FIXME: Native scrollers should only consume the scroll they |
| 539 // apply. See crbug.com/457765. | 539 // apply. See crbug.com/457765. |
| 540 if (deltaX && curBox->scroll(ScrollLeft, ScrollByPrecisePixel, deltaX))
{ | 540 if (deltaX && curBox->scroll(ScrollLeft, ScrollByPrecisePixel, deltaX).d
idScroll) { |
| 541 scrollState.consumeDeltaNative(scrollState.deltaX(), 0); | 541 scrollState.consumeDeltaNative(scrollState.deltaX(), 0); |
| 542 scrolled = true; | 542 scrolled = true; |
| 543 } | 543 } |
| 544 | 544 |
| 545 if (deltaY && curBox->scroll(ScrollUp, ScrollByPrecisePixel, deltaY)) { | 545 if (deltaY && curBox->scroll(ScrollUp, ScrollByPrecisePixel, deltaY).did
Scroll) { |
| 546 scrollState.consumeDeltaNative(0, scrollState.deltaY()); | 546 scrollState.consumeDeltaNative(0, scrollState.deltaY()); |
| 547 scrolled = true; | 547 scrolled = true; |
| 548 } | 548 } |
| 549 } | 549 } |
| 550 | 550 |
| 551 if (!scrolled) | 551 if (!scrolled) |
| 552 return; | 552 return; |
| 553 | 553 |
| 554 // We need to setCurrentNativeScrollingElement in both the | 554 // We need to setCurrentNativeScrollingElement in both the |
| 555 // distributeScroll and applyScroll default implementations so | 555 // distributeScroll and applyScroll default implementations so |
| (...skipping 2956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3512 { | 3512 { |
| 3513 #if ENABLE(OILPAN) | 3513 #if ENABLE(OILPAN) |
| 3514 if (hasRareData()) | 3514 if (hasRareData()) |
| 3515 visitor->trace(elementRareData()); | 3515 visitor->trace(elementRareData()); |
| 3516 visitor->trace(m_elementData); | 3516 visitor->trace(m_elementData); |
| 3517 #endif | 3517 #endif |
| 3518 ContainerNode::trace(visitor); | 3518 ContainerNode::trace(visitor); |
| 3519 } | 3519 } |
| 3520 | 3520 |
| 3521 } // namespace blink | 3521 } // namespace blink |
| OLD | NEW |