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

Side by Side Diff: Source/core/rendering/RenderRegion.cpp

Issue 163513002: Have RenderBlockFlow sub-classes' methods call their super-class method properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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
« no previous file with comments | « Source/core/rendering/RenderProgress.cpp ('k') | Source/core/rendering/RenderRuby.cpp » ('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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 styleInfo.cached = true; 523 styleInfo.cached = true;
524 temp.set(object, styleInfo); 524 temp.set(object, styleInfo);
525 } 525 }
526 } 526 }
527 527
528 m_renderObjectRegionStyle.swap(temp); 528 m_renderObjectRegionStyle.swap(temp);
529 } 529 }
530 530
531 void RenderRegion::insertedIntoTree() 531 void RenderRegion::insertedIntoTree()
532 { 532 {
533 RenderBlock::insertedIntoTree(); 533 RenderBlockFlow::insertedIntoTree();
534 534
535 attachRegion(); 535 attachRegion();
536 } 536 }
537 537
538 void RenderRegion::willBeRemovedFromTree() 538 void RenderRegion::willBeRemovedFromTree()
539 { 539 {
540 RenderBlock::willBeRemovedFromTree(); 540 RenderBlockFlow::willBeRemovedFromTree();
541 541
542 detachRegion(); 542 detachRegion();
543 } 543 }
544 544
545 PassRefPtr<RenderStyle> RenderRegion::computeStyleInRegion(const RenderObject* o bject) 545 PassRefPtr<RenderStyle> RenderRegion::computeStyleInRegion(const RenderObject* o bject)
546 { 546 {
547 ASSERT(object); 547 ASSERT(object);
548 ASSERT(object->view()); 548 ASSERT(object->view());
549 ASSERT(!object->isAnonymous()); 549 ASSERT(!object->isAnonymous());
550 ASSERT(object->node() && object->node()->isElementNode()); 550 ASSERT(object->node() && object->node()->isElementNode());
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 m_renderObjectRegionStyle.remove(object); 610 m_renderObjectRegionStyle.remove(object);
611 611
612 // Clear the style for the children of this object. 612 // Clear the style for the children of this object.
613 for (RenderObject* child = object->lastChild(); child; child = child->previo usSibling()) 613 for (RenderObject* child = object->lastChild(); child; child = child->previo usSibling())
614 clearObjectStyleInRegion(child); 614 clearObjectStyleInRegion(child);
615 } 615 }
616 616
617 void RenderRegion::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, La youtUnit& maxLogicalWidth) const 617 void RenderRegion::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, La youtUnit& maxLogicalWidth) const
618 { 618 {
619 if (!isValid()) { 619 if (!isValid()) {
620 RenderBlock::computeIntrinsicLogicalWidths(minLogicalWidth, maxLogicalWi dth); 620 RenderBlockFlow::computeIntrinsicLogicalWidths(minLogicalWidth, maxLogic alWidth);
621 return; 621 return;
622 } 622 }
623 623
624 minLogicalWidth = m_flowThread->minPreferredLogicalWidth(); 624 minLogicalWidth = m_flowThread->minPreferredLogicalWidth();
625 maxLogicalWidth = m_flowThread->maxPreferredLogicalWidth(); 625 maxLogicalWidth = m_flowThread->maxPreferredLogicalWidth();
626 } 626 }
627 627
628 void RenderRegion::getRanges(Vector<RefPtr<Range> >& rangeObjects) const 628 void RenderRegion::getRanges(Vector<RefPtr<Range> >& rangeObjects) const
629 { 629 {
630 RenderNamedFlowThread* namedFlow = view()->flowThreadController()->ensureRen derFlowThreadWithName(style()->regionThread()); 630 RenderNamedFlowThread* namedFlow = view()->flowThreadController()->ensureRen derFlowThreadWithName(style()->regionThread());
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 return generatingNode(); 677 return generatingNode();
678 } 678 }
679 679
680 bool RenderRegion::isElementBasedRegion() const 680 bool RenderRegion::isElementBasedRegion() const
681 { 681 {
682 Node* node = nodeForRegion(); 682 Node* node = nodeForRegion();
683 return node && node->isElementNode() && !node->isPseudoElement(); 683 return node && node->isElementNode() && !node->isPseudoElement();
684 } 684 }
685 685
686 } // namespace WebCore 686 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderProgress.cpp ('k') | Source/core/rendering/RenderRuby.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698