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

Side by Side Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 886923003: Inline two methods with only one caller. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderLayer.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) 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 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 if (bgColor.alpha() == 255) 495 if (bgColor.alpha() == 255)
496 return true; 496 return true;
497 } 497 }
498 498
499 return false; 499 return false;
500 } 500 }
501 501
502 void RenderBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 502 void RenderBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
503 { 503 {
504 LayoutRect paintRect = LayoutRect(paintOffset, size()); 504 LayoutRect paintRect = LayoutRect(paintOffset, size());
505 paintMaskImages(paintInfo, paintRect);
506 }
507
508 void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const LayoutRect& pa intRect)
509 {
510 paintFillLayers(paintInfo, Color::transparent, style()->maskLayers(), paintR ect, BackgroundBleedNone); 505 paintFillLayers(paintInfo, Color::transparent, style()->maskLayers(), paintR ect, BackgroundBleedNone);
511 paintNinePieceImage(paintInfo.context, paintRect, style(), style()->maskBoxI mage()); 506 paintNinePieceImage(paintInfo.context, paintRect, style(), style()->maskBoxI mage());
512 } 507 }
513 508
514 void RenderBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, cons t FillLayer& fillLayer, const LayoutRect& rect, 509 void RenderBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, cons t FillLayer& fillLayer, const LayoutRect& rect,
515 BackgroundBleedAvoidance bleedAvoidance, RenderObject* backgroundObject) 510 BackgroundBleedAvoidance bleedAvoidance, RenderObject* backgroundObject)
516 { 511 {
517 Vector<const FillLayer*, 8> layers; 512 Vector<const FillLayer*, 8> layers;
518 const FillLayer* curLayer = &fillLayer; 513 const FillLayer* curLayer = &fillLayer;
519 bool shouldDrawBackgroundInSeparateBuffer = false; 514 bool shouldDrawBackgroundInSeparateBuffer = false;
(...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after
2703 2698
2704 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 2699 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
2705 { 2700 {
2706 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 2701 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
2707 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 2702 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
2708 ASSERT(hasBackground == style.hasBackground()); 2703 ASSERT(hasBackground == style.hasBackground());
2709 hasBorder = style.hasBorder(); 2704 hasBorder = style.hasBorder();
2710 } 2705 }
2711 2706
2712 } // namespace blink 2707 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698