OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 { | 317 { |
318 return locale().queryString(blink::WebLocalizedString::ValidationBadInputFor
DateTime); | 318 return locale().queryString(blink::WebLocalizedString::ValidationBadInputFor
DateTime); |
319 } | 319 } |
320 | 320 |
321 void BaseMultipleFieldsDateAndTimeInputType::blur() | 321 void BaseMultipleFieldsDateAndTimeInputType::blur() |
322 { | 322 { |
323 if (DateTimeEditElement* edit = dateTimeEditElement()) | 323 if (DateTimeEditElement* edit = dateTimeEditElement()) |
324 edit->blurByOwner(); | 324 edit->blurByOwner(); |
325 } | 325 } |
326 | 326 |
327 PassRefPtr<LayoutStyle> BaseMultipleFieldsDateAndTimeInputType::customStyleForLa
youtObject(PassRefPtr<LayoutStyle> originalStyle) | 327 PassRefPtr<ComputedStyle> BaseMultipleFieldsDateAndTimeInputType::customStyleFor
LayoutObject(PassRefPtr<ComputedStyle> originalStyle) |
328 { | 328 { |
329 EDisplay originalDisplay = originalStyle->display(); | 329 EDisplay originalDisplay = originalStyle->display(); |
330 EDisplay newDisplay = originalDisplay; | 330 EDisplay newDisplay = originalDisplay; |
331 if (originalDisplay == INLINE || originalDisplay == INLINE_BLOCK) | 331 if (originalDisplay == INLINE || originalDisplay == INLINE_BLOCK) |
332 newDisplay = INLINE_FLEX; | 332 newDisplay = INLINE_FLEX; |
333 else if (originalDisplay == BLOCK) | 333 else if (originalDisplay == BLOCK) |
334 newDisplay = FLEX; | 334 newDisplay = FLEX; |
335 TextDirection contentDirection = computedTextDirection(); | 335 TextDirection contentDirection = computedTextDirection(); |
336 if (originalStyle->direction() == contentDirection && originalDisplay == new
Display) | 336 if (originalStyle->direction() == contentDirection && originalDisplay == new
Display) |
337 return originalStyle; | 337 return originalStyle; |
338 | 338 |
339 RefPtr<LayoutStyle> style = LayoutStyle::clone(*originalStyle); | 339 RefPtr<ComputedStyle> style = ComputedStyle::clone(*originalStyle); |
340 style->setDirection(contentDirection); | 340 style->setDirection(contentDirection); |
341 style->setDisplay(newDisplay); | 341 style->setDisplay(newDisplay); |
342 style->setUnique(); | 342 style->setUnique(); |
343 return style.release(); | 343 return style.release(); |
344 } | 344 } |
345 | 345 |
346 void BaseMultipleFieldsDateAndTimeInputType::createShadowSubtree() | 346 void BaseMultipleFieldsDateAndTimeInputType::createShadowSubtree() |
347 { | 347 { |
348 ASSERT(element().shadow()); | 348 ASSERT(element().shadow()); |
349 | 349 |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 AXObject* BaseMultipleFieldsDateAndTimeInputType::popupRootAXObject() | 620 AXObject* BaseMultipleFieldsDateAndTimeInputType::popupRootAXObject() |
621 { | 621 { |
622 if (PickerIndicatorElement* picker = pickerIndicatorElement()) | 622 if (PickerIndicatorElement* picker = pickerIndicatorElement()) |
623 return picker->popupRootAXObject(); | 623 return picker->popupRootAXObject(); |
624 return nullptr; | 624 return nullptr; |
625 } | 625 } |
626 | 626 |
627 } // namespace blink | 627 } // namespace blink |
628 | 628 |
629 #endif | 629 #endif |
OLD | NEW |