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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f113340a096abe672eacee1e12f9d87264804571..5aea16ef1f3cb2a6c2e2a70d01d91b82c1014220 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+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  Daniel Bates  <dbates@webkit.org>
 
         Reviewed by Dave Hyatt.

diff --git a/LayoutTests/platform/qt/editing/deleting/5408255-expected.txt b/LayoutTests/platform/qt/editing/deleting/5408255-expected.txt
index 186701c1efbb3fee82acb3c34fc75d116b8f7f7b..4ac347a82b53d757b81bdb72e16f9047bc0ba11b 100644 (file)
--- a/LayoutTests/platform/qt/editing/deleting/5408255-expected.txt
+++ b/LayoutTests/platform/qt/editing/deleting/5408255-expected.txt
@@ -1,14 +1,14 @@
-ALERT: 20
-ALERT: 88
+ALERT: 22
+ALERT: 96
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 776x38
-          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-"
-          text run at (0,19) width 89: "select:ignore. "
-          text run at (89,19) width 452: "The list should be removed, the editable region below should be empty."
-      RenderBlock {DIV} at (0,52) size 784x28
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 773x40
+          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 -"
+          text run at (0,20) width 186: "webkit-user-select:ignore. "
+          text run at (186,20) width 504: "The list should be removed, the editable region below should be empty."
+      RenderBlock {DIV} at (0,56) size 784x32
 caret: position 0 of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2efef216e0378eff46e1c5fd7e56239061a8470e..59cafd25375d39eba87c99f74233c3064f294f3e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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  Mikhail Naganov  <mnaganov@chromium.org>
 
         Reviewed by Eric Seidel.

diff --git a/WebCore/WebCore.qrc b/WebCore/WebCore.qrc
index 69f860a0c9b0b1c5cc293d087614904f1a93c03f..6da93c67fb0f1bc07fac5843da66d92333a1c6b5 100644 (file)
--- a/WebCore/WebCore.qrc
+++ b/WebCore/WebCore.qrc
@@ -12,5 +12,6 @@
     <file alias="copyCursor.png">Resources/copyCursor.png</file>
     <file alias="progressCursor.png">Resources/progressCursor.png</file>
     <file alias="aliasCursor.png">Resources/aliasCursor.png</file>
+    <file alias="deleteButton.png">Resources/deleteButton.png</file>
 </qresource>
 </RCC>

diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index b6711075090816951e8d68a693a281839d10ee14..aa0a4c3f8ce506bbe650f0ffa05c8cac8f600de1 100644 (file)
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -64,6 +64,8 @@ static QPixmap loadResourcePixmap(const char *name)
         pixmap = QWebSettings::webGraphic(QWebSettings::DefaultFrameIconGraphic);
     else if (qstrcmp(name, "textAreaResizeCorner") == 0)
         pixmap = QWebSettings::webGraphic(QWebSettings::TextAreaSizeGripCornerGraphic);
+    else if (qstrcmp(name, "deleteButton") == 0)
+        pixmap = QWebSettings::webGraphic(QWebSettings::DeleteButtonGraphic);
 
     return pixmap;
 }

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index b637d04531e66c138988613bb518578a24437e3d..9a5ab46ef0146400e2a7b1664dd1db5091d06c23 100644 (file)
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -79,6 +79,7 @@ static WebGraphicHash* graphics()
         hash->insert(QWebSettings::MissingPluginGraphic, QPixmap(QLatin1String(":webkit/resources/nullPlugin.png")));
         hash->insert(QWebSettings::DefaultFrameIconGraphic, QPixmap(QLatin1String(":webkit/resources/urlIcon.png")));
         hash->insert(QWebSettings::TextAreaSizeGripCornerGraphic, QPixmap(QLatin1String(":webkit/resources/textAreaResizeCorner.png")));
+        hash->insert(QWebSettings::DeleteButtonGraphic, QPixmap(QLatin1String(":webkit/resources/deleteButton.png")));
     }
 
     return hash;

diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 50cf424397ae398ce65dd2c9452c4c33d7278ef2..69f3b1132600342dcd1382b936025d35beb53af9 100644 (file)
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -73,7 +73,8 @@ public:
         MissingImageGraphic,
         MissingPluginGraphic,
         DefaultFrameIconGraphic,
-        TextAreaSizeGripCornerGraphic
+        TextAreaSizeGripCornerGraphic,
+        DeleteButtonGraphic
     };
     enum FontSize {
         MinimumFontSize,

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index cc10e4293f8d55846188274ffe88d8636bc7564b..82447c5a5a70fc3280fae9f2016cfee0a4e98492 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+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:
+
 2009-11-18  Paul Olav Tvete  <paul.tvete@nokia.com>
 
         Reviewed by Simon Hausmann.