Title: [222387] trunk
Revision
222387
Author
[email protected]
Date
2017-09-22 07:45:48 -0700 (Fri, 22 Sep 2017)

Log Message

[GTK] Couple of pasteboard related tests are failing after r222228
https://bugs.webkit.org/show_bug.cgi?id=177295

Reviewed by Michael Catanzaro.

Source/WebCore:

Call writeToClipboard() from Pasteboard::writeString() on GTK.

When writePasteboard was replaced by commitToPasteboard in r222228,
the call to writeToClipboard() did not make it into the
platform-neutral code. This attempts to find another place in the
GTK-specific code to make the call.

Tests: editing/pasteboard/copy-without-selection.html
       editing/pasteboard/pasting-empty-html-falls-back-to-text.html

* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::writeString):

LayoutTests:

* platform/gtk/TestExpectations: mark the tests as passing again.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (222386 => 222387)


--- trunk/LayoutTests/ChangeLog	2017-09-22 14:39:56 UTC (rev 222386)
+++ trunk/LayoutTests/ChangeLog	2017-09-22 14:45:48 UTC (rev 222387)
@@ -1,3 +1,12 @@
+2017-09-22  Ms2ger  <[email protected]>
+
+        [GTK] Couple of pasteboard related tests are failing after r222228
+        https://bugs.webkit.org/show_bug.cgi?id=177295
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/gtk/TestExpectations: mark the tests as passing again.
+
 2017-09-22  Zan Dobersek  <[email protected]>
 
         Unreviewed GTK+ gardening. Adding failure expectations for failure tests

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (222386 => 222387)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2017-09-22 14:39:56 UTC (rev 222386)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2017-09-22 14:45:48 UTC (rev 222387)
@@ -3466,9 +3466,6 @@
 webkit.org/b/177294 platform/gtk/fonts/fontconfig-aliasing-settings.html [ Failure ]
 webkit.org/b/177294 fast/text/fitzpatrick-combination.html [ ImageOnlyFailure ]
 
-webkit.org/b/177295 editing/pasteboard/copy-without-selection.html [ Failure ]
-webkit.org/b/177295 editing/pasteboard/pasting-empty-html-falls-back-to-text.html [ Failure ]
-
 webkit.org/b/177296 editing/deleting/smart-delete-002.html [ Failure ]
 
 webkit.org/b/177319 imported/w3c/web-platform-tests/html/semantics/forms/the-form-element/form-elements-filter.html [ Failure ]

Modified: trunk/Source/WebCore/ChangeLog (222386 => 222387)


--- trunk/Source/WebCore/ChangeLog	2017-09-22 14:39:56 UTC (rev 222386)
+++ trunk/Source/WebCore/ChangeLog	2017-09-22 14:45:48 UTC (rev 222387)
@@ -1,3 +1,23 @@
+2017-09-22  Ms2ger  <[email protected]>
+
+        [GTK] Couple of pasteboard related tests are failing after r222228
+        https://bugs.webkit.org/show_bug.cgi?id=177295
+
+        Reviewed by Michael Catanzaro.
+
+        Call writeToClipboard() from Pasteboard::writeString() on GTK.
+
+        When writePasteboard was replaced by commitToPasteboard in r222228,
+        the call to writeToClipboard() did not make it into the
+        platform-neutral code. This attempts to find another place in the
+        GTK-specific code to make the call.
+
+        Tests: editing/pasteboard/copy-without-selection.html
+               editing/pasteboard/pasting-empty-html-falls-back-to-text.html
+
+        * platform/gtk/PasteboardGtk.cpp:
+        (WebCore::Pasteboard::writeString):
+
 2017-09-21  Brent Fulgham  <[email protected]>
 
         REGRESSION (r221017): iCloud mail logs me out after looking at a few messages

Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (222386 => 222387)


--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp	2017-09-22 14:39:56 UTC (rev 222386)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp	2017-09-22 14:45:48 UTC (rev 222387)
@@ -133,19 +133,20 @@
     case ClipboardDataTypeURIList:
     case ClipboardDataTypeURL:
         m_selectionData->setURIList(data);
-        return;
+        break;
     case ClipboardDataTypeMarkup:
         m_selectionData->setMarkup(data);
-        return;
+        break;
     case ClipboardDataTypeText:
         m_selectionData->setText(data);
-        return;
+        break;
     case ClipboardDataTypeUnknown:
         m_selectionData->setUnknownTypeData(type, data);
-        return;
+        break;
     case ClipboardDataTypeImage:
         break;
     }
+    writeToClipboard();
 }
 
 void Pasteboard::writePlainText(const String& text, SmartReplaceOption smartReplaceOption)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to