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

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

Issue 182413005: Return refererence from InlineBox::root() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: re-upload because previous patch didn't upload correctly. 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
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 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. 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 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 context->beginTransparencyLayer(1); 716 context->beginTransparencyLayer(1);
717 717
718 // FIXME: Workaround for https://code.google.com/p/skia/issues/detail?id =1291. 718 // FIXME: Workaround for https://code.google.com/p/skia/issues/detail?id =1291.
719 context->clearRect(maskRect); 719 context->clearRect(maskRect);
720 720
721 // Now draw the text into the mask. We do this by painting using a speci al paint phase that signals to 721 // Now draw the text into the mask. We do this by painting using a speci al paint phase that signals to
722 // InlineTextBoxes that they should just add their contents to the clip. 722 // InlineTextBoxes that they should just add their contents to the clip.
723 PaintInfo info(context, maskRect, PaintPhaseTextClip, PaintBehaviorForce BlackText, 0); 723 PaintInfo info(context, maskRect, PaintPhaseTextClip, PaintBehaviorForce BlackText, 0);
724 context->setCompositeOperation(CompositeSourceOver); 724 context->setCompositeOperation(CompositeSourceOver);
725 if (box) { 725 if (box) {
726 RootInlineBox* root = box->root(); 726 RootInlineBox& root = box->root();
727 box->paint(info, LayoutPoint(scrolledPaintRect.x() - box->x(), scrol ledPaintRect.y() - box->y()), root->lineTop(), root->lineBottom()); 727 box->paint(info, LayoutPoint(scrolledPaintRect.x() - box->x(), scrol ledPaintRect.y() - box->y()), root.lineTop(), root.lineBottom());
728 } else { 728 } else {
729 LayoutSize localOffset = isBox() ? toRenderBox(this)->locationOffset () : LayoutSize(); 729 LayoutSize localOffset = isBox() ? toRenderBox(this)->locationOffset () : LayoutSize();
730 paint(info, scrolledPaintRect.location() - localOffset); 730 paint(info, scrolledPaintRect.location() - localOffset);
731 } 731 }
732 732
733 context->endLayer(); 733 context->endLayer();
734 context->endLayer(); 734 context->endLayer();
735 } 735 }
736 } 736 }
737 737
(...skipping 2063 matching lines...) Expand 10 before | Expand all | Expand 10 after
2801 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2801 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2802 for (RenderObject* child = startChild; child && child != endChild; ) { 2802 for (RenderObject* child = startChild; child && child != endChild; ) {
2803 // Save our next sibling as moveChildTo will clear it. 2803 // Save our next sibling as moveChildTo will clear it.
2804 RenderObject* nextSibling = child->nextSibling(); 2804 RenderObject* nextSibling = child->nextSibling();
2805 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2805 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2806 child = nextSibling; 2806 child = nextSibling;
2807 } 2807 }
2808 } 2808 }
2809 2809
2810 } // namespace WebCore 2810 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698