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

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

Issue 16982005: Allow objects without scrollbars to be scrollable (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: CR Fixes Created 7 years, 4 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
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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 // Reset the document's scrollbars back to our defaults before we yield the floor. 299 // Reset the document's scrollbars back to our defaults before we yield the floor.
300 m_firstLayout = true; 300 m_firstLayout = true;
301 setScrollbarsSuppressed(true); 301 setScrollbarsSuppressed(true);
302 if (m_canHaveScrollbars) 302 if (m_canHaveScrollbars)
303 setScrollbarModes(ScrollbarAuto, ScrollbarAuto); 303 setScrollbarModes(ScrollbarAuto, ScrollbarAuto);
304 else 304 else
305 setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff); 305 setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff);
306 setScrollbarsSuppressed(false); 306 setScrollbarsSuppressed(false);
307 } 307 }
308 308
309 void FrameView::resetScrollbarsAndClearContentsSize()
310 {
311 resetScrollbars();
312
313 setScrollbarsSuppressed(true);
314 setContentsSize(IntSize());
315 setScrollbarsSuppressed(false);
316 }
317
318 void FrameView::init() 309 void FrameView::init()
319 { 310 {
320 reset(); 311 reset();
321 312
322 m_margins = LayoutSize(-1, -1); // undefined 313 m_margins = LayoutSize(-1, -1); // undefined
323 m_size = LayoutSize(); 314 m_size = LayoutSize();
324 315
325 // Propagate the marginwidth/height and scrolling modes to the view. 316 // Propagate the marginwidth/height and scrolling modes to the view.
326 Element* ownerElement = m_frame ? m_frame->ownerElement() : 0; 317 Element* ownerElement = m_frame ? m_frame->ownerElement() : 0;
327 if (ownerElement && (ownerElement->hasTagName(frameTag) || ownerElement->has TagName(iframeTag))) { 318 if (ownerElement && (ownerElement->hasTagName(frameTag) || ownerElement->has TagName(iframeTag))) {
(...skipping 3048 matching lines...) Expand 10 before | Expand all | Expand 10 after
3376 } 3367 }
3377 3368
3378 AXObjectCache* FrameView::axObjectCache() const 3369 AXObjectCache* FrameView::axObjectCache() const
3379 { 3370 {
3380 if (frame() && frame()->document()) 3371 if (frame() && frame()->document())
3381 return frame()->document()->existingAXObjectCache(); 3372 return frame()->document()->existingAXObjectCache();
3382 return 0; 3373 return 0;
3383 } 3374 }
3384 3375
3385 } // namespace WebCore 3376 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698