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

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

Issue 26848007: Move Navigation Timing and other various window-level objects out of page/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/History.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 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 // Try the <body> element first as a scrollbar source. 510 // Try the <body> element first as a scrollbar source.
511 Element* body = doc ? doc->body() : 0; 511 Element* body = doc ? doc->body() : 0;
512 if (body && body->renderer() && body->renderer()->style()->hasPseudoStyle(SC ROLLBAR)) 512 if (body && body->renderer() && body->renderer()->style()->hasPseudoStyle(SC ROLLBAR))
513 return RenderScrollbar::createCustomScrollbar(this, orientation, body); 513 return RenderScrollbar::createCustomScrollbar(this, orientation, body);
514 514
515 // If the <body> didn't have a custom style, then the root element might. 515 // If the <body> didn't have a custom style, then the root element might.
516 Element* docElement = doc ? doc->documentElement() : 0; 516 Element* docElement = doc ? doc->documentElement() : 0;
517 if (docElement && docElement->renderer() && docElement->renderer()->style()- >hasPseudoStyle(SCROLLBAR)) 517 if (docElement && docElement->renderer() && docElement->renderer()->style()- >hasPseudoStyle(SCROLLBAR))
518 return RenderScrollbar::createCustomScrollbar(this, orientation, docElem ent); 518 return RenderScrollbar::createCustomScrollbar(this, orientation, docElem ent);
519 519
520 // If we have an owning iframe/frame element, then it can set the custom scr ollbar also. 520 // If we have an owning ipage/Frame element, then it can set the custom scro llbar also.
521 RenderPart* frameRenderer = m_frame->ownerRenderer(); 521 RenderPart* frameRenderer = m_frame->ownerRenderer();
522 if (frameRenderer && frameRenderer->style()->hasPseudoStyle(SCROLLBAR)) 522 if (frameRenderer && frameRenderer->style()->hasPseudoStyle(SCROLLBAR))
523 return RenderScrollbar::createCustomScrollbar(this, orientation, 0, m_fr ame.get()); 523 return RenderScrollbar::createCustomScrollbar(this, orientation, 0, m_fr ame.get());
524 524
525 // Nobody set a custom style, so we just use a native scrollbar. 525 // Nobody set a custom style, so we just use a native scrollbar.
526 return ScrollView::createScrollbar(orientation); 526 return ScrollView::createScrollbar(orientation);
527 } 527 }
528 528
529 void FrameView::setContentsSize(const IntSize& size) 529 void FrameView::setContentsSize(const IntSize& size)
530 { 530 {
(...skipping 2209 matching lines...) Expand 10 before | Expand all | Expand 10 after
2740 2740
2741 if (!cornerStyle) { 2741 if (!cornerStyle) {
2742 // If the <body> didn't have a custom style, then the root element m ight. 2742 // If the <body> didn't have a custom style, then the root element m ight.
2743 if (Element* docElement = doc->documentElement()) { 2743 if (Element* docElement = doc->documentElement()) {
2744 if (RenderObject* renderer = docElement->renderer()) 2744 if (RenderObject* renderer = docElement->renderer())
2745 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleRe quest(SCROLLBAR_CORNER), renderer->style()); 2745 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleRe quest(SCROLLBAR_CORNER), renderer->style());
2746 } 2746 }
2747 } 2747 }
2748 2748
2749 if (!cornerStyle) { 2749 if (!cornerStyle) {
2750 // If we have an owning iframe/frame element, then it can set the cu stom scrollbar also. 2750 // If we have an owning ipage/Frame element, then it can set the cus tom scrollbar also.
2751 if (RenderPart* renderer = m_frame->ownerRenderer()) 2751 if (RenderPart* renderer = m_frame->ownerRenderer())
2752 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleReques t(SCROLLBAR_CORNER), renderer->style()); 2752 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleReques t(SCROLLBAR_CORNER), renderer->style());
2753 } 2753 }
2754 } 2754 }
2755 2755
2756 if (cornerStyle) { 2756 if (cornerStyle) {
2757 if (!m_scrollCorner) 2757 if (!m_scrollCorner)
2758 m_scrollCorner = RenderScrollbarPart::createAnonymous(doc); 2758 m_scrollCorner = RenderScrollbarPart::createAnonymous(doc);
2759 m_scrollCorner->setStyle(cornerStyle.release()); 2759 m_scrollCorner->setStyle(cornerStyle.release());
2760 invalidateScrollCorner(cornerRect); 2760 invalidateScrollCorner(cornerRect);
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
3458 void FrameView::setLayoutSizeInternal(const IntSize& size) 3458 void FrameView::setLayoutSizeInternal(const IntSize& size)
3459 { 3459 {
3460 if (m_layoutSize == size) 3460 if (m_layoutSize == size)
3461 return; 3461 return;
3462 3462
3463 m_layoutSize = size; 3463 m_layoutSize = size;
3464 contentsResized(); 3464 contentsResized();
3465 } 3465 }
3466 3466
3467 } // namespace WebCore 3467 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/History.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698