ChangeLog

2012-04-02  Dave Michael  <dmichael@chromium.org>

        Unable to focus on embedded plugins such as Flash via javascript focus()

        https://bugs.webkit.org/show_bug.cgi?id=32292

        Reviewed by Ryosuke Niwa.

        Make embed, object, and applet elements support focus() when

        appropriate. Prior to this patch, javascript focus() had no effect on

        embed, object, or applet elements unless tabindex or contenteditable is

        set. With this patch, focus() will focus the element unless the plugin

        content has failed to load (i.e., we are showing either fallback content

        or an unavailable plugin indicator).

        Test: plugins/focus.html

              java/focus.html

        * html/HTMLPlugInElement.cpp:

        (WebCore::HTMLPlugInElement::supportsFocus):

        Overridden to return true except when the plugin content has failed to load.

        * html/HTMLPlugInElement.h:

        (WebCore::HTMLPlugInElement::useFallbackContent):

        Moved up from HTMLPlugInImageElement.

        (WebCore::HTMLPlugInElement::supportsFocus):

        * html/HTMLPlugInElement.h:

        (WebCore::HTMLPlugInImageElement::useFallbackContent):

        Removed. Now the implementation is inherited from HTMLPlugInElement.

2013-04-03  Jessie Berlin  <jberlin@apple.com>

        Update the localizable strings file.

Source/WebCore/html/HTMLPlugInElement.cpp

@@bool HTMLPlugInElement::isPluginElement() const

    return true;

}

bool HTMLPlugInElement::supportsFocus() const

{

    if (HTMLFrameOwnerElement::supportsFocus())

        return true;

    if (useFallbackContent() || !renderer() || !renderer()->isEmbeddedObject())

        return false;

    return !toRenderEmbeddedObject(renderer())->showsUnavailablePluginIndicator();

}

#if ENABLE(NETSCAPE_PLUGIN_API)

NPObject* HTMLPlugInElement::getNPObject()

Source/WebCore/html/HTMLPlugInElement.h

@@protected:

    virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;

    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) OVERRIDE;

85 virtual bool useFallbackContent() const { return false; }

86

    // Subclasses should use guardedDispatchBeforeLoadEvent instead of calling dispatchBeforeLoadEvent directly.

    bool guardedDispatchBeforeLoadEvent(const String& sourceURL);

@@private:

    virtual RenderWidget* renderWidgetForJSBindings() const = 0;

101 virtual bool supportsFocus() const OVERRIDE;

102

    virtual bool isKeyboardFocusable(KeyboardEvent*) const;

    virtual bool isPluginElement() const;

Source/WebCore/html/HTMLPlugInImageElement.h

@@private:

    virtual void finishParsingChildren();

    void updateWidgetIfNecessary();

122 virtual bool useFallbackContent() const { return false; }

    virtual void updateSnapshot(PassRefPtr<Image>) OVERRIDE;

    virtual void dispatchPendingMouseClick() OVERRIDE;

LayoutTests/ChangeLog

2013-04-03  Dave Michael  <dmichael@chromium.org>

        Unable to focus on embedded plugins such as Flash via javascript focus()

        https://bugs.webkit.org/show_bug.cgi?id=32292

        Reviewed by Ryosuke Niwa.

        Add/update testing to ensure embed, object, and applet tags now support

        focus except when plugin content did not load.

        * fast/events/resources/tabindex-focus-blur-all-frame1.html: Change embed and object

            elements to reference an invalid plugin, to be consistent with applet. These

            element types are not focusable when there is valid plugin content.

        * fast/events/resources/tabindex-focus-blur-all-frame2.html: Same as above.

        * fast/events/resources/tabindex-focus-blur-all-iframe1.html: Same as above.

        * fast/events/resources/tabindex-focus-blur-all-iframe2.html: Same as above.

        * java/focus-expected.txt: Added.

        * java/focus.html: Added.

        * plugins/focus-expected.txt: Added.

        * plugins/focus.html: Added.

2013-04-03  Felipe Zimmerle  <felipe@zimmerle.org>

        CSP blocks inline style when cloning a node

LayoutTests/fast/events/resources/tabindex-focus-blur-all-frame1.html

applet:<br>

<applet width="100" height="100" code="" tabindex="-1" id="applet1"></applet><br>

object:<br>

23 <object type="application/x-~~webkit-test-netscape~~" width="100" height="100" id="object1"></object>

23<object type="application/x-no-such-plugin" width="100" height="100" id="object1"></object>

2424embed:

25 <embed type="application/x-~~webkit-test-netscape~~" width="100" height="100" tabindex="3" id="embed1"></embed>

25<embed type="application/x-no-such-plugin" width="100" height="100" tabindex="3" id="embed1"></embed>

<!--presentation-related elements-->

<div id="div1b" tabindex="0">

LayoutTests/fast/events/resources/tabindex-focus-blur-all-frame2.html

applet:<br>

<applet width="100" height="100" code="" tabindex="2" id="applet3"></applet><br>

object:<br>

23 <object type="application/x-~~webkit-test-netscape~~" width="100" height="100" tabindex="0" id="object3"></object>

23<object type="application/x-no-such-plugin" width="100" height="100" tabindex="0" id="object3"></object>

2424embed:

25 <embed type="application/x-~~webkit-test-netscape~~" width="100" height="100" tabindex="-1" id="embed3"></embed>

25<embed type="application/x-no-such-plugin" width="100" height="100" tabindex="-1" id="embed3"></embed>

<!--presentation-related elements-->

<div id="div3b">

LayoutTests/fast/events/resources/tabindex-focus-blur-all-iframe1.html

applet:<br>

<applet width="100" height="100" code="" id="applet2"></applet><br>

object:<br>

23 <object type="application/x-~~webkit-test-netscape~~" width="100" height="100" tabindex="3" id="object2"></object>

23<object type="application/x-no-such-plugin" width="100" height="100" tabindex="3" id="object2"></object>

2424embed:

25 <embed type="application/x-~~webkit-test-netscape~~" width="100" height="100" tabindex="0" id="embed2"></embed>

25<embed type="application/x-no-such-plugin" width="100" height="100" tabindex="0" id="embed2"></embed>

<!--presentation-related elements-->

<div id="div2b" tabindex="-1">

LayoutTests/fast/events/resources/tabindex-focus-blur-all-iframe2.html

applet:<br>

<applet width="100" height="100" code="" tabindex="0" id="applet4"></applet><br>

object:<br>

23 <object type="application/x-~~webkit-test-netscape~~" width="100" height="100" tabindex="-1" id="object4"></object>

23<object type="application/x-no-such-plugin" width="100" height="100" tabindex="-1" id="object4"></object>

2424embed:

25 <embed type="application/x-~~webkit-test-netscape~~" width="100" height="100" id="embed4"></embed>

25<embed type="application/x-no-such-plugin" width="100" height="100" id="embed4"></embed>

<!--presentation-related elements-->

<div id="div4b" tabindex="3">

LayoutTests/java/focus-expected.txt

Test for Applet for bug 32292: Unable to focus on embedded plugins such as Flash via javascript focus().

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS successfullyParsed is true

TEST COMPLETE

PASS "appletElem"; document.activeElement === pluginElement is true

PASS "appletElemWithFallbackContents"; document.activeElement === pluginElement is true

PASS "noCodeAppletElem"; document.activeElement === pluginElement is false

PASS "noCodeAppletElemWithFallbackContents"; document.activeElement === pluginElement is false

PASS "noCodeAppletElemWithTabindex"; document.activeElement === pluginElement is true

PASS "noCodeAppletElemWithContenteditable"; document.activeElement === pluginElement is true

Test for bug 32292: "Unable to focus on embedded plugins such as Flash via javascript focus()"

This tests focusing Applets. See LayoutTests/plugins for Embed and Object elements.

LayoutTests/java/focus.html

<!DOCTYPE html>

<html>

<head>

<meta charset="utf-8">

<script src="../fast/js/resources/js-test-pre.js"></script>

<script>

if (window.testRunner)

    testRunner.overridePreference("WebKitJavaEnabled", "1");

</script>

</head>

<body>

<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=32292">bug 32292</a>:

"Unable to focus on embedded plugins such as Flash via javascript focus()"</p>

<p>This tests focusing Applets. See LayoutTests/plugins for Embed and Object elements.</p>

<div id=appletOwner>

<applet id="appletElem" width=150 height=25 code="SharedApplet.class" name="javaTest" shouldFocus=true></applet>

<applet id="appletElemWithFallbackContents" width=150 height=25 code="SharedApplet.class" name="javaTest" shouldFocus=true>Fallback Contents.</applet>

<applet id="noCodeAppletElem" width=150 height=25 code="DoesNotExist.class" shouldFocus=false></applet>

<applet id="noCodeAppletElemWithFallbackContents" width=150 height=25 code="DoesNotExist.class" shouldFocus=false>Fallback contents.</applet>

<applet id="noCodeAppletElemWithTabindex" width=150 height=25 code="DoesNotExist.class" tabindex=-1 shouldFocus=true></applet>

<applet id="noCodeAppletElemWithContenteditable" width=150 height=25 code="DoesNotExist.class" shouldFocus=true></applet>

</div>

<script>

description("Test for Applet for bug 32292: Unable to focus on embedded plugins such as Flash via javascript focus().");

function RunTest() {

    var owner = document.getElementById("appletOwner");

    for (var i = 0; i < owner.childNodes.length; ++i) {

        pluginElement = owner.childNodes[i];

        if (pluginElement.id) {

            pluginElement.focus();

            shouldBe('"' + pluginElement.id + '"; document.activeElement === pluginElement',

                pluginElement.getAttribute("shouldFocus").toString());

            pluginElement.blur();

        }

    }

}

document.addEventListener("DOMContentLoaded", RunTest, false);

</script>

<script src="../fast/js/resources/js-test-post.js"></script>

</body>

</html>

LayoutTests/plugins/focus-expected.txt

Test for Embed and Object for bug 32292: Unable to focus on embedded plugins such as Flash via javascript focus().

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS successfullyParsed is true

TEST COMPLETE

PASS "embedElem"; document.activeElement === pluginElement is true

PASS "objectElem"; document.activeElement === pluginElement is true

PASS "embedElemWithFallbackContents"; document.activeElement === pluginElement is true

PASS "objectElemWithFallbackContents"; document.activeElement === pluginElement is true

PASS "noPluginEmbedElem"; document.activeElement === pluginElement is false

PASS "noPluginObjectElem"; document.activeElement === pluginElement is false

PASS "noPluginEmbedElemWithFallbackContents"; document.activeElement === pluginElement is false

PASS "noPluginObjectElemWithFallbackContents"; document.activeElement === pluginElement is false

PASS "noPluginEmbedElemWithTabindex"; document.activeElement === pluginElement is true

PASS "noPluginObjectElemWithTabindex"; document.activeElement === pluginElement is true

PASS "noPluginEmbedElemWithContenteditable"; document.activeElement === pluginElement is true

PASS "noPluginObjectElemWithContenteditable"; document.activeElement === pluginElement is true

fast/events/tabindex-focus-blur-all.html

Test for bug 32292: "Unable to focus on embedded plugins such as Flash via javascript focus()"

This tests focusing Embeds and Objects. See LayoutTests/java for Applet elements.

   Fallback contents.     Fallback contents. Fallback contents.

LayoutTests/plugins/focus.html

fast/events/tabindex-focus-blur-all.html<!DOCTYPE html>

<html>

<head>

<meta charset="utf-8">

<script src="../fast/js/resources/js-test-pre.js"></script>

</head>

<body>

<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=32292">bug 32292</a>:

"Unable to focus on embedded plugins such as Flash via javascript focus()"</p>

<p>This tests focusing Embeds and Objects. See LayoutTests/java for Applet elements.</p>

<div id=embedOwner>

<embed id="embedElem" type="application/x-webkit-test-netscape" width=100 height=100 shouldFocus=true></embed>

<object id="objectElem" type="application/x-webkit-test-netscape" windowedPlugin="false" width=100 height=100 shouldFocus=true></object>

<embed id="embedElemWithFallbackContents" type="application/x-webkit-test-netscape" width=100 height=100 shouldFocus=true>Fallback contents.</embed>

<object id="objectElemWithFallbackContents" type="application/x-webkit-test-netscape" windowedPlugin="false" width=100 height=100 shouldFocus=true>Fallback contents.</object>

<embed id="noPluginEmbedElem" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 shouldFocus=false></embed>

<object id="noPluginObjectElem" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 shouldFocus=false></object>

<embed id="noPluginEmbedElemWithFallbackContents" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 shouldFocus=false>Fallback contents.</embed>

<object id="noPluginObjectElemWithFallbackContents" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 shouldFocus=false>Fallback contents.</object>

<embed id="noPluginEmbedElemWithTabindex" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 tabindex=-1 shouldFocus=true></embed>

<object id="noPluginObjectElemWithTabindex" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 tabindex=-1 shouldFocus=true></object>

<embed id="noPluginEmbedElemWithContenteditable" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 contenteditable=true shouldFocus=true></embed>

<object id="noPluginObjectElemWithContenteditable" type="application/x-no-such-plugin" windowedPlugin="false" width=100 height=100 contenteditable=true shouldFocus=true></object>

</div>

<script>

description("Test for Embed and Object for bug 32292: Unable to focus on embedded plugins such as Flash via javascript focus().");

function RunTest() {

    var owner = document.getElementById("embedOwner");

    for (var i = 0; i < owner.childNodes.length; ++i) {

        pluginElement = owner.childNodes[i];

        if (pluginElement.id) {

            pluginElement.focus();

            shouldBe('"' + pluginElement.id + '"; document.activeElement === pluginElement',

                pluginElement.getAttribute("shouldFocus").toString());

            pluginElement.blur();

        }

    }

}

document.addEventListener("DOMContentLoaded", RunTest, false);

</script>

<script src="../fast/js/resources/js-test-post.js"></script>

</body>

</html>