Attachment #224930 for bug #129035

View Details Raw Unified Return to Bug 129035

| Differences between



2014-02-21  Ryosuke Niwa  <rniwa@webkit.org>

        Inner text element should not use -webkit-user-modify
        https://bugs.webkit.org/show_bug.cgi?id=129035

        Reviewed by NOBODY (OOPS!).

        To eliminate the internal use of -webkit-user-modify, use contenteditable attribute in the inner text elements
        instead of manually inspecting disabled-ness and readonly-ness in RenderTextControl.

        Unfortunately, we still have to manually set UserModify value in RenderTextControl::adjustInnerTextStyle since
        RenderTextControl::styleDidChange creates RenderStyle for its inner text from scratch via createInnerTextStyle.    

        * html/HTMLFieldSetElement.cpp:
        (WebCore::HTMLFieldSetElement::disabledStateChanged): Don't use childrenOfType iterator which asserts that DOM
        isn't mutated during the traversal since we now set contenteditable attribute inside disabledStateChanged via
        updateFromControlElementsAncestorDisabledStateUnder.

        * html/HTMLFormControlElement.cpp:
        (WebCore::HTMLFormControlElement::parseAttribute): Extracted readOnlyAttributeChanged out of this function so
        that HTMLTextFormControl could override it to call updateInnerTextElementEditability.
        (WebCore::HTMLFormControlElement::readOnlyAttributeChanged): Ditto.
        * html/HTMLFormControlElement.h:

        * html/HTMLInputElement.cpp:
        (WebCore::HTMLInputElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability after creating
        shadow DOM for the current input type.
        (WebCore::HTMLInputElement::updateType): Ditto.
        (WebCore::HTMLInputElement::parseAttribute): Ditto.

        * html/HTMLTextAreaElement.cpp:
        (WebCore::HTMLTextAreaElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability.

        * html/HTMLTextFormControlElement.cpp:
        (WebCore::HTMLTextFormControlElement::disabledStateChanged): Added to update contenteditable attribute since
        the editability of the inner text element depends on disabled-ness of the element.
        (WebCore::HTMLTextFormControlElement::readOnlyAttributeChanged): Ditto for the readonly-ness of the element.
        (WebCore::HTMLTextFormControlElement::updateInnerTextElementEditability): Added.
        * html/HTMLTextFormControlElement.h:

        * rendering/RenderTextControl.cpp:
        (WebCore::RenderTextControl::adjustInnerTextStyle): Use the inner text element's presentationAttributeStyle() to
        compute the appropriate EUserModify value instead of hard-coding it here.
        * rendering/RenderTextControl.h:

2014-02-20  ChangSeok Oh  <changseok.oh@collabora.com>

        Rename EXT_draw_buffers to WEBGL_draw_buffers




    bool thisFieldsetIsDisabled = hasAttribute(disabledAttr);
    bool hasSeenFirstLegendElement = false;
    for (HTMLElement* control = Traversal<HTMLElement>::firstChild(this); control; control = Traversal<HTMLElement>::nextSibling(control)) {
        if (!hasSeenFirstLegendElement && isHTMLLegendElement(control)) {
            hasSeenFirstLegendElement = true;
            updateFromControlElementsAncestorDisabledStateUnder(*control, false /* isDisabled */);
            continue;
        }
        updateFromControlElementsAncestorDisabledStateUnder(*control, thisFieldsetIsDisabled);
    }
}




    } else if (name == readonlyAttr) {
        bool wasReadOnly = m_isReadOnly;
        m_isReadOnly = !value.isNull();
        if (wasReadOnly != m_isReadOnly)
            readOnlyAttributeChanged();
            setNeedsStyleRecalc();
            if (renderer() && renderer()->style().hasAppearance())
                renderer()->theme().stateChanged(renderer(), ReadOnlyState);
        }
    } else if (name == requiredAttr) {
        bool wasRequired = m_isRequired;
        m_isRequired = !value.isNull();

        renderer()->theme().stateChanged(renderer(), EnabledState);
}

void HTMLFormControlElement::readOnlyAttributeChanged()
{
    setNeedsWillValidateCheck();
    setNeedsStyleRecalc();
    if (renderer() && renderer()->style().hasAppearance())
        renderer()->theme().stateChanged(renderer(), ReadOnlyState);
}

void HTMLFormControlElement::requiredAttributeChanged()
{
    setNeedsValidityCheck();



    bool disabledByAncestorFieldset() const { return m_disabledByAncestorFieldset; }

    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
    virtual void requiredAttributeChanged();
    virtual void disabledAttributeChanged();
    virtual void disabledStateChanged();
    virtual void readOnlyAttributeChanged();
    virtual void requiredAttributeChanged();
    virtual void didAttachRenderers() override;
    virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
    virtual void removedFrom(ContainerNode&) override;



void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot*)
{
    m_inputType->createShadowSubtree();
    updateInnerTextElementEditability();
}

HTMLInputElement::~HTMLInputElement()


    m_inputType = std::move(newType);
    m_inputType->createShadowSubtree();
    updateInnerTextElementEditability();

#if ENABLE(TOUCH_EVENTS)
    bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();

    else if (name == webkitspeechAttr) {
        m_inputType->destroyShadowSubtree();
        m_inputType->createShadowSubtree();
        updateInnerTextElementEditability();

        // This renderer and its children have quite different layouts and styles depending on
        // whether the speech button is visible or not. So we reset the whole thing and recreate

Lines 110-115 PassRefPtr<HTMLTextAreaElement> HTMLText Source/WebCore/html/HTMLTextAreaElement.cpp_sec1
- Source/WebCore/html/HTMLTextAreaElement.cpp +1 lines
110	void HTMLTextAreaElement::didAddUserAgentShadowRoot(ShadowRoot* root)	110	void HTMLTextAreaElement::didAddUserAgentShadowRoot(ShadowRoot* root)
111	{	111	{
112	root->appendChild(TextControlInnerTextElement::create(document()), ASSERT_NO_EXCEPTION);	112	root->appendChild(TextControlInnerTextElement::create(document()), ASSERT_NO_EXCEPTION);
		113	updateInnerTextElementEditability();
113	}	114	}
114		115
115	const AtomicString& HTMLTextAreaElement::formControlType() const	116	const AtomicString& HTMLTextAreaElement::formControlType() const



        HTMLFormControlElementWithState::parseAttribute(name, value);
}

void HTMLTextFormControlElement::disabledStateChanged()
{
    HTMLFormControlElementWithState::disabledStateChanged();
    updateInnerTextElementEditability();
}

void HTMLTextFormControlElement::readOnlyAttributeChanged()
{
    HTMLFormControlElementWithState::disabledAttributeChanged();
    updateInnerTextElementEditability();
}

void HTMLTextFormControlElement::updateInnerTextElementEditability()
{
    if (TextControlInnerTextElement* innerText = innerTextElement())
        innerText->setAttribute(contenteditableAttr, isDisabledOrReadOnly() ? "false" : "plaintext-only");
}

bool HTMLTextFormControlElement::lastChangeWasUserEdit() const
{
    if (!isTextFormControl())

Lines 99-104 protected: Source/WebCore/html/HTMLTextFormControlElement.h_sec1
- Source/WebCore/html/HTMLTextFormControlElement.h +4 lines
99		99
100	virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;	100	virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
101		101
		102	virtual void disabledStateChanged() override;
		103	virtual void readOnlyAttributeChanged() override;
		104	void updateInnerTextElementEditability();
		105
102	void cacheSelection(int start, int end, TextFieldSelectionDirection direction)	106	void cacheSelection(int start, int end, TextFieldSelectionDirection direction)
103	{	107	{
104	m_cachedSelectionStart = start;	108	m_cachedSelectionStart = start;



#include "config.h"
#include "RenderTextControl.h"

#include "CSSPrimitiveValueMappings.h"
#include "HTMLTextFormControlElement.h"
#include "HitTestResult.h"
#include "RenderText.h"

#include "RenderTheme.h"
#include "ScrollbarTheme.h"
#include "StyleInheritedData.h"
#include "StyleProperties.h"
#include "TextControlInnerElements.h"
#include "VisiblePosition.h"
#include <wtf/unicode/CharacterNames.h>

    textFormControlElement().updatePlaceholderVisibility(false);
}

static inline bool updateUserModifyProperty(const HTMLTextFormControlElement& element, RenderStyle* style)
{
    bool isDisabled = element.isDisabledFormControl();
    bool isReadOnlyControl = element.isReadOnly();

    style->setUserModify((isReadOnlyControl || isDisabled) ? READ_ONLY : READ_WRITE_PLAINTEXT_ONLY);
    return isDisabled;
}

void RenderTextControl::adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const
{
    // The inner block, if present, always has its direction set to LTR,

    textBlockStyle->setDirection(style().direction());
    textBlockStyle->setUnicodeBidi(style().unicodeBidi());

    HTMLTextFormControlElement& control = textFormControlElement();
    if (HTMLElement* innerText = control.innerTextElement()) {
        if (const StyleProperties* properties = innerText->presentationAttributeStyle()) {
            RefPtr<CSSValue> value = properties->getPropertyCSSValue(CSSPropertyWebkitUserModify);
            if (value && value->isPrimitiveValue())
                textBlockStyle->setUserModify(toCSSPrimitiveValue(*value));
        }
    }

    if (control.isDisabledFormControl())
        textBlockStyle->setColor(theme().disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
#if PLATFORM(IOS)
    if (textBlockStyle->textSecurity() != TSNONE && !textBlockStyle->isLeftToRightDirection()) {

    return unitWidth;
}

void RenderTextControl::updateFromElement()
{
    TextControlInnerTextElement* innerText = innerTextElement();
    if (innerText && innerText->renderer())
        updateUserModifyProperty(textFormControlElement(), &innerText->renderer()->style());
}

int RenderTextControl::scrollbarThickness() const
{
    // FIXME: We should get the size of the scrollbar from the RenderTheme instead.

Lines 67-73 protected: Source/WebCore/rendering/RenderTextControl.h_sec1
- Source/WebCore/rendering/RenderTextControl.h -1 lines
67	virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;	67	virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;
68	virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const = 0;	68	virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const = 0;
69		69
70	virtual void updateFromElement() override;
71	virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;	70	virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
72	virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;	71	virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
73		72



2014-02-21  Ryosuke Niwa  <rniwa@webkit.org>

        Inner text element should not use -webkit-user-modify
        https://bugs.webkit.org/show_bug.cgi?id=129035

        Reviewed by NOBODY (OOPS!).

        Rebaselined tests as the user agent shadow DOM of input and textarea elements now have contenteditable attribute.

        * editing/input/paste-text-ending-with-interchange-newline-expected.txt:
        * editing/inserting/5607069-2-expected.txt:
        * editing/inserting/5607069-3-expected.txt:
        * editing/pasteboard/copy-image-with-alt-text-expected.txt:
        * editing/pasteboard/copy-null-characters-expected.txt:
        * editing/pasteboard/nested-blocks-with-text-area-expected.txt:
        * editing/pasteboard/nested-blocks-with-text-field-expected.txt:
        * editing/selection/dump-as-markup-expected.txt:
        * editing/selection/dump-as-markup-form-text-expected.txt:
        * fast/forms/suggested-value-after-setvalue-expected.txt:
        * fast/forms/suggested-value-expected.txt:
        * fast/parser/object-with-textarea-fallback-expected.txt:

2014-02-20  ChangSeok Oh  <changseok.oh@collabora.com>

        Rename EXT_draw_buffers to WEBGL_draw_buffers

Lines 1-4 LayoutTests/editing/input/paste-text-ending-with-interchange-newline-expected.txt_sec1
- LayoutTests/editing/input/paste-text-ending-with-interchange-newline-expected.txt +1 lines
1	This tests pasting a text with an interchange new line at the end. WebKit shouldn't insert a new line.	1	This tests pasting a text with an interchange new line at the end. WebKit shouldn't insert a new line.
2	\| <shadow:root>	2	\| <shadow:root>
3	\| <div>	3	\| <div>
		4	\| contenteditable="plaintext-only"
4	\| "abc def"	5	\| "abc def"



|   this.value=""
|   <shadow:root>
|     <div>
|       contenteditable="plaintext-only"
| <br>
| <input>
|   type="text"
|   this.value=""
|   <shadow:root>
|     <div>
|       contenteditable="plaintext-only"

Lines 6-11 This tests for a bug in InsertParagraph LayoutTests/editing/inserting/5607069-3-expected.txt_sec1
- LayoutTests/editing/inserting/5607069-3-expected.txt +2 lines
6	\| this.value=""	6	\| this.value=""
7	\| <shadow:root>	7	\| <shadow:root>
8	\| <div>	8	\| <div>
		9	\| contenteditable="plaintext-only"
9	\| "x"	10	\| "x"
10	\| <br>	11	\| <br>
11	\| "<#selection-caret>x"	12	\| "<#selection-caret>x"
Lines 14-16 This tests for a bug in InsertParagraph LayoutTests/editing/inserting/5607069-3-expected.txt_sec2
14	\| this.value=""	15	\| this.value=""
15	\| <shadow:root>	16	\| <shadow:root>
16	\| <div>	17	\| <div>
		18	\| contenteditable="plaintext-only"



Dump of markup 1:
|   <shadow:root>
|     <div>
|       contenteditable="plaintext-only"
|       "Here is an emoticon [], some more text [], an empty alt tag [], no alt tag [] and two consecutive images [].

"

Dump of markup 3:
|   <shadow:root>
|     <div>
|       contenteditable="plaintext-only"
|       "Here is an emoticon [:)], some more text [sample text], an empty alt tag [], no alt tag [] and two consecutive images [firstsecond].

"

Lines 40-45 Copy paste me LayoutTests/editing/pasteboard/copy-null-characters-expected.txt_sec1
- LayoutTests/editing/pasteboard/copy-null-characters-expected.txt +1 lines
40	green"	40	green"
41	\| <shadow:root>	41	\| <shadow:root>
42	\| <div>	42	\| <div>
		43	\| contenteditable="plaintext-only"
43	\| "Copy paste mebold	44	\| "Copy paste mebold
44		45
45	Copy paste me	46	Copy paste me

Lines 25-30 These demonstrate 11475: the '\n's at th LayoutTests/editing/pasteboard/nested-blocks-with-text-area-expected.txt_sec1
- LayoutTests/editing/pasteboard/nested-blocks-with-text-area-expected.txt +1 lines
25	\| " "	25	\| " "
26	\| <shadow:root>	26	\| <shadow:root>
27	\| <div>	27	\| <div>
		28	\| contenteditable="plaintext-only"
28	\| " "	29	\| " "
29	\| "	30	\| "
30	x<#selection-caret>	31	x<#selection-caret>

Lines 25-30 These demonstrate 11475: the '\n's at th LayoutTests/editing/pasteboard/nested-blocks-with-text-field-expected.txt_sec1
- LayoutTests/editing/pasteboard/nested-blocks-with-text-field-expected.txt +1 lines
25	\| this.value=""	25	\| this.value=""
26	\| <shadow:root>	26	\| <shadow:root>
27	\| <div>	27	\| <div>
		28	\| contenteditable="plaintext-only"
28	\| "	29	\| "
29	x<#selection-caret>	30	x<#selection-caret>
30	"	31	"

Lines 20-25 Tests basic dump-as-markup functionality LayoutTests/editing/selection/dump-as-markup-expected.txt_sec1
- LayoutTests/editing/selection/dump-as-markup-expected.txt +1 lines
20	\| this.value=""	20	\| this.value=""
21	\| <shadow:root>	21	\| <shadow:root>
22	\| <div>	22	\| <div>
		23	\| contenteditable="plaintext-only"
23	\| "	24	\| "
24	"	25	"
25	\| <div>	26	\| <div>



|       this.value="replaced"
|       <shadow:root>
|         <div>
|           contenteditable="plaintext-only"
|           "replaced"
|     "
"

|       "original"
|       <shadow:root>
|         <div>
|           contenteditable="plaintext-only"
|           "replaced"
|     "
"



|   this.value="initial value"
|   <shadow:root>
|     <div>
|       contenteditable="plaintext-only"
|       "suggested value"
| "input.value: initial value"
| "internals.suggestedValue(input): suggested value"

|   this.value="new value"
|   <shadow:root>
|     <div>
|       contenteditable="plaintext-only"
|       "new value"
| "input.value: new value"
| "internals.suggestedValue(input): "

Lines 7-12 The dump below should have the "suggeste LayoutTests/fast/forms/suggested-value-expected.txt_sec1
- LayoutTests/fast/forms/suggested-value-expected.txt +1 lines
7	\| this.value="initial value"	7	\| this.value="initial value"
8	\| <shadow:root>	8	\| <shadow:root>
9	\| <div>	9	\| <div>
		10	\| contenteditable="plaintext-only"
10	\| "suggested value"	11	\| "suggested value"
11	\| "input.value: initial value"	12	\| "input.value: initial value"
12	\| "internals.suggestedValue(input): suggested value"	13	\| "internals.suggestedValue(input): suggested value"

Lines 15-20 LayoutTests/fast/parser/object-with-textarea-fallback-expected.txt_sec1
- LayoutTests/fast/parser/object-with-textarea-fallback-expected.txt +1 lines
15	\| this.value=""	15	\| this.value=""
16	\| <shadow:root>	16	\| <shadow:root>
17	\| <div>	17	\| <div>
		18	\| contenteditable="plaintext-only"
18	\| "	19	\| "
19	"	20	"
20	\| "	21	\| "

Return to Bug 129035

Lines 135-146 void HTMLFormControlElement::parseAttrib Source/WebCore/html/HTMLFormControlElement.cpp_sec1
- Source/WebCore/html/HTMLFormControlElement.cpp -6 / +10 lines
135	} else if (name == readonlyAttr) {	135	} else if (name == readonlyAttr) {
136	bool wasReadOnly = m_isReadOnly;	136	bool wasReadOnly = m_isReadOnly;
137	m_isReadOnly = !value.isNull();	137	m_isReadOnly = !value.isNull();
138	if (wasReadOnly != m_isReadOnly) {	138	if (wasReadOnly != m_isReadOnly)
139	setNeedsWillValidateCheck();	139	readOnlyAttributeChanged();
140	setNeedsStyleRecalc();
141	if (renderer() && renderer()->style().hasAppearance())
142	renderer()->theme().stateChanged(renderer(), ReadOnlyState);
143	}
144	} else if (name == requiredAttr) {	140	} else if (name == requiredAttr) {
145	bool wasRequired = m_isRequired;	141	bool wasRequired = m_isRequired;
146	m_isRequired = !value.isNull();	142	m_isRequired = !value.isNull();
Lines 167-172 void HTMLFormControlElement::disabledSta Source/WebCore/html/HTMLFormControlElement.cpp_sec2
167	renderer()->theme().stateChanged(renderer(), EnabledState);	163	renderer()->theme().stateChanged(renderer(), EnabledState);
168	}	164	}
169		165
		166	void HTMLFormControlElement::readOnlyAttributeChanged()
		167	{
		168	setNeedsWillValidateCheck();
		169	setNeedsStyleRecalc();
		170	if (renderer() && renderer()->style().hasAppearance())
		171	renderer()->theme().stateChanged(renderer(), ReadOnlyState);
		172	}
		173
170	void HTMLFormControlElement::requiredAttributeChanged()	174	void HTMLFormControlElement::requiredAttributeChanged()
171	{	175	{
172	setNeedsValidityCheck();	176	setNeedsValidityCheck();

Lines 493-498 void HTMLTextFormControlElement::parseAt Source/WebCore/html/HTMLTextFormControlElement.cpp_sec1
- Source/WebCore/html/HTMLTextFormControlElement.cpp +18 lines
493	HTMLFormControlElementWithState::parseAttribute(name, value);	493	HTMLFormControlElementWithState::parseAttribute(name, value);
494	}	494	}
495		495
		496	void HTMLTextFormControlElement::disabledStateChanged()
		497	{
		498	HTMLFormControlElementWithState::disabledStateChanged();
		499	updateInnerTextElementEditability();
		500	}
		501
		502	void HTMLTextFormControlElement::readOnlyAttributeChanged()
		503	{
		504	HTMLFormControlElementWithState::disabledAttributeChanged();
		505	updateInnerTextElementEditability();
		506	}
		507
		508	void HTMLTextFormControlElement::updateInnerTextElementEditability()
		509	{
		510	if (TextControlInnerTextElement* innerText = innerTextElement())
		511	innerText->setAttribute(contenteditableAttr, isDisabledOrReadOnly() ? "false" : "plaintext-only");
		512	}
		513
496	bool HTMLTextFormControlElement::lastChangeWasUserEdit() const	514	bool HTMLTextFormControlElement::lastChangeWasUserEdit() const
497	{	515	{
498	if (!isTextFormControl())	516	if (!isTextFormControl())

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +45 lines
		1	2014-02-21 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Inner text element should not use -webkit-user-modify
		4	https://bugs.webkit.org/show_bug.cgi?id=129035
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	To eliminate the internal use of -webkit-user-modify, use contenteditable attribute in the inner text elements
		9	instead of manually inspecting disabled-ness and readonly-ness in RenderTextControl.
		10
		11	Unfortunately, we still have to manually set UserModify value in RenderTextControl::adjustInnerTextStyle since
		12	RenderTextControl::styleDidChange creates RenderStyle for its inner text from scratch via createInnerTextStyle.
		13
		14	* html/HTMLFieldSetElement.cpp:
		15	(WebCore::HTMLFieldSetElement::disabledStateChanged): Don't use childrenOfType iterator which asserts that DOM
		16	isn't mutated during the traversal since we now set contenteditable attribute inside disabledStateChanged via
		17	updateFromControlElementsAncestorDisabledStateUnder.
		18
		19	* html/HTMLFormControlElement.cpp:
		20	(WebCore::HTMLFormControlElement::parseAttribute): Extracted readOnlyAttributeChanged out of this function so
		21	that HTMLTextFormControl could override it to call updateInnerTextElementEditability.
		22	(WebCore::HTMLFormControlElement::readOnlyAttributeChanged): Ditto.
		23	* html/HTMLFormControlElement.h:
		24
		25	* html/HTMLInputElement.cpp:
		26	(WebCore::HTMLInputElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability after creating
		27	shadow DOM for the current input type.
		28	(WebCore::HTMLInputElement::updateType): Ditto.
		29	(WebCore::HTMLInputElement::parseAttribute): Ditto.
		30
		31	* html/HTMLTextAreaElement.cpp:
		32	(WebCore::HTMLTextAreaElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability.
		33
		34	* html/HTMLTextFormControlElement.cpp:
		35	(WebCore::HTMLTextFormControlElement::disabledStateChanged): Added to update contenteditable attribute since
		36	the editability of the inner text element depends on disabled-ness of the element.
		37	(WebCore::HTMLTextFormControlElement::readOnlyAttributeChanged): Ditto for the readonly-ness of the element.
		38	(WebCore::HTMLTextFormControlElement::updateInnerTextElementEditability): Added.
		39	* html/HTMLTextFormControlElement.h:
		40
		41	* rendering/RenderTextControl.cpp:
		42	(WebCore::RenderTextControl::adjustInnerTextStyle): Use the inner text element's presentationAttributeStyle() to
		43	compute the appropriate EUserModify value instead of hard-coding it here.
		44	* rendering/RenderTextControl.h:
		45
1	2014-02-20 ChangSeok Oh <changseok.oh@collabora.com>	46	2014-02-20 ChangSeok Oh <changseok.oh@collabora.com>
2		47
3	Rename EXT_draw_buffers to WEBGL_draw_buffers	48	Rename EXT_draw_buffers to WEBGL_draw_buffers

Lines 92-104 void HTMLFieldSetElement::disabledStateC Source/WebCore/html/HTMLFieldSetElement.cpp_sec1
- Source/WebCore/html/HTMLFieldSetElement.cpp -3 / +3 lines
92		92
93	bool thisFieldsetIsDisabled = hasAttribute(disabledAttr);	93	bool thisFieldsetIsDisabled = hasAttribute(disabledAttr);
94	bool hasSeenFirstLegendElement = false;	94	bool hasSeenFirstLegendElement = false;
95	for (auto& control : childrenOfType<HTMLElement>(*this)) {	95	for (HTMLElement* control = Traversal<HTMLElement>::firstChild(this); control; control = Traversal<HTMLElement>::nextSibling(control)) {
96	if (!hasSeenFirstLegendElement && isHTMLLegendElement(control)) {	96	if (!hasSeenFirstLegendElement && isHTMLLegendElement(control)) {
97	hasSeenFirstLegendElement = true;	97	hasSeenFirstLegendElement = true;
98	updateFromControlElementsAncestorDisabledStateUnder(control, false /* isDisabled */);	98	updateFromControlElementsAncestorDisabledStateUnder(control, false / isDisabled */);
99	continue;	99	continue;
100	}	100	}
101	updateFromControlElementsAncestorDisabledStateUnder(control, thisFieldsetIsDisabled);	101	updateFromControlElementsAncestorDisabledStateUnder(*control, thisFieldsetIsDisabled);
102	}	102	}
103	}	103	}
104		104

Lines 123-131 protected: Source/WebCore/html/HTMLFormControlElement.h_sec1
- Source/WebCore/html/HTMLFormControlElement.h -1 / +2 lines
123	bool disabledByAncestorFieldset() const { return m_disabledByAncestorFieldset; }	123	bool disabledByAncestorFieldset() const { return m_disabledByAncestorFieldset; }
124		124
125	virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;	125	virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
126	virtual void requiredAttributeChanged();
127	virtual void disabledAttributeChanged();	126	virtual void disabledAttributeChanged();
128	virtual void disabledStateChanged();	127	virtual void disabledStateChanged();
		128	virtual void readOnlyAttributeChanged();
		129	virtual void requiredAttributeChanged();
129	virtual void didAttachRenderers() override;	130	virtual void didAttachRenderers() override;
130	virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;	131	virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
131	virtual void removedFrom(ContainerNode&) override;	132	virtual void removedFrom(ContainerNode&) override;

Lines 149-154 HTMLImageLoader* HTMLInputElement::image Source/WebCore/html/HTMLInputElement.cpp_sec1
- Source/WebCore/html/HTMLInputElement.cpp +3 lines
149	void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot*)	149	void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot*)
150	{	150	{
151	m_inputType->createShadowSubtree();	151	m_inputType->createShadowSubtree();
		152	updateInnerTextElementEditability();
152	}	153	}
153		154
154	HTMLInputElement::~HTMLInputElement()	155	HTMLInputElement::~HTMLInputElement()
Lines 473-478 void HTMLInputElement::updateType() Source/WebCore/html/HTMLInputElement.cpp_sec2
473		474
474	m_inputType = std::move(newType);	475	m_inputType = std::move(newType);
475	m_inputType->createShadowSubtree();	476	m_inputType->createShadowSubtree();
		477	updateInnerTextElementEditability();
476		478
477	#if ENABLE(TOUCH_EVENTS)	479	#if ENABLE(TOUCH_EVENTS)
478	bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();	480	bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();
Lines 735-740 void HTMLInputElement::parseAttribute(co Source/WebCore/html/HTMLInputElement.cpp_sec3
735	else if (name == webkitspeechAttr) {	737	else if (name == webkitspeechAttr) {
736	m_inputType->destroyShadowSubtree();	738	m_inputType->destroyShadowSubtree();
737	m_inputType->createShadowSubtree();	739	m_inputType->createShadowSubtree();
		740	updateInnerTextElementEditability();
738		741
739	// This renderer and its children have quite different layouts and styles depending on	742	// This renderer and its children have quite different layouts and styles depending on
740	// whether the speech button is visible or not. So we reset the whole thing and recreate	743	// whether the speech button is visible or not. So we reset the whole thing and recreate

Lines 22-27 Source/WebCore/rendering/RenderTextControl.cpp_sec1
- Source/WebCore/rendering/RenderTextControl.cpp -18 / +12 lines
22	#include "config.h"	22	#include "config.h"
23	#include "RenderTextControl.h"	23	#include "RenderTextControl.h"
24		24
		25	#include "CSSPrimitiveValueMappings.h"
25	#include "HTMLTextFormControlElement.h"	26	#include "HTMLTextFormControlElement.h"
26	#include "HitTestResult.h"	27	#include "HitTestResult.h"
27	#include "RenderText.h"	28	#include "RenderText.h"
Lines 29-34 Source/WebCore/rendering/RenderTextControl.cpp_sec2
29	#include "RenderTheme.h"	30	#include "RenderTheme.h"
30	#include "ScrollbarTheme.h"	31	#include "ScrollbarTheme.h"
31	#include "StyleInheritedData.h"	32	#include "StyleInheritedData.h"
		33	#include "StyleProperties.h"
32	#include "TextControlInnerElements.h"	34	#include "TextControlInnerElements.h"
33	#include "VisiblePosition.h"	35	#include "VisiblePosition.h"
34	#include <wtf/unicode/CharacterNames.h>	36	#include <wtf/unicode/CharacterNames.h>
Lines 72-86 void RenderTextControl::styleDidChange(S Source/WebCore/rendering/RenderTextControl.cpp_sec3
72	textFormControlElement().updatePlaceholderVisibility(false);	74	textFormControlElement().updatePlaceholderVisibility(false);
73	}	75	}
74		76
75	static inline bool updateUserModifyProperty(const HTMLTextFormControlElement& element, RenderStyle* style)
76	{
77	bool isDisabled = element.isDisabledFormControl();
78	bool isReadOnlyControl = element.isReadOnly();
79
80	style->setUserModify((isReadOnlyControl \|\| isDisabled) ? READ_ONLY : READ_WRITE_PLAINTEXT_ONLY);
81	return isDisabled;
82	}
83
84	void RenderTextControl::adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const	77	void RenderTextControl::adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const
85	{	78	{
86	// The inner block, if present, always has its direction set to LTR,	79	// The inner block, if present, always has its direction set to LTR,
Lines 88-95 void RenderTextControl::adjustInnerTextS Source/WebCore/rendering/RenderTextControl.cpp_sec4
88	textBlockStyle->setDirection(style().direction());	81	textBlockStyle->setDirection(style().direction());
89	textBlockStyle->setUnicodeBidi(style().unicodeBidi());	82	textBlockStyle->setUnicodeBidi(style().unicodeBidi());
90		83
91	bool disabled = updateUserModifyProperty(textFormControlElement(), textBlockStyle);	84	HTMLTextFormControlElement& control = textFormControlElement();
92	if (disabled)	85	if (HTMLElement* innerText = control.innerTextElement()) {
		86	if (const StyleProperties* properties = innerText->presentationAttributeStyle()) {
		87	RefPtr<CSSValue> value = properties->getPropertyCSSValue(CSSPropertyWebkitUserModify);
		88	if (value && value->isPrimitiveValue())
		89	textBlockStyle->setUserModify(toCSSPrimitiveValue(*value));
		90	}
		91	}
		92
		93	if (control.isDisabledFormControl())
93	textBlockStyle->setColor(theme().disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));	94	textBlockStyle->setColor(theme().disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
94	#if PLATFORM(IOS)	95	#if PLATFORM(IOS)
95	if (textBlockStyle->textSecurity() != TSNONE && !textBlockStyle->isLeftToRightDirection()) {	96	if (textBlockStyle->textSecurity() != TSNONE && !textBlockStyle->isLeftToRightDirection()) {
Lines 135-147 int RenderTextControl::textBlockLogicalW Source/WebCore/rendering/RenderTextControl.cpp_sec5
135	return unitWidth;	136	return unitWidth;
136	}	137	}
137		138
138	void RenderTextControl::updateFromElement()
139	{
140	TextControlInnerTextElement* innerText = innerTextElement();
141	if (innerText && innerText->renderer())
142	updateUserModifyProperty(textFormControlElement(), &innerText->renderer()->style());
143	}
144
145	int RenderTextControl::scrollbarThickness() const	139	int RenderTextControl::scrollbarThickness() const
146	{	140	{
147	// FIXME: We should get the size of the scrollbar from the RenderTheme instead.	141	// FIXME: We should get the size of the scrollbar from the RenderTheme instead.

Lines 1-3 LayoutTests/ChangeLog_sec1
- LayoutTests/ChangeLog +22 lines
		1	2014-02-21 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Inner text element should not use -webkit-user-modify
		4	https://bugs.webkit.org/show_bug.cgi?id=129035
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Rebaselined tests as the user agent shadow DOM of input and textarea elements now have contenteditable attribute.
		9
		10	* editing/input/paste-text-ending-with-interchange-newline-expected.txt:
		11	* editing/inserting/5607069-2-expected.txt:
		12	* editing/inserting/5607069-3-expected.txt:
		13	* editing/pasteboard/copy-image-with-alt-text-expected.txt:
		14	* editing/pasteboard/copy-null-characters-expected.txt:
		15	* editing/pasteboard/nested-blocks-with-text-area-expected.txt:
		16	* editing/pasteboard/nested-blocks-with-text-field-expected.txt:
		17	* editing/selection/dump-as-markup-expected.txt:
		18	* editing/selection/dump-as-markup-form-text-expected.txt:
		19	* fast/forms/suggested-value-after-setvalue-expected.txt:
		20	* fast/forms/suggested-value-expected.txt:
		21	* fast/parser/object-with-textarea-fallback-expected.txt:
		22
1	2014-02-20 ChangSeok Oh <changseok.oh@collabora.com>	23	2014-02-20 ChangSeok Oh <changseok.oh@collabora.com>
2		24
3	Rename EXT_draw_buffers to WEBGL_draw_buffers	25	Rename EXT_draw_buffers to WEBGL_draw_buffers

Lines 3-8 This tests that image alt text makes it LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt_sec1
- LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt +2 lines
3	Dump of markup 1:	3	Dump of markup 1:
4	\| <shadow:root>	4	\| <shadow:root>
5	\| <div>	5	\| <div>
		6	\| contenteditable="plaintext-only"
6	\| "Here is an emoticon [], some more text [], an empty alt tag [], no alt tag [] and two consecutive images [].	7	\| "Here is an emoticon [], some more text [], an empty alt tag [], no alt tag [] and two consecutive images [].
7		8
8	"	9	"
Lines 17-22 Dump of markup 2: LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt_sec2
17	Dump of markup 3:	18	Dump of markup 3:
18	\| <shadow:root>	19	\| <shadow:root>
19	\| <div>	20	\| <div>
		21	\| contenteditable="plaintext-only"
20	\| "Here is an emoticon [:)], some more text [sample text], an empty alt tag [], no alt tag [] and two consecutive images [firstsecond].	22	\| "Here is an emoticon [:)], some more text [sample text], an empty alt tag [], no alt tag [] and two consecutive images [firstsecond].
21		23
22	"	24	"

Lines 13-18 Tests dump-as-markup for input and texta LayoutTests/editing/selection/dump-as-markup-form-text-expected.txt_sec1
- LayoutTests/editing/selection/dump-as-markup-form-text-expected.txt +2 lines
13	\| this.value="replaced"	13	\| this.value="replaced"
14	\| <shadow:root>	14	\| <shadow:root>
15	\| <div>	15	\| <div>
		16	\| contenteditable="plaintext-only"
16	\| "replaced"	17	\| "replaced"
17	\| "	18	\| "
18	"	19	"
Lines 21-26 Tests dump-as-markup for input and texta LayoutTests/editing/selection/dump-as-markup-form-text-expected.txt_sec2
21	\| "original"	22	\| "original"
22	\| <shadow:root>	23	\| <shadow:root>
23	\| <div>	24	\| <div>
		25	\| contenteditable="plaintext-only"
24	\| "replaced"	26	\| "replaced"
25	\| "	27	\| "
26	"	28	"