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

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

Issue 15012010: Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed bogus test Created 7 years, 7 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 | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/style/RenderStyle.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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2775 matching lines...) Expand 10 before | Expand all | Expand 10 after
2786 2786
2787 if (pseudoStyleRequest.pseudoId == FIRST_LINE_INHERITED) { 2787 if (pseudoStyleRequest.pseudoId == FIRST_LINE_INHERITED) {
2788 RefPtr<RenderStyle> result = document()->styleResolver()->styleForElemen t(element, parentStyle, DisallowStyleSharing); 2788 RefPtr<RenderStyle> result = document()->styleResolver()->styleForElemen t(element, parentStyle, DisallowStyleSharing);
2789 result->setStyleType(FIRST_LINE_INHERITED); 2789 result->setStyleType(FIRST_LINE_INHERITED);
2790 return result.release(); 2790 return result.release();
2791 } 2791 }
2792 2792
2793 return document()->styleResolver()->pseudoStyleForElement(element, pseudoSty leRequest, parentStyle); 2793 return document()->styleResolver()->pseudoStyleForElement(element, pseudoSty leRequest, parentStyle);
2794 } 2794 }
2795 2795
2796 bool RenderObject::hasBlendMode() const
2797 {
2798 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style() ->hasBlendMode();
2799 }
2800
2796 static Color decorationColor(RenderStyle* style) 2801 static Color decorationColor(RenderStyle* style)
2797 { 2802 {
2798 Color result; 2803 Color result;
2799 #if ENABLE(CSS3_TEXT) 2804 #if ENABLE(CSS3_TEXT)
2800 // Check for text decoration color first. 2805 // Check for text decoration color first.
2801 result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor); 2806 result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor);
2802 if (result.isValid()) 2807 if (result.isValid())
2803 return result; 2808 return result;
2804 #endif // CSS3_TEXT 2809 #endif // CSS3_TEXT
2805 if (style->textStrokeWidth() > 0) { 2810 if (style->textStrokeWidth() > 0) {
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
3185 { 3190 {
3186 if (object1) { 3191 if (object1) {
3187 const WebCore::RenderObject* root = object1; 3192 const WebCore::RenderObject* root = object1;
3188 while (root->parent()) 3193 while (root->parent())
3189 root = root->parent(); 3194 root = root->parent();
3190 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3195 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3191 } 3196 }
3192 } 3197 }
3193 3198
3194 #endif 3199 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698