Changeset 51154 in webkit


Ignore:
Timestamp:
Nov 18, 2009 4:35:04 PM (14 years ago)
Author:
eric@webkit.org
Message:

2009-11-18 Shu Chang <​Chang.Shu@nokia.com>

Reviewed by Eric Seidel.

[Qt] Update expected result after Qt4.6 upgrade.
​https://bugs.webkit.org/show_bug.cgi?id=31560

Test: LayoutTests/editing/deleting/5408255.html

  • platform/qt/editing/deleting/5408255-expected.txt:

2009-11-18 Shu Chang <​Chang.Shu@nokia.com>

Reviewed by Eric Seidel.

[Qt] Add support for displaying deleteButton.
​https://bugs.webkit.org/show_bug.cgi?id=31560

Test: LayoutTests/editing/deleting/5408255.html

  • WebCore.qrc:
  • platform/graphics/qt/ImageQt.cpp: (loadResourcePixmap):

2009-11-18 Shu Chang <​Chang.Shu@nokia.com>

Reviewed by Eric Seidel.

[Qt] Add support for displaying deleteButton.
​https://bugs.webkit.org/show_bug.cgi?id=31560

Test: LayoutTests/editing/deleting/5408255.html

  • Api/qwebsettings.cpp: (graphics):
  • Api/qwebsettings.h:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r51151 r51154  
     12009-11-18  Shu Chang  <Chang.Shu@nokia.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [Qt] Update expected result after Qt4.6 upgrade.
     6        https://bugs.webkit.org/show_bug.cgi?id=31560
     7
     8        Test: LayoutTests/editing/deleting/5408255.html
     9
     10        * platform/qt/editing/deleting/5408255-expected.txt:
     11
    1122009-11-18  Daniel Bates  <dbates@webkit.org>
    213

  • trunk/LayoutTests/platform/qt/editing/deleting/5408255-expected.txt

    r43215 r51154  
    1 ALERT: 20
    2 ALERT: 88
     1ALERT: 22
     2ALERT: 96
    33layer at (0,0) size 800x600
    44  RenderView at (0,0) size 800x600
    … …  
    66  RenderBlock {HTML} at (0,0) size 800x600
    77    RenderBody {BODY} at (8,8) size 784x584
    8       RenderBlock {P} at (0,0) size 784x38
    9         RenderText {#text} at (0,0) size 776x38
    10           text run at (0,0) width 776: "This tests for a bug where the delete button wouldn't work because it had -webkit-user-select:none instead of -webkit-user-"
    11           text run at (0,19) width 89: "select:ignore. "
    12           text run at (89,19) width 452: "The list should be removed, the editable region below should be empty."
    13       RenderBlock {DIV} at (0,52) size 784x28
     8      RenderBlock {P} at (0,0) size 784x40
     9        RenderText {#text} at (0,0) size 773x40
     10          text run at (0,0) width 773: "This tests for a bug where the delete button wouldn't work because it had -webkit-user-select:none instead of -"
     11          text run at (0,20) width 186: "webkit-user-select:ignore. "
     12          text run at (186,20) width 504: "The list should be removed, the editable region below should be empty."
     13      RenderBlock {DIV} at (0,56) size 784x32
    1414caret: position 0 of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

  • trunk/WebCore/ChangeLog

    r51153 r51154  
     12009-11-18  Shu Chang  <Chang.Shu@nokia.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [Qt] Add support for displaying deleteButton.
     6        https://bugs.webkit.org/show_bug.cgi?id=31560
     7
     8        Test: LayoutTests/editing/deleting/5408255.html
     9
     10        * WebCore.qrc:
     11        * platform/graphics/qt/ImageQt.cpp:
     12        (loadResourcePixmap):
     13
    1142009-11-18  Mikhail Naganov  <mnaganov@chromium.org>
    215

  • trunk/WebCore/WebCore.qrc

    r49087 r51154  
    1313    <file alias="progressCursor.png">Resources/progressCursor.png</file>
    1414    <file alias="aliasCursor.png">Resources/aliasCursor.png</file>
     15    <file alias="deleteButton.png">Resources/deleteButton.png</file>
    1516</qresource>
    1617</RCC>

  • trunk/WebCore/platform/graphics/qt/ImageQt.cpp

    r50416 r51154  
    6565    else if (qstrcmp(name, "textAreaResizeCorner") == 0)
    6666        pixmap = QWebSettings::webGraphic(QWebSettings::TextAreaSizeGripCornerGraphic);
     67    else if (qstrcmp(name, "deleteButton") == 0)
     68        pixmap = QWebSettings::webGraphic(QWebSettings::DeleteButtonGraphic);
    6769
    6870    return pixmap;

  • trunk/WebKit/qt/Api/qwebsettings.cpp

    r51047 r51154  
    8080        hash->insert(QWebSettings::DefaultFrameIconGraphic, QPixmap(QLatin1String(":webkit/resources/urlIcon.png")));
    8181        hash->insert(QWebSettings::TextAreaSizeGripCornerGraphic, QPixmap(QLatin1String(":webkit/resources/textAreaResizeCorner.png")));
     82        hash->insert(QWebSettings::DeleteButtonGraphic, QPixmap(QLatin1String(":webkit/resources/deleteButton.png")));
    8283    }
    8384

  • trunk/WebKit/qt/Api/qwebsettings.h

    r50876 r51154  
    7474        MissingPluginGraphic,
    7575        DefaultFrameIconGraphic,
    76         TextAreaSizeGripCornerGraphic
     76        TextAreaSizeGripCornerGraphic,
     77        DeleteButtonGraphic
    7778    };
    7879    enum FontSize {

  • trunk/WebKit/qt/ChangeLog

    r51111 r51154  
     12009-11-18  Shu Chang  <Chang.Shu@nokia.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [Qt] Add support for displaying deleteButton.
     6        https://bugs.webkit.org/show_bug.cgi?id=31560
     7
     8        Test: LayoutTests/editing/deleting/5408255.html
     9
     10        * Api/qwebsettings.cpp:
     11        (graphics):
     12        * Api/qwebsettings.h:
     13
    1142009-11-18  Paul Olav Tvete  <paul.tvete@nokia.com>
    215
Note: See TracChangeset for help on using the changeset viewer.