diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-31 10:57:55 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-31 10:21:40 +0000 |
| commit | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (patch) | |
| tree | 23f76b8b6d7d0d591557301a728edbe60afa5695 /chromium/third_party/catapult/tracing/tracing/extras/importer/jszip.html | |
| parent | 39d357e3248f80abea0159765ff39554affb40db (diff) | |
| download | qtwebengine-chromium-2f583e4aec1ae3a86fa047829c96b310dc12ecdf.tar.gz | |
Update Chromium baseline
Removes catapult sources and adds in the skia commit hash header.
Change-Id: Ie2de97705eb4b234f6ac1b9f218123f20867a291
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/catapult/tracing/tracing/extras/importer/jszip.html')
| -rw-r--r-- | chromium/third_party/catapult/tracing/tracing/extras/importer/jszip.html | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/chromium/third_party/catapult/tracing/tracing/extras/importer/jszip.html b/chromium/third_party/catapult/tracing/tracing/extras/importer/jszip.html deleted file mode 100644 index 0840c06ff74..00000000000 --- a/chromium/third_party/catapult/tracing/tracing/extras/importer/jszip.html +++ /dev/null @@ -1,35 +0,0 @@ -<!DOCTYPE html> -<!-- -Copyright (c) 2013 The Chromium Authors. All rights reserved. -Use of this source code is governed by a BSD-style license that can be -found in the LICENSE file. ---> -<link rel="import" href="/tracing/base/base.html"> - -<script> -'use strict'; -// Vinn workaround for JSzip requiring window. -if (tr.isVinn) { - /** - * Hack. - */ - global.window = {}; -} -</script> -<script src="/jszip.min.js"></script> -<script> -'use strict'; -// Vinn workaround for JSzip requiring window. -if (tr.isVinn) { - /** - * Hack. - */ - global.JSZip = global.window.JSZip; - global.window = undefined; -} else if (tr.isNode) { - var jsZipAbsPath = HTMLImportsLoader.hrefToAbsolutePath( - '/jszip.min.js'); - var jsZipModule = require(jsZipAbsPath); - global.JSZip = jsZipModule; -} -</script> |