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

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

Issue 210043008: Kill outlineBox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined patch, hoping it would solve the bot failure I can't reproduce locally Created 6 years, 9 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/rendering/RenderBox.h ('k') | Source/core/rendering/RenderLayer.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 rect.move(absPos.x(), absPos.y()); 581 rect.move(absPos.x(), absPos.y());
582 return rect; 582 return rect;
583 } 583 }
584 584
585 FloatQuad RenderBox::absoluteContentQuad() const 585 FloatQuad RenderBox::absoluteContentQuad() const
586 { 586 {
587 LayoutRect rect = contentBoxRect(); 587 LayoutRect rect = contentBoxRect();
588 return localToAbsoluteQuad(FloatRect(rect)); 588 return localToAbsoluteQuad(FloatRect(rect));
589 } 589 }
590 590
591 LayoutRect RenderBox::outlineBoundsForRepaint(const RenderLayerModelObject* repa intContainer, const RenderGeometryMap* geometryMap) const
592 {
593 LayoutRect box = borderBoundingBox();
594 adjustRectForOutline(box);
595
596 if (repaintContainer != this) {
597 FloatQuad containerRelativeQuad;
598 if (geometryMap)
599 containerRelativeQuad = geometryMap->mapToContainer(box, repaintCont ainer);
600 else
601 containerRelativeQuad = localToContainerQuad(FloatRect(box), repaint Container);
602
603 box = containerRelativeQuad.enclosingBoundingBox();
604 }
605
606 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) {
607 // FIXME: layoutDelta needs to be applied in parts before/after transfor ms and
608 // repaint containers. https://bugs.webkit.org/show_bug.cgi?id=23308
609 box.move(view()->layoutDelta());
610 }
611
612 return box;
613 }
614
615 void RenderBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& add itionalOffset, const RenderLayerModelObject*) 591 void RenderBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& add itionalOffset, const RenderLayerModelObject*)
616 { 592 {
617 if (!size().isEmpty()) 593 if (!size().isEmpty())
618 rects.append(pixelSnappedIntRect(additionalOffset, size())); 594 rects.append(pixelSnappedIntRect(additionalOffset, size()));
619 } 595 }
620 596
621 bool RenderBox::canResize() const 597 bool RenderBox::canResize() const
622 { 598 {
623 // We need a special case for <iframe> because they never have 599 // We need a special case for <iframe> because they never have
624 // hasOverflowClip(). However, they do "implicitly" clip their contents, so 600 // hasOverflowClip(). However, they do "implicitly" clip their contents, so
(...skipping 4060 matching lines...) Expand 10 before | Expand all | Expand 10 after
4685 return 0; 4661 return 0;
4686 4662
4687 if (!layoutState && !flowThreadContainingBlock()) 4663 if (!layoutState && !flowThreadContainingBlock())
4688 return 0; 4664 return 0;
4689 4665
4690 RenderBlock* containerBlock = containingBlock(); 4666 RenderBlock* containerBlock = containingBlock();
4691 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4667 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4692 } 4668 }
4693 4669
4694 } // namespace WebCore 4670 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698