| 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 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/rendering/RenderObject.h" | 28 #include "core/rendering/RenderObject.h" |
| 29 | 29 |
| 30 #include "HTMLNames.h" | 30 #include "HTMLNames.h" |
| 31 #include "core/accessibility/AXObjectCache.h" | 31 #include "core/accessibility/AXObjectCache.h" |
| 32 #include "core/css/resolver/StyleResolver.h" | 32 #include "core/css/resolver/StyleResolver.h" |
| 33 #include "core/editing/EditingBoundary.h" | 33 #include "core/editing/EditingBoundary.h" |
| 34 #include "core/editing/FrameSelection.h" | 34 #include "core/editing/FrameSelection.h" |
| 35 #include "core/editing/htmlediting.h" | 35 #include "core/editing/htmlediting.h" |
| 36 #include "core/html/HTMLAnchorElement.h" |
| 36 #include "core/html/HTMLElement.h" | 37 #include "core/html/HTMLElement.h" |
| 37 #include "core/page/EventHandler.h" | 38 #include "core/page/EventHandler.h" |
| 38 #include "core/page/Frame.h" | 39 #include "core/page/Frame.h" |
| 39 #include "core/page/FrameView.h" | 40 #include "core/page/FrameView.h" |
| 40 #include "core/page/Page.h" | 41 #include "core/page/Page.h" |
| 41 #include "core/page/Settings.h" | 42 #include "core/page/Settings.h" |
| 42 #include "core/page/animation/AnimationController.h" | 43 #include "core/page/animation/AnimationController.h" |
| 43 #include "core/platform/graphics/FloatQuad.h" | 44 #include "core/platform/graphics/FloatQuad.h" |
| 44 #include "core/platform/graphics/GraphicsContext.h" | 45 #include "core/platform/graphics/GraphicsContext.h" |
| 45 #include "core/platform/graphics/transforms/TransformState.h" | 46 #include "core/platform/graphics/transforms/TransformState.h" |
| (...skipping 2807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2853 if (currDecs & TextDecorationLineThrough) { | 2854 if (currDecs & TextDecorationLineThrough) { |
| 2854 decorations &= ~TextDecorationLineThrough; | 2855 decorations &= ~TextDecorationLineThrough; |
| 2855 linethrough = resultColor; | 2856 linethrough = resultColor; |
| 2856 } | 2857 } |
| 2857 } | 2858 } |
| 2858 if (curr->isRubyText()) | 2859 if (curr->isRubyText()) |
| 2859 return; | 2860 return; |
| 2860 curr = curr->parent(); | 2861 curr = curr->parent(); |
| 2861 if (curr && curr->isAnonymousBlock() && toRenderBlock(curr)->continuatio
n()) | 2862 if (curr && curr->isAnonymousBlock() && toRenderBlock(curr)->continuatio
n()) |
| 2862 curr = toRenderBlock(curr)->continuation(); | 2863 curr = toRenderBlock(curr)->continuation(); |
| 2863 } while (curr && decorations && (!quirksMode || !curr->node() || | 2864 } while (curr && decorations && (!quirksMode || !curr->node() || (!isHTMLAnc
horElement(curr->node()) && !curr->node()->hasTagName(fontTag)))); |
| 2864 (!curr->node()->hasTagName(aTag) && !curr->
node()->hasTagName(fontTag)))); | |
| 2865 | 2865 |
| 2866 // If we bailed out, use the element we bailed out at (typically a <font> or
<a> element). | 2866 // If we bailed out, use the element we bailed out at (typically a <font> or
<a> element). |
| 2867 if (decorations && curr) { | 2867 if (decorations && curr) { |
| 2868 styleToUse = curr->style(firstlineStyle); | 2868 styleToUse = curr->style(firstlineStyle); |
| 2869 resultColor = decorationColor(styleToUse); | 2869 resultColor = decorationColor(styleToUse); |
| 2870 if (decorations & TextDecorationUnderline) | 2870 if (decorations & TextDecorationUnderline) |
| 2871 underline = resultColor; | 2871 underline = resultColor; |
| 2872 if (decorations & TextDecorationOverline) | 2872 if (decorations & TextDecorationOverline) |
| 2873 overline = resultColor; | 2873 overline = resultColor; |
| 2874 if (decorations & TextDecorationLineThrough) | 2874 if (decorations & TextDecorationLineThrough) |
| (...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3237 { | 3237 { |
| 3238 if (object1) { | 3238 if (object1) { |
| 3239 const WebCore::RenderObject* root = object1; | 3239 const WebCore::RenderObject* root = object1; |
| 3240 while (root->parent()) | 3240 while (root->parent()) |
| 3241 root = root->parent(); | 3241 root = root->parent(); |
| 3242 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3242 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3243 } | 3243 } |
| 3244 } | 3244 } |
| 3245 | 3245 |
| 3246 #endif | 3246 #endif |
| OLD | NEW |