| 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 "config.h" | 5 #include "config.h" |
| 6 #include "web/PopupMenuImpl.h" | 6 #include "web/PopupMenuImpl.h" |
| 7 | 7 |
| 8 #include "core/HTMLNames.h" | 8 #include "core/HTMLNames.h" |
| 9 #include "core/css/CSSFontSelector.h" | 9 #include "core/css/CSSFontSelector.h" |
| 10 #include "core/dom/ElementTraversal.h" | 10 #include "core/dom/ElementTraversal.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 switch (variant) { | 61 switch (variant) { |
| 62 case FontVariantNormal: | 62 case FontVariantNormal: |
| 63 return "normal"; | 63 return "normal"; |
| 64 case FontVariantSmallCaps: | 64 case FontVariantSmallCaps: |
| 65 return "small-caps"; | 65 return "small-caps"; |
| 66 } | 66 } |
| 67 ASSERT_NOT_REACHED(); | 67 ASSERT_NOT_REACHED(); |
| 68 return nullptr; | 68 return nullptr; |
| 69 } | 69 } |
| 70 | 70 |
| 71 // TODO crbug.com/516675 Add stretch to serialization |
| 72 |
| 71 const char* fontStyleToString(FontStyle style) | 73 const char* fontStyleToString(FontStyle style) |
| 72 { | 74 { |
| 73 switch (style) { | 75 switch (style) { |
| 74 case FontStyleNormal: | 76 case FontStyleNormal: |
| 75 return "normal"; | 77 return "normal"; |
| 78 case FontStyleOblique: |
| 79 return "oblique"; |
| 76 case FontStyleItalic: | 80 case FontStyleItalic: |
| 77 return "italic"; | 81 return "italic"; |
| 78 } | 82 } |
| 79 ASSERT_NOT_REACHED(); | 83 ASSERT_NOT_REACHED(); |
| 80 return nullptr; | 84 return nullptr; |
| 81 } | 85 } |
| 82 | 86 |
| 83 const char* textTransformToString(ETextTransform transform) | 87 const char* textTransformToString(ETextTransform transform) |
| 84 { | 88 { |
| 85 switch (transform) { | 89 switch (transform) { |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 | 496 |
| 493 void PopupMenuImpl::disconnectClient() | 497 void PopupMenuImpl::disconnectClient() |
| 494 { | 498 { |
| 495 m_client = nullptr; | 499 m_client = nullptr; |
| 496 // Cannot be done during finalization, so instead done when the | 500 // Cannot be done during finalization, so instead done when the |
| 497 // layout object is destroyed and disconnected. | 501 // layout object is destroyed and disconnected. |
| 498 dispose(); | 502 dispose(); |
| 499 } | 503 } |
| 500 | 504 |
| 501 } // namespace blink | 505 } // namespace blink |
| OLD | NEW |