| 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 2927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2938 if (child->isFrameView()) | 2938 if (child->isFrameView()) |
| 2939 removeScrollableArea(toFrameView(child)); | 2939 removeScrollableArea(toFrameView(child)); |
| 2940 | 2940 |
| 2941 child->setParent(0); | 2941 child->setParent(0); |
| 2942 m_children.remove(child); | 2942 m_children.remove(child); |
| 2943 } | 2943 } |
| 2944 | 2944 |
| 2945 ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) | 2945 ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) |
| 2946 { | 2946 { |
| 2947 if (!isScrollable()) | 2947 if (!isScrollable()) |
| 2948 return ScrollResult(false); | 2948 return ScrollResult(); |
| 2949 | 2949 |
| 2950 if (m_frame->settings()->rootLayerScrolls()) | 2950 if (m_frame->settings()->rootLayerScrolls()) |
| 2951 return ScrollResult(false); | 2951 return ScrollResult(); |
| 2952 | 2952 |
| 2953 return ScrollableArea::handleWheel(wheelEvent); | 2953 return ScrollableArea::handleWheel(wheelEvent); |
| 2954 } | 2954 } |
| 2955 | 2955 |
| 2956 bool FrameView::isVerticalDocument() const | 2956 bool FrameView::isVerticalDocument() const |
| 2957 { | 2957 { |
| 2958 LayoutView* layoutView = this->layoutView(); | 2958 LayoutView* layoutView = this->layoutView(); |
| 2959 if (!layoutView) | 2959 if (!layoutView) |
| 2960 return true; | 2960 return true; |
| 2961 | 2961 |
| (...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4020 | 4020 |
| 4021 if (!graphicsLayer) | 4021 if (!graphicsLayer) |
| 4022 return; | 4022 return; |
| 4023 | 4023 |
| 4024 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); | 4024 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); |
| 4025 | 4025 |
| 4026 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); | 4026 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); |
| 4027 } | 4027 } |
| 4028 | 4028 |
| 4029 } // namespace blink | 4029 } // namespace blink |
| OLD | NEW |