LayoutTests/ChangeLog

2012-06-13  Pete Williamson  <petewil@google.com>

        Brought back some existing tests for favicons, and added new tests.

        The new tests cover changing the favicons via scripting.

        Made the existing tests work properly, and put them in test expectations

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

        Reviewed by NOBODY (OOPS!).

        * fast/dom/icon-url-change-expected.txt: Added.

        * fast/dom/icon-url-change.html: Copied from LayoutTests/fast/dom/icon-url-property.html.

        * fast/dom/icon-url-list-expected.txt: Added.

        * fast/dom/icon-url-list.html: Copied from LayoutTests/fast/dom/icon-url-property.html.

        * fast/dom/icon-url-property-expected.txt:

        * fast/dom/icon-url-property.html:

        * platform/chromium/TestExpectations:

2012-06-13  Jeffrey Pfau  <jpfau@apple.com>

        Padding and borders can cause integer overflow in block layouts

LayoutTests/fast/dom/icon-url-property-expected.txt

1 main frame - didChangeIcons

21Original iconURL is: http://test.com/oldfavicon.ico

3 Setting new icon URL to: http://test.com/newfavion.ico

4 New iconURL is: http://test.com/newfavion.ico

Setting new icon URL to: http://test.com/newfavicon.ico

New iconURL is: http://test.com/newfavicon.ico

http://test.com/newfavicon.ico

LayoutTests/fast/dom/icon-url-property.html

@@function setFavIcon(iconURL) {

function runTests() {

    if (window.layoutTestController) {

        layoutTestController.dumpAsText();

34 layoutTestController.dumpIcon~~Change~~s();

34 layoutTestController.dumpIconList();

    }

    iconURL = document.getElementsByTagName("head")[0].getElementsByTagName("link")[0].href;

    debugOutput ('Original iconURL is: ' + iconURL);

38 newURL = 'http://test.com/newfavion.ico';

38 newURL = 'http://test.com/newfavicon.ico';

    debugOutput ('Setting new icon URL to: ' + newURL);

    setFavIcon(newURL);

    iconURL = document.getElementsByTagName("head")[0].getElementsByTagName("link")[0].href;

LayoutTests/platform/chromium/TestExpectations

@@BUGWK71758 : fast/url/port.html = TEXT PASS

// // Started failing at r58152

// BUGWK38038 : fast/url/file-http-base.html = TEXT

1893 BUGWK33812 SKIP : fast/dom/icon-url-property.html = PASS

1894

// New layoutTestController function added at r57993

BUGCR42696 : http/tests/xmlhttprequest/cross-origin-authorization-with-embedder.html = TIMEOUT

Source/WebCore/ChangeLog

2012-06-13  Pete Williamson  <petewil@google.com>

        Need a short description and bug URL (OOPS!)

        Fixed a problem where the list of icon URLs was getting stale entries

        by providing a call to allow it to be recalculated from the DOM

        after any modifications made by scripting to the DOM.

        Also fixed a bug where the iconURL list was ending up with lots

        of duplicates.

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

        Reviewed by NOBODY (OOPS!).

        Tests: fast/dom/icon-url-change.html

               fast/dom/icon-url-list.html

        * dom/Document.cpp:

        (WebCore):

        (WebCore::Document::recalculateIconURLs):

        (WebCore::Document::addIconURL):

        * dom/Document.h:

        (Document):

        * html/HTMLLinkElement.cpp:

        (WebCore::HTMLLinkElement::iconType):

        (WebCore):

        (WebCore::HTMLLinkElement::iconSizes):

        * html/HTMLLinkElement.h:

        (HTMLLinkElement):

        * loader/icon/IconController.cpp:

        (WebCore::IconController::urlsForTypes):

2012-06-13  Shawn Singh  <shawnsingh@chromium.org>

        [chromium] Implement hit-testing for impl-side input handling in accelerated compositor

Source/WebCore/dom/Document.cpp

@@const Vector<IconURL>& Document::iconURLs() const

    return m_iconURLs;

}

// instead of using the cached list, get the current list because

//  we expect some JS to have removed some elements

void Document::recalculateIconURLs()

{

    static const char* const iconMIMEType = "image/x-icon";

    // Clear the list of iconURLs. This is the only way to get rid of old urls in the list.

    m_iconURLs.clear();

    // Walk the children of the head looking for type = link, rel = "shortcut icon".

    HTMLCollection* children = head()->children();

    for (Node* child = children->firstItem(); child; child = children->nextItem()) {

        if (!child->hasTagName(linkTag))

            continue;

        HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(child);

        if (!equalIgnoringCase(linkElement->type(), iconMIMEType)

            || !(linkElement->iconType() == Favicon))

            continue;

        if (linkElement->href().isEmpty())

            continue;

        // Add the URL to our list. We put it at the front to ensure that icons seen later

        // take precedence as required by the spec.

        IconURL newURL(KURL(ParsedURLString, linkElement->href().string().ascii().data()),

                       linkElement->iconSizes().ascii().data(),

                       linkElement->type().ascii().data(),

                       linkElement->iconType());

        m_iconURLs.prepend(newURL);

    }

    return;

}

void Document::addIconURL(const String& url, const String& mimeType, const String& sizes, IconType iconType)

{

    if (url.isEmpty())

        return;

    // Ensure URL is not already in the list before adding it.

    for (size_t index = 0; index < m_iconURLs.size(); ++index) {

        if (m_iconURLs.at(index).m_iconURL.string() == url)

            return;

    }

    // FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "mimeType"

    IconURL newURL(KURL(ParsedURLString, url), sizes, mimeType, iconType);

    m_iconURLs.append(newURL);

Source/WebCore/dom/Document.h

@@public:

    void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }

    const Vector<IconURL>& iconURLs() const;

    void recalculateIconURLs();

    void addIconURL(const String& url, const String& mimeType, const String& size, IconType);

    void setUseSecureKeyboardEntryWhenActive(bool);

Source/WebCore/html/HTMLLinkElement.cpp

@@String HTMLLinkElement::type() const

    return getAttribute(typeAttr);

}

IconType HTMLLinkElement::iconType() const

{

    return m_relAttribute.m_iconType;

}

String HTMLLinkElement::iconSizes() const

{

    return m_sizes->toString();

}

void HTMLLinkElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const

{

    HTMLElement::addSubresourceAttributeURLs(urls);

Source/WebCore/html/HTMLLinkElement.h

@@public:

    String type() const;

    IconType iconType() const;

    String iconSizes() const;

    CSSStyleSheet* sheet() const { return m_sheet.get(); }

    bool styleSheetIsLoading() const;

Source/WebCore/loader/icon/IconController.cpp

@@IconURL IconController::iconURL(IconType iconType) const

IconURLs IconController::urlsForTypes(int iconTypes)

{

    // Reset the document list to get rid of any old icons.

    m_frame->document()->recalculateIconURLs();

    IconURLs iconURLs;

    if (m_frame->tree() && m_frame->tree()->parent())

        return iconURLs;

92 // Start by adding the favicon from the current document if we have one, if not, use the default favicon.

    if (iconTypes & Favicon && !appendToIconURLs(Favicon, &iconURLs))

        iconURLs.append(defaultURL(Favicon));

Source/WebKit/chromium/ChangeLog

2012-06-13  Pete Williamson  <petewil@google.com>

        Exposed methods we need for unit testing to get the list of icon URLs

        and to re-calculate the list of icon URLs

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

        Reviewed by NOBODY (OOPS!).

        * public/WebDocument.h:

        (WebKit):

        (WebDocument):

        * src/WebDocument.cpp:

        (WebKit):

        (WebKit::WebDocument::iconURLs):

        (WebKit::WebDocument::recalculateIconURLs):

2012-06-13  Shawn Singh  <shawnsingh@chromium.org>

        [chromium] Implement hit-testing for impl-side input handling in accelerated compositor

Source/WebKit/chromium/public/WebDocument.h

@@class WebNodeCollection;

class WebNodeList;

class WebString;

class WebURL;

57class WebIconURL;

// Provides readonly access to some properties of a DOM document.

class WebDocument : public WebNode {

@@public:

    WEBKIT_EXPORT WebElement fullScreenElement() const;

    WEBKIT_EXPORT WebDOMEvent createEvent(const WebString& eventType);

    WEBKIT_EXPORT WebReferrerPolicy referrerPolicy() const;

107 WEBKIT_EXPORT WebVector<WebIconURL> iconURLs() const;

108 WEBKIT_EXPORT void recalculateIconURLs();

    // Accessibility support. These methods should only be called on the

    // top-level document, because one accessibility cache spans all of

Source/WebKit/chromium/src/WebDocument.cpp

#include "WebElement.h"

#include "WebFormElement.h"

#include "WebFrameImpl.h"

55#include "WebIconURL.h"

#include "WebNodeCollection.h"

#include "WebNodeList.h"

#include "platform/WebURL.h"

@@WebReferrerPolicy WebDocument::referrerPolicy() const

    return static_cast<WebReferrerPolicy>(constUnwrap<Document>()->referrerPolicy());

}

WebVector<WebIconURL> WebDocument::iconURLs() const

{

    Vector<IconURL> iconURLs = const_cast<Document*>(constUnwrap<Document>())->iconURLs();

    size_t sourceLength = iconURLs.size();

    Vector<WebIconURL> temp;

    temp.reserveCapacity(sourceLength);

    // copy the Vector of IconURLs to a WebVector of WebIconURLs

    for (size_t i = 0; i < sourceLength; ++i)

        temp.append(WebIconURL(iconURLs.at(i)));

    return temp;

}

void WebDocument::recalculateIconURLs()

{

    const_cast<Document*>(constUnwrap<Document>())->recalculateIconURLs();

}

WebAccessibilityObject WebDocument::accessibilityObject() const

{

    const Document* document = constUnwrap<Document>();

Tools/ChangeLog

2012-06-13  Pete Williamson  <petewil@google.com>

        Updating the layout test controller and test shell to add the capability

        to dump the list of favicons used by a document for unit testing

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

        Reviewed by NOBODY (OOPS!).

        * DumpRenderTree/LayoutTestController.cpp:

        (LayoutTestController::LayoutTestController):

        (dumpIconListCallback):

        (LayoutTestController::staticFunctions):

        * DumpRenderTree/LayoutTestController.h:

        (LayoutTestController::dumpIconList):

        (LayoutTestController::setDumpIconList):

        (LayoutTestController):

        * DumpRenderTree/chromium/LayoutTestController.cpp:

        (LayoutTestController::LayoutTestController):

        (LayoutTestController::dumpIconList):

        (LayoutTestController::reset):

        * DumpRenderTree/chromium/LayoutTestController.h:

        (LayoutTestController):

        (LayoutTestController::shouldDumpIconList):

        (LayoutTestController::setShouldDumpIconList):

        * DumpRenderTree/chromium/TestShell.cpp:

        (TestShell::runFileTest):

        (TestShell::dump):

2012-06-13  Dirk Pranke  <dpranke@chromium.org>

        new-run-webkit-tests does not support --32-bit like ORWT did

Tools/DumpRenderTree/LayoutTestController.cpp

@@LayoutTestController::LayoutTestController(const std::string& testPathOrURL, con

    , m_dumpDatabaseCallbacks(false)

    , m_dumpEditingCallbacks(false)

    , m_dumpFrameLoadCallbacks(false)

60 , m_dumpIconList(false)

    , m_dumpProgressFinishedCallback(false)

    , m_dumpUserGestureInFrameLoadCallbacks(false)

    , m_dumpHistoryDelegateCallbacks(false)

@@static JSValueRef dumpFrameLoadCallbacksCallback(JSContextRef context, JSObjectR

    return JSValueMakeUndefined(context);

}

static JSValueRef dumpIconListCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)

{

    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));

    controller->setDumpIconList(true);

    return JSValueMakeUndefined(context);

}

static JSValueRef dumpProgressFinishedCallbackCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)

{

    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));

@@JSStaticFunction* LayoutTestController::staticFunctions()

        { "dumpDatabaseCallbacks", dumpDatabaseCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

        { "dumpEditingCallbacks", dumpEditingCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

        { "dumpFrameLoadCallbacks", dumpFrameLoadCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

2316 { "dumpIconList", dumpIconListCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

        { "dumpProgressFinishedCallback", dumpProgressFinishedCallbackCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

        { "dumpUserGestureInFrameLoadCallbacks", dumpUserGestureInFrameLoadCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },        

        { "dumpResourceLoadCallbacks", dumpResourceLoadCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

Tools/DumpRenderTree/LayoutTestController.h

@@public:

    bool dumpFrameLoadCallbacks() const { return m_dumpFrameLoadCallbacks; }

    void setDumpFrameLoadCallbacks(bool dumpFrameLoadCallbacks) { m_dumpFrameLoadCallbacks = dumpFrameLoadCallbacks; }

    bool dumpIconList() const { return m_dumpIconList; }

    void setDumpIconList(bool dumpIconList) { m_dumpIconList = dumpIconList; }

    bool dumpProgressFinishedCallback() const { return m_dumpProgressFinishedCallback; }

    void setDumpProgressFinishedCallback(bool dumpProgressFinishedCallback) { m_dumpProgressFinishedCallback = dumpProgressFinishedCallback; }

@@private:

    bool m_dumpDatabaseCallbacks;

    bool m_dumpEditingCallbacks;

    bool m_dumpFrameLoadCallbacks;

387 bool m_dumpIconList;

    bool m_dumpProgressFinishedCallback;

    bool m_dumpUserGestureInFrameLoadCallbacks;

    bool m_dumpHistoryDelegateCallbacks;

Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@LayoutTestController::LayoutTestController(TestShell* shell)

    bindMethod("dumpChildFrameScrollPositions", &LayoutTestController::dumpChildFrameScrollPositions);

    bindMethod("dumpDatabaseCallbacks", &LayoutTestController::dumpDatabaseCallbacks);

    bindMethod("dumpEditingCallbacks", &LayoutTestController::dumpEditingCallbacks);

141 bindMethod("dumpIconList", &LayoutTestController::dumpIconList);

    bindMethod("dumpFrameLoadCallbacks", &LayoutTestController::dumpFrameLoadCallbacks);

    bindMethod("dumpProgressFinishedCallback", &LayoutTestController::dumpProgressFinishedCallback);

    bindMethod("dumpUserGestureInFrameLoadCallbacks", &LayoutTestController::dumpUserGestureInFrameLoadCallbacks);

@@void LayoutTestController::dumpFrameLoadCallbacks(const CppArgumentList&, CppVar

    result->setNull();

}

void LayoutTestController::dumpIconList(const CppArgumentList& arguments, CppVariant* result)

{

    m_dumpIconList = true;

}

void LayoutTestController::dumpProgressFinishedCallback(const CppArgumentList&, CppVariant* result)

{

    m_dumpProgressFinishedCallback = true;

@@void LayoutTestController::reset()

    m_dumpCreateView = false;

    m_dumpEditingCallbacks = false;

    m_dumpFrameLoadCallbacks = false;

667 m_dumpIconList = false;

    m_dumpProgressFinishedCallback = false;

    m_dumpUserGestureInFrameLoadCallbacks = false;

    m_dumpResourceLoadCallbacks = false;

Tools/DumpRenderTree/chromium/LayoutTestController.h

@@public:

    // ignores any that may be present.

    void dumpFrameLoadCallbacks(const CppArgumentList&, CppVariant*);

    // This function sets a flag that tells the test_shell to print a list of

    // Icon URLs for favicons in the HTML head element of the document

    void dumpIconList(const CppArgumentList&, CppVariant*);

    // This function sets a flag that tells the test_shell to print a line of

    // descriptive text for the progress finished callback. It takes no

    // arguments, and ignores any that may be present.

@@public:

    void setShouldDumpAsAudio(bool dumpAsAudio) { m_dumpAsAudio = dumpAsAudio; } 

    bool shouldDumpAsText() { return m_dumpAsText; }

    void setShouldDumpAsText(bool value) { m_dumpAsText = value; }

467 bool shouldDumpIconList() { return m_dumpIconList; }

468 void setShouldDumpIconList(bool value) { m_dumpIconList = value; }

    bool shouldDumpEditingCallbacks() { return m_dumpEditingCallbacks; }

    bool shouldDumpFrameLoadCallbacks() { return m_dumpFrameLoadCallbacks; }

    void setShouldDumpFrameLoadCallbacks(bool value) { m_dumpFrameLoadCallbacks = value; }

@@private:

    // text representation of the renderer.

    bool m_dumpAsText;

    // If true, test_shell will dump the list of favicons in the header

    bool m_dumpIconList;

    // If true, the test_shell will output a base64 encoded WAVE file.

    bool m_dumpAsAudio;

Tools/DumpRenderTree/chromium/TestShell.cpp

#include "WebFrame.h"

#include "WebHistoryItem.h"

#include "WebIDBFactory.h"

46#include "WebIconURL.h"

#include "WebTestingSupport.h"

#include "platform/WebThread.h"

#include "WebKit.h"

@@void TestShell::runFileTest(const TestParams& params)

        m_layoutTestController->setShouldGeneratePixelResults(false);

    }

    if (testUrl.find("/dumpIconList/") != string::npos

        || testUrl.find("\\dumpIconList\\") != string::npos)

        m_layoutTestController->setShouldDumpIconList(true);

    if (testUrl.find("/inspector/") != string::npos

        || testUrl.find("\\inspector\\") != string::npos)

        showDevTools();

@@void TestShell::dump()

    if (!frame)

        return;

    bool shouldDumpAsText = m_layoutTestController->shouldDumpAsText();

558 bool shouldDumpIconList = m_layoutTestController->shouldDumpIconList();

    bool shouldDumpAsAudio = m_layoutTestController->shouldDumpAsAudio();

    bool shouldGeneratePixelResults = m_layoutTestController->shouldGeneratePixelResults();

    bool shouldDumpAsPrinted = m_layoutTestController->isPrinting();

@@void TestShell::dump()

        }

        if (m_layoutTestController->shouldDumpBackForwardList())

            printf("%s", dumpAllBackForwardLists().c_str());

        // if the test has asked for a list of Icon URLs, provide it

        if (shouldDumpIconList) {

            // first recalculate to get the most current list after any DOM manipulations

            frame->document().recalculateIconURLs();

            WebVector<WebIconURL> iconURLs;

            iconURLs = frame->document().iconURLs();

            int listSize = iconURLs.size();

            for (int index = 0; index < listSize; ++index)

                printf("%s\n", iconURLs[index].iconURL().spec().data());

        }

    }

    if (dumpedAnything && m_params.printSeparators)

        m_printer->handleTextFooter();