From 39ccd85d77c67eabbc48bd5d249114875e17bde9 Mon Sep 17 00:00:00 2001
From: Mike Wiedenbauer <mike.wiedenbauer@unblu.com>
Date: Thu, 22 Feb 2018 19:05:54 +0000
Subject: [PATCH] Fixes encoding issues when using a custom resource handler
 (issue #1906).

---
 libcef/browser/net/resource_request_job.cc | 8 ++++++++
 libcef/browser/net/resource_request_job.h  | 1 +
 2 files changed, 9 insertions(+)

diff --git a/libcef/browser/net/resource_request_job.cc b/libcef/browser/net/resource_request_job.cc
index fba071877..bdfd8b731 100644
--- a/libcef/browser/net/resource_request_job.cc
+++ b/libcef/browser/net/resource_request_job.cc
@@ -328,6 +328,14 @@ bool CefResourceRequestJob::GetMimeType(std::string* mime_type) const {
   return true;
 }
 
+bool CefResourceRequestJob::GetCharset(std::string* charset) {
+  CEF_REQUIRE_IOT();
+
+  if (net::HttpResponseHeaders *headers = GetResponseHeaders())
+    return headers->GetCharset(charset);
+  return false;
+}
+
 void CefResourceRequestJob::SendHeaders() {
   CEF_REQUIRE_IOT();
 
diff --git a/libcef/browser/net/resource_request_job.h b/libcef/browser/net/resource_request_job.h
index d73ed4341..aad333619 100644
--- a/libcef/browser/net/resource_request_job.h
+++ b/libcef/browser/net/resource_request_job.h
@@ -40,6 +40,7 @@ class CefResourceRequestJob : public net::URLRequestJob {
   void GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override;
   bool IsRedirectResponse(GURL* location, int* http_status_code) override;
   bool GetMimeType(std::string* mime_type) const override;
+  bool GetCharset(std::string* charset) override;
 
   void SendHeaders();