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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 else if (originalDisplay == EDisplay::Block) | 339 else if (originalDisplay == EDisplay::Block) |
340 newDisplay = EDisplay::Flex; | 340 newDisplay = EDisplay::Flex; |
341 TextDirection contentDirection = computedTextDirection(); | 341 TextDirection contentDirection = computedTextDirection(); |
342 if (originalStyle->direction() == contentDirection && | 342 if (originalStyle->direction() == contentDirection && |
343 originalDisplay == newDisplay) | 343 originalDisplay == newDisplay) |
344 return originalStyle; | 344 return originalStyle; |
345 | 345 |
346 RefPtr<ComputedStyle> style = ComputedStyle::clone(*originalStyle); | 346 RefPtr<ComputedStyle> style = ComputedStyle::clone(*originalStyle); |
347 style->setDirection(contentDirection); | 347 style->setDirection(contentDirection); |
348 style->setDisplay(newDisplay); | 348 style->setDisplay(newDisplay); |
349 style->setUnique(); | 349 style->setUnique(true); |
350 return style.release(); | 350 return style.release(); |
351 } | 351 } |
352 | 352 |
353 void MultipleFieldsTemporalInputTypeView::createShadowSubtree() { | 353 void MultipleFieldsTemporalInputTypeView::createShadowSubtree() { |
354 DCHECK(element().shadow()); | 354 DCHECK(element().shadow()); |
355 | 355 |
356 // Element must not have a layoutObject here, because if it did | 356 // Element must not have a layoutObject here, because if it did |
357 // DateTimeEditElement::customStyleForLayoutObject() is called in | 357 // DateTimeEditElement::customStyleForLayoutObject() is called in |
358 // appendChild() before the field wrapper element is created. | 358 // appendChild() before the field wrapper element is created. |
359 // FIXME: This code should not depend on such craziness. | 359 // FIXME: This code should not depend on such craziness. |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
627 return element().locale().isRTL() ? TextDirection::kRtl : TextDirection::kLtr; | 627 return element().locale().isRTL() ? TextDirection::kRtl : TextDirection::kLtr; |
628 } | 628 } |
629 | 629 |
630 AXObject* MultipleFieldsTemporalInputTypeView::popupRootAXObject() { | 630 AXObject* MultipleFieldsTemporalInputTypeView::popupRootAXObject() { |
631 if (PickerIndicatorElement* picker = pickerIndicatorElement()) | 631 if (PickerIndicatorElement* picker = pickerIndicatorElement()) |
632 return picker->popupRootAXObject(); | 632 return picker->popupRootAXObject(); |
633 return nullptr; | 633 return nullptr; |
634 } | 634 } |
635 | 635 |
636 } // namespace blink | 636 } // namespace blink |
OLD | NEW |