diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-06-06 15:15:33 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-07-24 13:36:40 +0000 |
| commit | 18f063e21c123b2a339735ab7129be74bed2b807 (patch) | |
| tree | 4282d0416dc52ba1b6b1b3b47a30daf9980f9e23 | |
| parent | 092e60c7937f9472414a3f9a74d8489ad6bf128c (diff) | |
| download | qtwebengine-chromium-18f063e21c123b2a339735ab7129be74bed2b807.tar.gz | |
Revert "Fix loading of blobs which have a qrc:// origin"
This reverts commit 32bfaba41ed8a2dd73d5c8ace0727ddac7fe0ae6.
Task-number: QTBUG-62536
Change-Id: I82b09e1cb5bd641cf6a5a099561202100e4a05bb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/url/scheme_host_port.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chromium/url/scheme_host_port.cc b/chromium/url/scheme_host_port.cc index 30caecc0a2c..c4f0ba5d5cc 100644 --- a/chromium/url/scheme_host_port.cc +++ b/chromium/url/scheme_host_port.cc @@ -23,8 +23,6 @@ namespace url { namespace { -extern const char kQrcScheme[] = "qrc"; - bool IsCanonicalHost(const base::StringPiece& host) { std::string canon_host; @@ -58,12 +56,9 @@ bool IsValidInput(const base::StringPiece& scheme, scheme.data(), Component(0, base::checked_cast<int>(scheme.length())), &scheme_type); - if (!is_standard && scheme != kQrcScheme) + if (!is_standard) return false; - if (scheme == kQrcScheme) - return true; - switch (scheme_type) { case SCHEME_WITH_HOST_AND_PORT: case SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION: |