OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
681 | 681 |
682 const AtomicString& Internals::shadowPseudoId(Element* element) | 682 const AtomicString& Internals::shadowPseudoId(Element* element) |
683 { | 683 { |
684 ASSERT(element); | 684 ASSERT(element); |
685 return element->shadowPseudoId(); | 685 return element->shadowPseudoId(); |
686 } | 686 } |
687 | 687 |
688 String Internals::visiblePlaceholder(Element* element) | 688 String Internals::visiblePlaceholder(Element* element) |
689 { | 689 { |
690 if (element && isHTMLTextFormControlElement(*element)) { | 690 if (element && isHTMLTextFormControlElement(*element)) { |
691 if (toHTMLTextFormControlElement(element)->placeholderShouldBeVisible()) | 691 const HTMLTextFormControlElement& textFormControlElement = toHTMLTextFor
mControlElement(*element); |
692 return toHTMLTextFormControlElement(element)->placeholderElement()->
textContent(); | 692 if (!textFormControlElement.isPlaceholderVisible()) |
| 693 return String(); |
| 694 if (HTMLElement* placeholderElement = textFormControlElement.placeholder
Element()) |
| 695 return placeholderElement->textContent(); |
693 } | 696 } |
694 | 697 |
695 return String(); | 698 return String(); |
696 } | 699 } |
697 | 700 |
698 void Internals::selectColorInColorChooser(Element* element, const String& colorV
alue) | 701 void Internals::selectColorInColorChooser(Element* element, const String& colorV
alue) |
699 { | 702 { |
700 ASSERT(element); | 703 ASSERT(element); |
701 if (!isHTMLInputElement(*element)) | 704 if (!isHTMLInputElement(*element)) |
702 return; | 705 return; |
(...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2479 | 2482 |
2480 return animator->setScrollbarsVisibleForTesting(visible); | 2483 return animator->setScrollbarsVisibleForTesting(visible); |
2481 } | 2484 } |
2482 | 2485 |
2483 void Internals::forceRestrictIFramePermissions() | 2486 void Internals::forceRestrictIFramePermissions() |
2484 { | 2487 { |
2485 RuntimeEnabledFeatures::setRestrictIFramePermissionsEnabled(true); | 2488 RuntimeEnabledFeatures::setRestrictIFramePermissionsEnabled(true); |
2486 } | 2489 } |
2487 | 2490 |
2488 } // namespace blink | 2491 } // namespace blink |
OLD | NEW |