Adaptations for Chromium 73

Change-Id: I565d1e327852110a5abebed3388d7cd6986bef06
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

5 files changed, 47 insertions, 32 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index a166186a5..fa1e20f24 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -70,7 +70,6 @@
 #include "net/base/net_errors.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "services/service_manager/public/cpp/service_context.h"
 #include "third_party/blink/public/platform/web_url_error.h"
 #include "third_party/blink/public/platform/web_url_request.h"
 #include "third_party/blink/public/web/web_security_policy.h"
@@ -238,28 +237,35 @@ bool ContentRendererClientQt::ShouldSuppressErrorPage(content::RenderFrame *fram
 }
 
 // To tap into the chromium localized strings. Ripped from the chrome layer (highly simplified).
-void ContentRendererClientQt::PrepareErrorPage(content::RenderFrame* renderFrame, const blink::WebURLRequest &failedRequest,
+void ContentRendererClientQt::PrepareErrorPage(content::RenderFrame *renderFrame,
                                                const blink::WebURLError &web_error,
+                                               const std::string &httpMethod,
+                                               bool ignoring_cache,
                                                std::string *errorHtml)
 {
-    GetNavigationErrorStringsInternal(renderFrame, failedRequest,
+    Q_UNUSED(ignoring_cache);
+    GetNavigationErrorStringsInternal(renderFrame, httpMethod,
                                       error_page::Error::NetError(web_error.url(), web_error.reason(), web_error.has_copy_in_cache()),
                                       errorHtml);
 }
 
-void ContentRendererClientQt::PrepareErrorPageForHttpStatusError(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
-                                                                 const GURL& unreachable_url, int http_status,
-                                                                 std::string* errorHtml)
+void ContentRendererClientQt::PrepareErrorPageForHttpStatusError(content::RenderFrame *renderFrame,
+                                                                 const GURL &unreachable_url,
+                                                                 const std::string &httpMethod,
+                                                                 bool ignoring_cache,
+                                                                 int http_status,
+                                                                 std::string *errorHtml)
 {
-    GetNavigationErrorStringsInternal(renderFrame, failedRequest,
+    Q_UNUSED(ignoring_cache);
+    GetNavigationErrorStringsInternal(renderFrame, httpMethod,
                                       error_page::Error::HttpError(unreachable_url, http_status),
                                       errorHtml);
 }
 
-void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderFrame *renderFrame, const blink::WebURLRequest &failedRequest, const error_page::Error &error, std::string *errorHtml)
+void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderFrame *renderFrame, const std::string &httpMethod, const error_page::Error &error, std::string *errorHtml)
 {
     Q_UNUSED(renderFrame)
-    const bool isPost = QByteArray::fromStdString(failedRequest.HttpMethod().Utf8()) == QByteArrayLiteral("POST");
+    const bool isPost = QByteArray::fromStdString(httpMethod) == QByteArrayLiteral("POST");
 
     if (errorHtml) {
         // Use a local error page.
@@ -457,8 +463,8 @@ static media::SupportedCodecs GetSupportedCodecs(const std::vector<media::VideoC
             supported_codecs |= media::EME_CODEC_VP8;
             break;
         case media::VideoCodec::kCodecVP9:
-            supported_codecs |= media::EME_CODEC_LEGACY_VP9;
-            supported_codecs |= media::EME_CODEC_VP9;
+            supported_codecs |= media::EME_CODEC_VP9_PROFILE0;
+            supported_codecs |= media::EME_CODEC_VP9_PROFILE2;
             break;
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
         case media::VideoCodec::kCodecH264:
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 9ec48cb2c..9aebe5bb3 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -87,11 +87,17 @@ public:
     bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override;
     bool HasErrorPage(int http_status_code) override;
 
-    void PrepareErrorPage(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
-                          const blink::WebURLError& error, std::string* errorHtml) override;
-    void PrepareErrorPageForHttpStatusError(content::RenderFrame* render_frame, const blink::WebURLRequest& failed_request,
-                                            const GURL& unreachable_url, int http_status,
-                                            std::string* error_html) override;
+    void PrepareErrorPage(content::RenderFrame *render_frame,
+                          const blink::WebURLError &error,
+                          const std::string &http_method,
+                          bool ignoring_cache,
+                          std::string *error_html) override;
+    void PrepareErrorPageForHttpStatusError(content::RenderFrame *render_frame,
+                                            const GURL &unreachable_url,
+                                            const std::string &http_method,
+                                            bool ignoring_cache,
+                                            int http_status,
+                                            std::string *error_html) override;
 
     unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) override;
     bool IsLinkVisited(unsigned long long linkHash) override;
@@ -129,7 +135,7 @@ private:
     // service_manager::LocalInterfaceProvider:
     void GetInterface(const std::string& name, mojo::ScopedMessagePipeHandle request_handle) override;
 
-    void GetNavigationErrorStringsInternal(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
+    void GetNavigationErrorStringsInternal(content::RenderFrame* renderFrame, const std::string &httpMethod,
                                            const error_page::Error& error, std::string* errorHtml);
 
     QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave;
diff --git a/src/core/renderer/extensions/resource_request_policy_qt.cpp b/src/core/renderer/extensions/resource_request_policy_qt.cpp
index dc5a90120..a64b1fef8 100644
--- a/src/core/renderer/extensions/resource_request_policy_qt.cpp
+++ b/src/core/renderer/extensions/resource_request_policy_qt.cpp
@@ -50,6 +50,7 @@
 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
 #include "extensions/common/manifest_handlers/webview_info.h"
 #include "extensions/renderer/dispatcher.h"
+#include "third_party/blink/public/mojom/devtools/console_message.mojom-shared.h"
 #include "third_party/blink/public/web/web_console_message.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_local_frame.h"
@@ -172,7 +173,7 @@ bool ResourceRequestPolicyQt::CanRequestResource(const GURL &resource_url,
                     "web_accessible_resources manifest key in order to be loaded by "
                     "pages outside the extension.",
                     resource_url.spec().c_str());
-        frame->AddMessageToConsole(blink::WebConsoleMessage(blink::WebConsoleMessage::kLevelError, blink::WebString::FromUTF8(message)));
+        frame->AddMessageToConsole(blink::WebConsoleMessage(blink::mojom::ConsoleMessageLevel::kError, blink::WebString::FromUTF8(message)));
         return false;
     }
 
diff --git a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp
index 9ad59f939..9af05fd08 100644
--- a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp
+++ b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp
@@ -70,6 +70,7 @@
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/private/SkTemplates.h"
 #include "ui/gfx/geometry/rect.h"
@@ -299,14 +300,12 @@ int32_t PepperFlashRendererHostQt::OnDrawGlyphs(
 
     SkPaint paint;
     paint.setColor(params.color);
-    paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-    paint.setAntiAlias(true);
-    paint.setHinting(SkFontHinting::kFull);
-    paint.setTextSize(SkIntToScalar(params.font_desc.size));
-    paint.setTypeface(std::move(typeface));
+
+    SkFont font(std::move(typeface), SkIntToScalar(params.font_desc.size));
+    font.setHinting(SkFontHinting::kFull);
     if (params.allow_subpixel_aa) {
-        paint.setSubpixelText(true);
-        paint.setLCDRenderText(true);
+        font.setSubpixel(true);
+        font.setEdging(SkFont::Edging::kSubpixelAntiAlias);
     }
 
     SkScalar x = SkIntToScalar(params.position.x);
@@ -315,15 +314,16 @@ int32_t PepperFlashRendererHostQt::OnDrawGlyphs(
     // Build up the skia advances.
     size_t glyph_count = params.glyph_indices.size();
     if (glyph_count) {
-        std::vector<SkPoint> sk_positions(glyph_count);
+        SkTextBlobBuilder builder;
+        auto rec = builder.allocRunPos(font, glyph_count);
+        memcpy(rec.glyphs, &params.glyph_indices[0], glyph_count * 2);
+        SkPoint* pos = reinterpret_cast<SkPoint*>(rec.pos);
         for (uint32_t i = 0; i < glyph_count; i++) {
-            sk_positions[i].set(x, y);
+            pos[i].set(x, y);
             x += SkFloatToScalar(params.glyph_advances[i].x);
             y += SkFloatToScalar(params.glyph_advances[i].y);
         }
-
-        canvas->drawPosText(
-            &params.glyph_indices[0], glyph_count * 2, &sk_positions[0], paint);
+        canvas->drawTextBlob(builder.make(), 0, 0, paint);
     }
 
     if (needs_unmapping)
@@ -351,7 +351,7 @@ int32_t PepperFlashRendererHostQt::OnNavigate(
     std::map<std::string, FlashNavigateUsage>& rejected_headers =
             g_rejected_headers.Get();
     if (rejected_headers.empty()) {
-        for (size_t i = 0; i < arraysize(kRejectedHttpRequestHeaders); ++i)
+        for (size_t i = 0; i < base::size(kRejectedHttpRequestHeaders); ++i)
             rejected_headers[kRejectedHttpRequestHeaders[i]] =
                     static_cast<FlashNavigateUsage>(i);
     }
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp
index f1da8289a..3b9c17b6a 100644
--- a/src/core/renderer/web_channel_ipc_transport.cpp
+++ b/src/core/renderer/web_channel_ipc_transport.cpp
@@ -119,7 +119,9 @@ void WebChannelTransport::Uninstall(blink::WebLocalFrame *frame, uint worldId)
     if (qtObjectValue.IsEmpty() || !qtObjectValue->IsObject())
         return;
     v8::Local<v8::Object> qtObject = v8::Local<v8::Object>::Cast(qtObjectValue);
-    qtObject->Delete(gin::StringToV8(isolate, "webChannelTransport"));
+    // FIXME: ?
+    auto whocares = qtObject->Delete(context, gin::StringToV8(isolate, "webChannelTransport"));
+    Q_UNUSED(whocares);
 }
 
 void WebChannelTransport::NativeQtSendMessage(gin::Arguments *args)