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

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

Issue 23641004: Ignore should-scroll-on-main-thread if main frame is not scrollable (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 7 years, 3 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
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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 RenderObject* rootRenderer = documentElement ? documentElement->renderer () : 0; 662 RenderObject* rootRenderer = documentElement ? documentElement->renderer () : 0;
663 Node* body = document->body(); 663 Node* body = document->body();
664 if (body && body->renderer()) { 664 if (body && body->renderer()) {
665 if (body->hasTagName(framesetTag)) { 665 if (body->hasTagName(framesetTag)) {
666 vMode = ScrollbarAlwaysOff; 666 vMode = ScrollbarAlwaysOff;
667 hMode = ScrollbarAlwaysOff; 667 hMode = ScrollbarAlwaysOff;
668 } else if (body->hasTagName(bodyTag)) { 668 } else if (body->hasTagName(bodyTag)) {
669 // It's sufficient to just check the X overflow, 669 // It's sufficient to just check the X overflow,
670 // since it's illegal to have visible in only one direction. 670 // since it's illegal to have visible in only one direction.
671 RenderObject* o = rootRenderer->style()->overflowX() == OVISIBLE && isHTMLHtmlElement(document->documentElement()) ? body->renderer() : rootRend erer; 671 RenderObject* o = rootRenderer->style()->overflowX() == OVISIBLE && isHTMLHtmlElement(document->documentElement()) ? body->renderer() : rootRend erer;
672 applyOverflowToViewport(o, hMode, vMode); 672 if (o->style())
673 applyOverflowToViewport(o, hMode, vMode);
673 } 674 }
674 } else if (rootRenderer) 675 } else if (rootRenderer)
675 applyOverflowToViewport(rootRenderer, hMode, vMode); 676 applyOverflowToViewport(rootRenderer, hMode, vMode);
676 } 677 }
677 } 678 }
678 679
679 void FrameView::updateCompositingLayersAfterStyleChange() 680 void FrameView::updateCompositingLayersAfterStyleChange()
680 { 681 {
681 TRACE_EVENT0("webkit", "FrameView::updateCompositingLayersAfterStyleChange") ; 682 TRACE_EVENT0("webkit", "FrameView::updateCompositingLayersAfterStyleChange") ;
682 RenderView* renderView = this->renderView(); 683 RenderView* renderView = this->renderView();
(...skipping 2697 matching lines...) Expand 10 before | Expand all | Expand 10 after
3380 return frame().document()->existingAXObjectCache(); 3381 return frame().document()->existingAXObjectCache();
3381 return 0; 3382 return 0;
3382 } 3383 }
3383 3384
3384 bool FrameView::isMainFrame() const 3385 bool FrameView::isMainFrame() const
3385 { 3386 {
3386 return m_frame->page() && m_frame->page()->mainFrame() == m_frame; 3387 return m_frame->page() && m_frame->page()->mainFrame() == m_frame;
3387 } 3388 }
3388 3389
3389 } // namespace WebCore 3390 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698