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

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

Issue 77723004: [CSS Blending] Fix isolation for the hardware path. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | no next file » | 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 2931 matching lines...) Expand 10 before | Expand all | Expand 10 after
2942 } 2942 }
2943 2943
2944 return document().styleResolver()->pseudoStyleForElement(element, pseudoStyl eRequest, parentStyle); 2944 return document().styleResolver()->pseudoStyleForElement(element, pseudoStyl eRequest, parentStyle);
2945 } 2945 }
2946 2946
2947 bool RenderObject::hasBlendMode() const 2947 bool RenderObject::hasBlendMode() const
2948 { 2948 {
2949 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style() ->hasBlendMode(); 2949 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style() ->hasBlendMode();
2950 } 2950 }
2951 2951
2952 bool RenderObject::hasIsolation() const
2953 {
2954 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style() ->hasIsolation();
2955 }
2956
2957 static Color decorationColor(const RenderObject* object, RenderStyle* style) 2952 static Color decorationColor(const RenderObject* object, RenderStyle* style)
2958 { 2953 {
2959 Color result; 2954 Color result;
2960 // Check for text decoration color first. 2955 // Check for text decoration color first.
2961 result = object->resolveColor(style, CSSPropertyTextDecorationColor); 2956 result = object->resolveColor(style, CSSPropertyTextDecorationColor);
2962 if (result.isValid()) 2957 if (result.isValid())
2963 return result; 2958 return result;
2964 if (style->textStrokeWidth() > 0) { 2959 if (style->textStrokeWidth() > 0) {
2965 // Prefer stroke color if possible but not if it's fully transparent. 2960 // Prefer stroke color if possible but not if it's fully transparent.
2966 result = object->resolveColor(style, CSSPropertyWebkitTextStrokeColor); 2961 result = object->resolveColor(style, CSSPropertyWebkitTextStrokeColor);
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
3375 { 3370 {
3376 if (object1) { 3371 if (object1) {
3377 const WebCore::RenderObject* root = object1; 3372 const WebCore::RenderObject* root = object1;
3378 while (root->parent()) 3373 while (root->parent())
3379 root = root->parent(); 3374 root = root->parent();
3380 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3375 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3381 } 3376 }
3382 } 3377 }
3383 3378
3384 #endif 3379 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698