Changeset 57966 in webkit


Ignore:
Timestamp:
Apr 21, 2010 4:14:59 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-21 Eric Seidel <​eric@webkit.org>

Unreviewed, rolling out r57963.
​http://trac.webkit.org/changeset/57963
​https://bugs.webkit.org/show_bug.cgi?id=37759

Three tests started crashing on the Qt bot.

  • platform/qt/Skipped:

2010-04-21 Eric Seidel <​eric@webkit.org>

Unreviewed, rolling out r57963.
​http://trac.webkit.org/changeset/57963
​https://bugs.webkit.org/show_bug.cgi?id=37759

Three tests started crashing on the Qt bot.

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::isCommandEnabled):
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

2010-04-21 Eric Seidel <​eric@webkit.org>

Unreviewed, rolling out r57963.
​http://trac.webkit.org/changeset/57963
​https://bugs.webkit.org/show_bug.cgi?id=37759

Three tests started crashing on the Qt bot.

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp:
  • DumpRenderTree/qt/LayoutTestControllerQt.h:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r57963 r57966  
     12010-04-21  Eric Seidel  <eric@webkit.org>
     2
     3        Unreviewed, rolling out r57963.
     4        http://trac.webkit.org/changeset/57963
     5        https://bugs.webkit.org/show_bug.cgi?id=37759
     6
     7        Three tests started crashing on the Qt bot.
     8
     9        * platform/qt/Skipped:
     10
    1112010-04-21  Yi Shen  <yi.4.shen@nokia.com>
    212

  • trunk/LayoutTests/platform/qt/Skipped

    r57963 r57966  
    337337# Missing layoutTestController.evaluateScriptInIsolatedWorld()
    338338storage/open-database-creation-callback-isolated-world.html
     339
     340# Missing layoutTestController.computedStyleIncludingVisitedInfo()
     341fast/history/multiple-classes-visited.html
     342fast/history/nested-visited-test.html
     343fast/history/self-is-visited.html
     344fast/history/sibling-visited-test.html
    339345
    340346# Missing layoutTestController.dumpWillCacheResponse

  • trunk/WebKit/qt/ChangeLog

    r57963 r57966  
     12010-04-21  Eric Seidel  <eric@webkit.org>
     2
     3        Unreviewed, rolling out r57963.
     4        http://trac.webkit.org/changeset/57963
     5        https://bugs.webkit.org/show_bug.cgi?id=37759
     6
     7        Three tests started crashing on the Qt bot.
     8
     9        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     10        (DumpRenderTreeSupportQt::isCommandEnabled):
     11        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     12
    1132010-04-21  Yi Shen  <yi.4.shen@nokia.com>
    214

  • trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r57963 r57966  
    2424#include "DumpRenderTreeSupportQt.h"
    2525
    26 #include "CSSComputedStyleDeclaration.h"
    2726#include "ContextMenu.h"
    2827#include "ContextMenuClientQt.h"
    … …  
    366365    return page->handle()->page->focusController()->focusedOrMainFrame()->editor()->command(name).isEnabled();
    367366}
    368 
    369 QVariantMap DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo(QWebFrame* frame, const QString& id)
    370 {
    371     QVariantMap ret;
    372     Frame* coreFrame = QWebFramePrivate::core(frame);
    373     if (!coreFrame)
    374         return ret;
    375 
    376     Element* element = coreFrame->document()->getElementById(AtomicString(id));
    377     if (!element)
    378         return ret;
    379 
    380     RefPtr<CSSComputedStyleDeclaration> style = computedStyle(element, true);
    381     for (int i = 0; i < style->length(); i++) {
    382         QString name = style->item(i);
    383         QString value = (static_cast<CSSStyleDeclaration*>(style.get()))->getPropertyValue(name);
    384         ret[name] = QVariant(value);
    385     }
    386     return ret;
    387 }
    388 

  • trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r57963 r57966  
    2525
    2626#include "qwebkitglobal.h"
    27 #include <QVariant>
    2827
    2928class QWebPage;
    … …  
    8079
    8180    static int workerThreadCount();
    82     static QVariantMap computedStyleIncludingVisitedInfo(QWebFrame* frame, const QString& id);
    8381};
    8482

  • trunk/WebKitTools/ChangeLog

    r57965 r57966  
     12010-04-21  Eric Seidel  <eric@webkit.org>
     2
     3        Unreviewed, rolling out r57963.
     4        http://trac.webkit.org/changeset/57963
     5        https://bugs.webkit.org/show_bug.cgi?id=37759
     6
     7        Three tests started crashing on the Qt bot.
     8
     9        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     10        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     11
    1122010-04-21  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    213

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r57963 r57966  
    3636#include <QDir>
    3737#include <QLocale>
    38 #include <QMap>
    3938#include <qwebsettings.h>
    4039
    … …  
    611610}
    612611
    613 QVariantMap LayoutTestController::computedStyleIncludingVisitedInfo(const QVariant& obj) const
    614 {
    615     QMap<QString, QVariant> map = obj.toMap();
    616     QString id = map.value("id").toString();
    617 
    618     return DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo(m_drt->webPage()->mainFrame(), id);
    619 }
    620 
    621612const unsigned LayoutTestController::maxViewWidth = 800;
    622613const unsigned LayoutTestController::maxViewHeight = 600;

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r57963 r57966  
    176176    int numberOfPages(float width = maxViewWidth, float height = maxViewHeight);
    177177    bool callShouldCloseOnWebView();
    178     QVariantMap computedStyleIncludingVisitedInfo(const QVariant& obj) const;
    179178
    180179    /*
Note: See TracChangeset for help on using the changeset viewer.