yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: browser(webkit): follow-up after #14664 (#14673)

Browse Source 
browser(webkit): follow-up after #14664
This commit is contained in:
Diego Pino 2022-06-07 20:03:00 +08:00 committed by GitHub
parent 243ad406ce
commit 407c4a6e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View File

@ -1,2 +1,2 @@
1655 1656
Changed: dpino@igalia.com Mon Jun 6 23:21:50 HKT 2022 Changed: dpino@igalia.com Tue Jun 7 06:15:06 UTC 2022

18
browser_patches/webkit/patches/bootstrap.diff
View File

@ -6951,7 +6951,7 @@ index ee63764693bb08b70a4ee6c54bf566f5143182cf..947c9c4f4bde763469e66b915e054f8d
#else #else
return false; return false;
diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
index fab94e0ac0f4ab8f7d7decec53adb1f3ac7a6e07..cd853346eb019b00fa99478e7aee2961f61bc23b 100644 index fab94e0ac0f4ab8f7d7decec53adb1f3ac7a6e07..56193e30522a6fe87e1a7bf01beeae9b9fdb5fbf 100644
--- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp --- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
+++ b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp +++ b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
@@ -48,6 +48,13 @@ @@ -48,6 +48,13 @@
@ -7035,7 +7035,7 @@ index fab94e0ac0f4ab8f7d7decec53adb1f3ac7a6e07..cd853346eb019b00fa99478e7aee2961
+ +
+Vector<uint8_t> data(cairo_surface_t* image, const String& mimeType, std::optional<double> quality) +Vector<uint8_t> data(cairo_surface_t* image, const String& mimeType, std::optional<double> quality)
{ {
+ if (mimeType == "image/jpeg") { + if (mimeType == "image/jpeg"_s) {
+ int qualityPercent = 100; + int qualityPercent = 100;
+ if (quality) + if (quality)
+ qualityPercent = static_cast<int>(*quality * 100.0 + 0.5); + qualityPercent = static_cast<int>(*quality * 100.0 + 0.5);
@ -7419,7 +7419,7 @@ index 80958ba565a877224d0ed37e4e4057b4be0dde24..eca42bf5181bc4a95efca9c9c3f5ce0f
auto* display = gdk_display_get_default(); auto* display = gdk_display_get_default();
if (!display) if (!display)
diff --git a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp diff --git a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp
index ae439e30f1fb239d18e1164e8896dfb272c75673..93bbf2bdfc99df151c9b82df07eb5a07fae0b2c4 100644 index ae439e30f1fb239d18e1164e8896dfb272c75673..c004d77c162f87701278fa1ada9200b92a8e7838 100644
--- a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp --- a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp
+++ b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp +++ b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp
@@ -32,6 +32,10 @@ @@ -32,6 +32,10 @@
@ -7438,11 +7438,11 @@ index ae439e30f1fb239d18e1164e8896dfb272c75673..93bbf2bdfc99df151c9b82df07eb5a07
String Pasteboard::readString(const String& type) String Pasteboard::readString(const String& type)
{ {
+ if (m_selectionData) { + if (m_selectionData) {
+ if (type == "text/plain") + if (type == "text/plain"_s)
+ return m_selectionData->text();; + return m_selectionData->text();;
+ if (type == "text/html") + if (type == "text/html"_s)
+ return m_selectionData->markup(); + return m_selectionData->markup();
+ if (type == "Files" || type == "text/uri-list") + if (type == "Files"_s || type == "text/uri-list"_s)
+ return m_selectionData->uriList(); + return m_selectionData->uriList();
+ return { }; + return { };
+ } + }
@ -7455,11 +7455,11 @@ index ae439e30f1fb239d18e1164e8896dfb272c75673..93bbf2bdfc99df151c9b82df07eb5a07
void Pasteboard::writeString(const String& type, const String& text) void Pasteboard::writeString(const String& type, const String& text)
{ {
+ if (m_selectionData) { + if (m_selectionData) {
+ if (type == "Files" || type == "text/uri-list") + if (type == "Files"_s || type == "text/uri-list"_s)
+ m_selectionData->setURIList(text); + m_selectionData->setURIList(text);
+ else if (type == "text/html") + else if (type == "text/html"_s)
+ m_selectionData->setMarkup(text); + m_selectionData->setMarkup(text);
+ else if (type == "text/plain") + else if (type == "text/plain"_s)
+ m_selectionData->setText(text); + m_selectionData->setText(text);
+ return; + return;
+ } + }