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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 #include "core/rendering/RenderMultiColumnBlock.h" | 67 #include "core/rendering/RenderMultiColumnBlock.h" |
68 #include "core/rendering/RenderNamedFlowThread.h" | 68 #include "core/rendering/RenderNamedFlowThread.h" |
69 #include "core/rendering/RenderRegion.h" | 69 #include "core/rendering/RenderRegion.h" |
70 #include "core/rendering/RenderRuby.h" | 70 #include "core/rendering/RenderRuby.h" |
71 #include "core/rendering/RenderRubyText.h" | 71 #include "core/rendering/RenderRubyText.h" |
72 #include "core/rendering/RenderScrollbarPart.h" | 72 #include "core/rendering/RenderScrollbarPart.h" |
73 #include "core/rendering/RenderTableCaption.h" | 73 #include "core/rendering/RenderTableCaption.h" |
74 #include "core/rendering/RenderTableCell.h" | 74 #include "core/rendering/RenderTableCell.h" |
75 #include "core/rendering/RenderTableCol.h" | 75 #include "core/rendering/RenderTableCol.h" |
76 #include "core/rendering/RenderTableRow.h" | 76 #include "core/rendering/RenderTableRow.h" |
| 77 #include "core/rendering/RenderTextControlPlaceholder.h" |
77 #include "core/rendering/RenderTheme.h" | 78 #include "core/rendering/RenderTheme.h" |
78 #include "core/rendering/RenderView.h" | 79 #include "core/rendering/RenderView.h" |
79 #include "core/rendering/style/ContentData.h" | 80 #include "core/rendering/style/ContentData.h" |
80 #include "core/rendering/style/CursorList.h" | 81 #include "core/rendering/style/CursorList.h" |
81 #include "core/rendering/style/ShadowList.h" | 82 #include "core/rendering/style/ShadowList.h" |
82 #include "core/rendering/svg/SVGRenderSupport.h" | 83 #include "core/rendering/svg/SVGRenderSupport.h" |
83 #include "platform/Partitions.h" | 84 #include "platform/Partitions.h" |
84 #include "platform/geometry/TransformState.h" | 85 #include "platform/geometry/TransformState.h" |
85 #include "platform/graphics/GraphicsContext.h" | 86 #include "platform/graphics/GraphicsContext.h" |
86 #include "wtf/RefCountedLeakCounter.h" | 87 #include "wtf/RefCountedLeakCounter.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 image->setStyleInternal(style); | 155 image->setStyleInternal(style); |
155 if (const StyleImage* styleImage = static_cast<const ImageContentData*>(
contentData)->image()) { | 156 if (const StyleImage* styleImage = static_cast<const ImageContentData*>(
contentData)->image()) { |
156 image->setImageResource(RenderImageResourceStyleImage::create(const_
cast<StyleImage*>(styleImage))); | 157 image->setImageResource(RenderImageResourceStyleImage::create(const_
cast<StyleImage*>(styleImage))); |
157 image->setIsGeneratedContent(); | 158 image->setIsGeneratedContent(); |
158 } else | 159 } else |
159 image->setImageResource(RenderImageResource::create()); | 160 image->setImageResource(RenderImageResource::create()); |
160 image->setStyleInternal(0); | 161 image->setStyleInternal(0); |
161 return image; | 162 return image; |
162 } | 163 } |
163 | 164 |
| 165 if (element->shadowPseudoId() == "-webkit-input-placeholder") |
| 166 return new RenderTextControlPlaceholder(element); |
| 167 |
164 if (element->hasTagName(rubyTag)) { | 168 if (element->hasTagName(rubyTag)) { |
165 if (style->display() == INLINE) | 169 if (style->display() == INLINE) |
166 return new RenderRubyAsInline(element); | 170 return new RenderRubyAsInline(element); |
167 else if (style->display() == BLOCK) | 171 else if (style->display() == BLOCK) |
168 return new RenderRubyAsBlock(element); | 172 return new RenderRubyAsBlock(element); |
169 } | 173 } |
170 // treat <rt> as ruby text ONLY if it still has its default treatment of blo
ck | 174 // treat <rt> as ruby text ONLY if it still has its default treatment of blo
ck |
171 if (element->hasTagName(rtTag) && style->display() == BLOCK) | 175 if (element->hasTagName(rtTag) && style->display() == BLOCK) |
172 return new RenderRubyText(element); | 176 return new RenderRubyText(element); |
173 | 177 |
(...skipping 3233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3407 { | 3411 { |
3408 if (object1) { | 3412 if (object1) { |
3409 const WebCore::RenderObject* root = object1; | 3413 const WebCore::RenderObject* root = object1; |
3410 while (root->parent()) | 3414 while (root->parent()) |
3411 root = root->parent(); | 3415 root = root->parent(); |
3412 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3416 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3413 } | 3417 } |
3414 } | 3418 } |
3415 | 3419 |
3416 #endif | 3420 #endif |
OLD | NEW |