| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 2919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2930 { | 2930 { |
| 2931 ASSERT(child->parent() == this); | 2931 ASSERT(child->parent() == this); |
| 2932 | 2932 |
| 2933 if (child->isFrameView()) | 2933 if (child->isFrameView()) |
| 2934 removeScrollableArea(toFrameView(child)); | 2934 removeScrollableArea(toFrameView(child)); |
| 2935 | 2935 |
| 2936 child->setParent(0); | 2936 child->setParent(0); |
| 2937 m_children.remove(child); | 2937 m_children.remove(child); |
| 2938 } | 2938 } |
| 2939 | 2939 |
| 2940 ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) | |
| 2941 { | |
| 2942 if (!isScrollable()) | |
| 2943 return ScrollResult(); | |
| 2944 | |
| 2945 if (m_frame->settings()->rootLayerScrolls()) | |
| 2946 return ScrollResult(); | |
| 2947 | |
| 2948 return ScrollableArea::handleWheel(wheelEvent); | |
| 2949 } | |
| 2950 | |
| 2951 bool FrameView::isVerticalDocument() const | 2940 bool FrameView::isVerticalDocument() const |
| 2952 { | 2941 { |
| 2953 LayoutView* layoutView = this->layoutView(); | 2942 LayoutView* layoutView = this->layoutView(); |
| 2954 if (!layoutView) | 2943 if (!layoutView) |
| 2955 return true; | 2944 return true; |
| 2956 | 2945 |
| 2957 return layoutView->style()->isHorizontalWritingMode(); | 2946 return layoutView->style()->isHorizontalWritingMode(); |
| 2958 } | 2947 } |
| 2959 | 2948 |
| 2960 bool FrameView::isFlippedDocument() const | 2949 bool FrameView::isFlippedDocument() const |
| (...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3978 | 3967 |
| 3979 if (!graphicsLayer) | 3968 if (!graphicsLayer) |
| 3980 return; | 3969 return; |
| 3981 | 3970 |
| 3982 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); | 3971 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); |
| 3983 | 3972 |
| 3984 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); | 3973 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); |
| 3985 } | 3974 } |
| 3986 | 3975 |
| 3987 } // namespace blink | 3976 } // namespace blink |
| OLD | NEW |