Changeset 62830 in webkit


Ignore:
Timestamp:
Jul 8, 2010 1:57:28 PM (14 years ago)
Author:
robert@webkit.org
Message:

2010-07-07 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Add DRT support for pageProperty etc.

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

Unskip:

printing/page-rule-selection.html
printing/page-format-data.html

  • platform/qt/Skipped:

2010-07-07 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Add DRT support for pageProperty etc.

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

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::isPageBoxVisible): (DumpRenderTreeSupportQt::pageSizeAndMarginsInPixels): (DumpRenderTreeSupportQt::pageProperty): (DumpRenderTreeSupportQt::addUserStyleSheet):
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

2010-07-07 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Add DRT support for pageProperty etc.

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

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::isPageBoxVisible): (LayoutTestController::pageSizeAndMarginsInPixels): (LayoutTestController::pageProperty): (LayoutTestController::addUserStyleSheet):
  • DumpRenderTree/qt/LayoutTestControllerQt.h:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r62828 r62830  
     12010-07-07  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Add DRT support for pageProperty etc.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=41584
     8
     9        Unskip:
     10         printing/page-rule-selection.html
     11         printing/page-format-data.html
     12
     13        * platform/qt/Skipped:
     14
    1152010-07-08  Alexey Proskuryakov  <ap@apple.com>
    216

  • trunk/LayoutTests/platform/qt/Skipped

    r62803 r62830  
    868868fast/ruby/rubyDOM-remove-text1.html
    869869fast/ruby/rubyDOM-remove-text2.html
    870 
    871 # Missing LayoutTestController::pageProperty.
    872 # https://bugs.webkit.org/show_bug.cgi?id=35961
    873 printing/page-rule-selection.html
    874 
    875 # Missing LayoutTestController::isPageBoxVisible, pageAreaRectInPixels, and preferredPageSizeInPixels.
    876 printing/page-format-data.html
    877870
    878871# ============================================================================= #

  • trunk/WebKit/qt/ChangeLog

    r62792 r62830  
     12010-07-07  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Add DRT support for pageProperty etc.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=41584
     8
     9        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     10        (DumpRenderTreeSupportQt::isPageBoxVisible):
     11        (DumpRenderTreeSupportQt::pageSizeAndMarginsInPixels):
     12        (DumpRenderTreeSupportQt::pageProperty):
     13        (DumpRenderTreeSupportQt::addUserStyleSheet):
     14        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     15
    1162010-07-08  Sam Weinig  <sam@webkit.org>
    217

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

    r62450 r62830  
    670670}
    671671
     672bool DumpRenderTreeSupportQt::isPageBoxVisible(QWebFrame* frame, int pageIndex)
     673{
     674    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
     675    return coreFrame->document()->isPageBoxVisible(pageIndex);
     676}
     677
     678QString DumpRenderTreeSupportQt::pageSizeAndMarginsInPixels(QWebFrame* frame, int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
     679{
     680    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
     681    return PrintContext::pageSizeAndMarginsInPixels(coreFrame, pageIndex, width, height,
     682                                                    marginTop, marginRight, marginBottom, marginLeft);
     683}
     684
     685QString DumpRenderTreeSupportQt::pageProperty(QWebFrame* frame, const QString& propertyName, int pageNumber)
     686{
     687    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
     688    return PrintContext::pageProperty(coreFrame, propertyName.toUtf8().constData(), pageNumber);
     689}
     690
     691void DumpRenderTreeSupportQt::addUserStyleSheet(QWebPage* page, const QString& sourceCode)
     692{
     693    page->handle()->page->group().addUserStyleSheetToWorld(mainThreadNormalWorld(), sourceCode, QUrl(), 0, 0);
     694}
     695
    672696// Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
    673697

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

    r62296 r62830  
    136136
    137137    static void setCustomPolicyDelegate(bool enabled, bool permissive);
     138
     139    static bool isPageBoxVisible(QWebFrame* frame, int pageIndex);
     140
     141    static QString pageSizeAndMarginsInPixels(QWebFrame* frame, int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft);
     142    static QString pageProperty(QWebFrame* frame, const QString& propertyName, int pageNumber);
     143    static void addUserStyleSheet(QWebPage* page, const QString& sourceCode);
     144
    138145};
    139146

  • trunk/WebKitTools/ChangeLog

    r62829 r62830  
     12010-07-07  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Add DRT support for pageProperty etc.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=41584
     8
     9        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     10        (LayoutTestController::isPageBoxVisible):
     11        (LayoutTestController::pageSizeAndMarginsInPixels):
     12        (LayoutTestController::pageProperty):
     13        (LayoutTestController::addUserStyleSheet):
     14        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     15
    1162010-07-08  Martin Robinson  <mrobinson@igalia.com>
    217

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

    r62454 r62830  
    688688}
    689689
     690bool LayoutTestController::isPageBoxVisible(int pageIndex)
     691{
     692    return DumpRenderTreeSupportQt::isPageBoxVisible(m_drt->webPage()->mainFrame(), pageIndex);
     693}
     694
     695QString LayoutTestController::pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
     696{
     697    return DumpRenderTreeSupportQt::pageSizeAndMarginsInPixels(m_drt->webPage()->mainFrame(), pageIndex,
     698                                                               width, height, marginTop, marginRight, marginBottom, marginLeft);
     699}
     700
     701QString LayoutTestController::pageProperty(const QString& propertyName, int pageNumber)
     702{
     703    return DumpRenderTreeSupportQt::pageProperty(m_drt->webPage()->mainFrame(), propertyName, pageNumber);
     704}
     705
     706void LayoutTestController::addUserStyleSheet(const QString& sourceCode)
     707{
     708    DumpRenderTreeSupportQt::addUserStyleSheet(m_drt->webPage(), sourceCode);
     709}
     710
    690711const unsigned LayoutTestController::maxViewWidth = 800;
    691712const unsigned LayoutTestController::maxViewHeight = 600;

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

    r62454 r62830  
    218218
    219219    void evaluateScriptInIsolatedWorld(int worldID, const QString& script);
     220    bool isPageBoxVisible(int pageIndex);
     221    QString pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft);
     222    QString pageProperty(const QString& propertyName, int pageNumber);
     223    void addUserStyleSheet(const QString& sourceCode);
    220224
    221225private slots:
Note: See TracChangeset for help on using the changeset viewer.