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

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

Issue 895483002: Remove the last remnant of paint phases. (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.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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 return false; 584 return false;
585 } 585 }
586 586
587 paintInfo.context->save(); 587 paintInfo.context->save();
588 if (hasBorderRadius) 588 if (hasBorderRadius)
589 paintInfo.context->clipRoundedRect(clipRoundedRect); 589 paintInfo.context->clipRoundedRect(clipRoundedRect);
590 paintInfo.context->clip(pixelSnappedIntRect(clipRect)); 590 paintInfo.context->clip(pixelSnappedIntRect(clipRect));
591 return true; 591 return true;
592 } 592 }
593 593
594 void RenderBox::popContentsClip(PaintInfo& paintInfo, PaintPhase originalPhase, const LayoutPoint& accumulatedOffset) 594 void RenderBox::popContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumul atedOffset)
595 { 595 {
596 ASSERT(hasOverflowClip() && !layer()->isSelfPaintingLayer()); 596 ASSERT(hasOverflowClip() && !layer()->isSelfPaintingLayer());
597 paintInfo.context->restore(); 597 paintInfo.context->restore();
598 } 598 }
599 599
600 LayoutRect RenderBox::overflowClipRect(const LayoutPoint& location) 600 LayoutRect RenderBox::overflowClipRect(const LayoutPoint& location)
601 { 601 {
602 LayoutRect clipRect = borderBoxRect(); 602 LayoutRect clipRect = borderBoxRect();
603 clipRect.setLocation(location + clipRect.location() + LayoutSize(borderLeft( ), borderTop())); 603 clipRect.setLocation(location + clipRect.location() + LayoutSize(borderLeft( ), borderTop()));
604 clipRect.setSize(clipRect.size() - LayoutSize(borderLeft() + borderRight(), borderTop() + borderBottom())); 604 clipRect.setSize(clipRect.size() - LayoutSize(borderLeft() + borderRight(), borderTop() + borderBottom()));
(...skipping 2083 matching lines...) Expand 10 before | Expand all | Expand 10 after
2688 2688
2689 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 2689 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
2690 { 2690 {
2691 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 2691 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
2692 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 2692 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
2693 ASSERT(hasBackground == style.hasBackground()); 2693 ASSERT(hasBackground == style.hasBackground());
2694 hasBorder = style.hasBorder(); 2694 hasBorder = style.hasBorder();
2695 } 2695 }
2696 2696
2697 } // namespace blink 2697 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698