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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 463123003: Cleanup namespace usage in Source/core/rendering (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 4 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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 void RenderStyle::setContent(QuoteType quote, bool add) 814 void RenderStyle::setContent(QuoteType quote, bool add)
815 { 815 {
816 if (add) { 816 if (add) {
817 appendContent(ContentData::create(quote)); 817 appendContent(ContentData::create(quote));
818 return; 818 return;
819 } 819 }
820 820
821 rareNonInheritedData.access()->m_content = ContentData::create(quote); 821 rareNonInheritedData.access()->m_content = ContentData::create(quote);
822 } 822 }
823 823
824 blink::WebBlendMode RenderStyle::blendMode() const 824 WebBlendMode RenderStyle::blendMode() const
825 { 825 {
826 if (RuntimeEnabledFeatures::cssCompositingEnabled()) 826 if (RuntimeEnabledFeatures::cssCompositingEnabled())
827 return static_cast<blink::WebBlendMode>(rareNonInheritedData->m_effectiv eBlendMode); 827 return static_cast<WebBlendMode>(rareNonInheritedData->m_effectiveBlendM ode);
828 return blink::WebBlendModeNormal; 828 return WebBlendModeNormal;
829 } 829 }
830 830
831 void RenderStyle::setBlendMode(blink::WebBlendMode v) 831 void RenderStyle::setBlendMode(WebBlendMode v)
832 { 832 {
833 if (RuntimeEnabledFeatures::cssCompositingEnabled()) 833 if (RuntimeEnabledFeatures::cssCompositingEnabled())
834 rareNonInheritedData.access()->m_effectiveBlendMode = v; 834 rareNonInheritedData.access()->m_effectiveBlendMode = v;
835 } 835 }
836 836
837 bool RenderStyle::hasBlendMode() const 837 bool RenderStyle::hasBlendMode() const
838 { 838 {
839 if (RuntimeEnabledFeatures::cssCompositingEnabled()) 839 if (RuntimeEnabledFeatures::cssCompositingEnabled())
840 return static_cast<blink::WebBlendMode>(rareNonInheritedData->m_effectiv eBlendMode) != blink::WebBlendModeNormal; 840 return static_cast<WebBlendMode>(rareNonInheritedData->m_effectiveBlendM ode) != WebBlendModeNormal;
841 return false; 841 return false;
842 } 842 }
843 843
844 EIsolation RenderStyle::isolation() const 844 EIsolation RenderStyle::isolation() const
845 { 845 {
846 if (RuntimeEnabledFeatures::cssCompositingEnabled()) 846 if (RuntimeEnabledFeatures::cssCompositingEnabled())
847 return static_cast<EIsolation>(rareNonInheritedData->m_isolation); 847 return static_cast<EIsolation>(rareNonInheritedData->m_isolation);
848 return IsolationAuto; 848 return IsolationAuto;
849 } 849 }
850 850
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
1699 // right 1699 // right
1700 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1700 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1701 if (radiiSum > rect.height()) 1701 if (radiiSum > rect.height())
1702 factor = std::min(rect.height() / radiiSum, factor); 1702 factor = std::min(rect.height() / radiiSum, factor);
1703 1703
1704 ASSERT(factor <= 1); 1704 ASSERT(factor <= 1);
1705 return factor; 1705 return factor;
1706 } 1706 }
1707 1707
1708 } // namespace blink 1708 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/svg/SVGRenderingContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698