| OLD | NEW |
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "web/PopupMenuImpl.h" | 5 #include "web/PopupMenuImpl.h" |
| 6 | 6 |
| 7 #include "core/HTMLNames.h" | 7 #include "core/HTMLNames.h" |
| 8 #include "core/css/CSSFontSelector.h" | 8 #include "core/css/CSSFontSelector.h" |
| 9 #include "core/dom/ElementTraversal.h" | 9 #include "core/dom/ElementTraversal.h" |
| 10 #include "core/dom/ExecutionContextTask.h" | 10 #include "core/dom/ExecutionContextTask.h" |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 addProperty("visibility", String("hidden"), data); | 319 addProperty("visibility", String("hidden"), data); |
| 320 if (style->display() == EDisplay::None) | 320 if (style->display() == EDisplay::None) |
| 321 addProperty("display", String("none"), data); | 321 addProperty("display", String("none"), data); |
| 322 const ComputedStyle& baseStyle = context.baseStyle(); | 322 const ComputedStyle& baseStyle = context.baseStyle(); |
| 323 if (baseStyle.direction() != style->direction()) { | 323 if (baseStyle.direction() != style->direction()) { |
| 324 addProperty( | 324 addProperty( |
| 325 "direction", | 325 "direction", |
| 326 String(style->direction() == TextDirection::kRtl ? "rtl" : "ltr"), | 326 String(style->direction() == TextDirection::kRtl ? "rtl" : "ltr"), |
| 327 data); | 327 data); |
| 328 } | 328 } |
| 329 if (isOverride(style->unicodeBidi())) | 329 if (isOverride(style->getUnicodeBidi())) |
| 330 addProperty("unicodeBidi", String("bidi-override"), data); | 330 addProperty("unicodeBidi", String("bidi-override"), data); |
| 331 Color foregroundColor = style->visitedDependentColor(CSSPropertyColor); | 331 Color foregroundColor = style->visitedDependentColor(CSSPropertyColor); |
| 332 if (baseStyle.visitedDependentColor(CSSPropertyColor) != foregroundColor) | 332 if (baseStyle.visitedDependentColor(CSSPropertyColor) != foregroundColor) |
| 333 addProperty("color", foregroundColor.serialized(), data); | 333 addProperty("color", foregroundColor.serialized(), data); |
| 334 Color backgroundColor = | 334 Color backgroundColor = |
| 335 style->visitedDependentColor(CSSPropertyBackgroundColor); | 335 style->visitedDependentColor(CSSPropertyBackgroundColor); |
| 336 if (context.backgroundColor() != backgroundColor && | 336 if (context.backgroundColor() != backgroundColor && |
| 337 backgroundColor != Color::transparent) | 337 backgroundColor != Color::transparent) |
| 338 addProperty("backgroundColor", backgroundColor.serialized(), data); | 338 addProperty("backgroundColor", backgroundColor.serialized(), data); |
| 339 const FontDescription& baseFont = context.baseFont(); | 339 const FontDescription& baseFont = context.baseFont(); |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 } | 554 } |
| 555 | 555 |
| 556 void PopupMenuImpl::disconnectClient() { | 556 void PopupMenuImpl::disconnectClient() { |
| 557 m_ownerElement = nullptr; | 557 m_ownerElement = nullptr; |
| 558 // Cannot be done during finalization, so instead done when the | 558 // Cannot be done during finalization, so instead done when the |
| 559 // layout object is destroyed and disconnected. | 559 // layout object is destroyed and disconnected. |
| 560 dispose(); | 560 dispose(); |
| 561 } | 561 } |
| 562 | 562 |
| 563 } // namespace blink | 563 } // namespace blink |
| OLD | NEW |