Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 662393003: Revert 183623 "Fix fullscreen elements in pinch viewport mode." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2194/
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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"
37 #include "core/editing/FrameSelection.h" 36 #include "core/editing/FrameSelection.h"
38 #include "core/editing/RenderedPosition.h" 37 #include "core/editing/RenderedPosition.h"
39 #include "core/events/OverflowEvent.h" 38 #include "core/events/OverflowEvent.h"
40 #include "core/fetch/ResourceFetcher.h" 39 #include "core/fetch/ResourceFetcher.h"
41 #include "core/fetch/ResourceLoadPriorityOptimizer.h" 40 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
42 #include "core/frame/FrameHost.h" 41 #include "core/frame/FrameHost.h"
43 #include "core/frame/LocalFrame.h" 42 #include "core/frame/LocalFrame.h"
44 #include "core/frame/Settings.h" 43 #include "core/frame/Settings.h"
45 #include "core/html/HTMLFrameElement.h" 44 #include "core/html/HTMLFrameElement.h"
46 #include "core/html/HTMLPlugInElement.h" 45 #include "core/html/HTMLPlugInElement.h"
(...skipping 3674 matching lines...) Expand 10 before | Expand all | Expand 10 after
3721 3720
3722 void FrameView::positionScrollbarLayers() 3721 void FrameView::positionScrollbarLayers()
3723 { 3722 {
3724 positionScrollbarLayer(layerForHorizontalScrollbar(), horizontalScrollbar()) ; 3723 positionScrollbarLayer(layerForHorizontalScrollbar(), horizontalScrollbar()) ;
3725 positionScrollbarLayer(layerForVerticalScrollbar(), verticalScrollbar()); 3724 positionScrollbarLayer(layerForVerticalScrollbar(), verticalScrollbar());
3726 positionScrollCornerLayer(layerForScrollCorner(), scrollCornerRect()); 3725 positionScrollCornerLayer(layerForScrollCorner(), scrollCornerRect());
3727 } 3726 }
3728 3727
3729 bool FrameView::userInputScrollable(ScrollbarOrientation orientation) const 3728 bool FrameView::userInputScrollable(ScrollbarOrientation orientation) const
3730 { 3729 {
3731 Document* document = frame().document();
3732 Element* fullscreenElement = Fullscreen::fullscreenElementFrom(*document);
3733 if (fullscreenElement && fullscreenElement != document->documentElement())
3734 return false;
3735
3736 ScrollbarMode mode = (orientation == HorizontalScrollbar) ? 3730 ScrollbarMode mode = (orientation == HorizontalScrollbar) ?
3737 m_horizontalScrollbarMode : m_verticalScrollbarMode; 3731 m_horizontalScrollbarMode : m_verticalScrollbarMode;
3738 3732
3739 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; 3733 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn;
3740 } 3734 }
3741 3735
3742 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const 3736 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const
3743 { 3737 {
3744 return false; 3738 return false;
3745 } 3739 }
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
4003 return; 3997 return;
4004 3998
4005 ScrollableArea::setScrollOrigin(origin); 3999 ScrollableArea::setScrollOrigin(origin);
4006 4000
4007 // Update if the scroll origin changes, since our position will be different if the content size did not change. 4001 // Update if the scroll origin changes, since our position will be different if the content size did not change.
4008 if (updatePositionAtAll && updatePositionSynchronously) 4002 if (updatePositionAtAll && updatePositionSynchronously)
4009 updateScrollbars(scrollOffsetDouble()); 4003 updateScrollbars(scrollOffsetDouble());
4010 } 4004 }
4011 4005
4012 } // namespace blink 4006 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698