| OLD | NEW |
| 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 2334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2345 } | 2345 } |
| 2346 | 2346 |
| 2347 // FIXME: Does this do anything different than forceLayout given that we don't w
alk | 2347 // FIXME: Does this do anything different than forceLayout given that we don't w
alk |
| 2348 // the containing block chain. If not, we should change all callers to use force
Layout. | 2348 // the containing block chain. If not, we should change all callers to use force
Layout. |
| 2349 void RenderObject::forceChildLayout() | 2349 void RenderObject::forceChildLayout() |
| 2350 { | 2350 { |
| 2351 setNormalChildNeedsLayout(true); | 2351 setNormalChildNeedsLayout(true); |
| 2352 layout(); | 2352 layout(); |
| 2353 } | 2353 } |
| 2354 | 2354 |
| 2355 bool RenderObject::hasBlendMode() const | |
| 2356 { | |
| 2357 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style()
->hasBlendMode(); | |
| 2358 } | |
| 2359 | |
| 2360 void RenderObject::getTextDecorations(unsigned decorations, AppliedTextDecoratio
n& underline, AppliedTextDecoration& overline, AppliedTextDecoration& linethroug
h, bool quirksMode, bool firstlineStyle) | 2355 void RenderObject::getTextDecorations(unsigned decorations, AppliedTextDecoratio
n& underline, AppliedTextDecoration& overline, AppliedTextDecoration& linethroug
h, bool quirksMode, bool firstlineStyle) |
| 2361 { | 2356 { |
| 2362 RenderObject* curr = this; | 2357 RenderObject* curr = this; |
| 2363 RenderStyle* styleToUse = 0; | 2358 RenderStyle* styleToUse = 0; |
| 2364 unsigned currDecs = TextDecorationNone; | 2359 unsigned currDecs = TextDecorationNone; |
| 2365 Color resultColor; | 2360 Color resultColor; |
| 2366 TextDecorationStyle resultStyle; | 2361 TextDecorationStyle resultStyle; |
| 2367 do { | 2362 do { |
| 2368 styleToUse = curr->style(firstlineStyle); | 2363 styleToUse = curr->style(firstlineStyle); |
| 2369 currDecs = styleToUse->textDecoration(); | 2364 currDecs = styleToUse->textDecoration(); |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2688 { | 2683 { |
| 2689 if (object1) { | 2684 if (object1) { |
| 2690 const blink::RenderObject* root = object1; | 2685 const blink::RenderObject* root = object1; |
| 2691 while (root->parent()) | 2686 while (root->parent()) |
| 2692 root = root->parent(); | 2687 root = root->parent(); |
| 2693 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2688 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 2694 } | 2689 } |
| 2695 } | 2690 } |
| 2696 | 2691 |
| 2697 #endif | 2692 #endif |
| OLD | NEW |