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 15 matching lines...) Expand all Loading... |
26 | 26 |
27 #include "config.h" | 27 #include "config.h" |
28 #include "core/frame/FrameView.h" | 28 #include "core/frame/FrameView.h" |
29 | 29 |
30 #include "core/HTMLNames.h" | 30 #include "core/HTMLNames.h" |
31 #include "core/MediaTypeNames.h" | 31 #include "core/MediaTypeNames.h" |
32 #include "core/accessibility/AXObjectCache.h" | 32 #include "core/accessibility/AXObjectCache.h" |
33 #include "core/css/FontFaceSet.h" | 33 #include "core/css/FontFaceSet.h" |
34 #include "core/css/resolver/StyleResolver.h" | 34 #include "core/css/resolver/StyleResolver.h" |
35 #include "core/dom/DocumentMarkerController.h" | 35 #include "core/dom/DocumentMarkerController.h" |
| 36 #include "core/dom/Fullscreen.h" |
36 #include "core/editing/FrameSelection.h" | 37 #include "core/editing/FrameSelection.h" |
37 #include "core/editing/RenderedPosition.h" | 38 #include "core/editing/RenderedPosition.h" |
38 #include "core/events/OverflowEvent.h" | 39 #include "core/events/OverflowEvent.h" |
39 #include "core/fetch/ResourceFetcher.h" | 40 #include "core/fetch/ResourceFetcher.h" |
40 #include "core/fetch/ResourceLoadPriorityOptimizer.h" | 41 #include "core/fetch/ResourceLoadPriorityOptimizer.h" |
41 #include "core/frame/FrameHost.h" | 42 #include "core/frame/FrameHost.h" |
42 #include "core/frame/LocalFrame.h" | 43 #include "core/frame/LocalFrame.h" |
43 #include "core/frame/Settings.h" | 44 #include "core/frame/Settings.h" |
44 #include "core/html/HTMLFrameElement.h" | 45 #include "core/html/HTMLFrameElement.h" |
45 #include "core/html/HTMLPlugInElement.h" | 46 #include "core/html/HTMLPlugInElement.h" |
(...skipping 3808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3854 | 3855 |
3855 void FrameView::positionScrollbarLayers() | 3856 void FrameView::positionScrollbarLayers() |
3856 { | 3857 { |
3857 positionScrollbarLayer(layerForHorizontalScrollbar(), horizontalScrollbar())
; | 3858 positionScrollbarLayer(layerForHorizontalScrollbar(), horizontalScrollbar())
; |
3858 positionScrollbarLayer(layerForVerticalScrollbar(), verticalScrollbar()); | 3859 positionScrollbarLayer(layerForVerticalScrollbar(), verticalScrollbar()); |
3859 positionScrollCornerLayer(layerForScrollCorner(), scrollCornerRect()); | 3860 positionScrollCornerLayer(layerForScrollCorner(), scrollCornerRect()); |
3860 } | 3861 } |
3861 | 3862 |
3862 bool FrameView::userInputScrollable(ScrollbarOrientation orientation) const | 3863 bool FrameView::userInputScrollable(ScrollbarOrientation orientation) const |
3863 { | 3864 { |
| 3865 Document* document = frame().document(); |
| 3866 Element* fullscreenElement = Fullscreen::fullscreenElementFrom(*document); |
| 3867 if (fullscreenElement && fullscreenElement != document->documentElement()) |
| 3868 return false; |
| 3869 |
3864 ScrollbarMode mode = (orientation == HorizontalScrollbar) ? | 3870 ScrollbarMode mode = (orientation == HorizontalScrollbar) ? |
3865 m_horizontalScrollbarMode : m_verticalScrollbarMode; | 3871 m_horizontalScrollbarMode : m_verticalScrollbarMode; |
3866 | 3872 |
3867 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; | 3873 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; |
3868 } | 3874 } |
3869 | 3875 |
3870 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const | 3876 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const |
3871 { | 3877 { |
3872 return false; | 3878 return false; |
3873 } | 3879 } |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4210 return; | 4216 return; |
4211 | 4217 |
4212 ScrollableArea::setScrollOrigin(origin); | 4218 ScrollableArea::setScrollOrigin(origin); |
4213 | 4219 |
4214 // Update if the scroll origin changes, since our position will be different
if the content size did not change. | 4220 // Update if the scroll origin changes, since our position will be different
if the content size did not change. |
4215 if (updatePositionAtAll && updatePositionSynchronously) | 4221 if (updatePositionAtAll && updatePositionSynchronously) |
4216 updateScrollbars(scrollOffsetDouble()); | 4222 updateScrollbars(scrollOffsetDouble()); |
4217 } | 4223 } |
4218 | 4224 |
4219 } // namespace blink | 4225 } // namespace blink |
OLD | NEW |