diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 11:32:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:04:53 +0000 |
| commit | 74f10ff13d4f8713187678705f15baf4d10ca087 (patch) | |
| tree | 873b0847001747faf1092420ae8b50141c39fca9 | |
| parent | 23fb7e37aea3cf967c2d2884c6de675b5fdad276 (diff) | |
| download | qtwebengine-chromium-74f10ff13d4f8713187678705f15baf4d10ca087.tar.gz | |
[Backport] Simplify WebGL error message
The WebGL exception message text contains the full URL of a blocked
cross-origin resource. It should instead contain only a generic notice.
Bug: 799847
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/854986
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Eric Lawrence <elawrence@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#528458}(cherry picked from commit fae4d7b7d7e5c8a04a8b7a3258c0fc8362afa24c)
Reviewed-on: https://chromium-review.googlesource.com/868831
Reviewed-by: Eric Lawrence <elawrence@chromium.org>
Cr-Commit-Position: refs/branch-heads/3282@{#509}
Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840}
(CVE-2018-6047)
Change-Id: Id9970811725002071e0ec7d47a1a1ff51be0504c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp index db33e27ad97..fd621bdbf31 100644 --- a/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp +++ b/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp @@ -7314,9 +7314,8 @@ bool WebGLRenderingContextBase::ValidateHTMLImageElement( } if (WouldTaintOrigin(image, security_origin)) { - exception_state.ThrowSecurityError("The cross-origin image at " + - url.ElidedString() + - " may not be loaded."); + exception_state.ThrowSecurityError( + "The image element contains cross-origin data, and may not be loaded."); return false; } return true; |