summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/fast/canvas
diff options
context:
space:
mode:
authortreib <treib@chromium.org>2016-01-11 08:20:20 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-11 16:21:06 +0000
commitf211b743e659391cf5b674dfe2ea29f6b0fe2b29 (patch)
tree8d7ab359f4dc926bd43d8eee4e87f7534e4ac2b4 /third_party/WebKit/LayoutTests/fast/canvas
parent04a313090df5eb6a419becc1588449c74aa1a7ae (diff)
downloadchromium_src-f211b743e659391cf5b674dfe2ea29f6b0fe2b29.zip
chromium_src-f211b743e659391cf5b674dfe2ea29f6b0fe2b29.tar.gz
chromium_src-f211b743e659391cf5b674dfe2ea29f6b0fe2b29.tar.bz2
Revert of Add a origin clean flag in ImageBitmap class (patchset #14 id:260001 of https://codereview.chromium.org/1532473002/ )
Reason for revert: Seems to have broken Oilpan builds: https://build.chromium.org/p/chromium.webkit/buildstatus?builder=WebKit%20Mac%20Oilpan&number=28566 https://build.chromium.org/p/chromium.webkit/buildstatus?builder=WebKit%20Linux%20Oilpan%20Builder&number=100 Original issue's description: > Add a origin clean flag in ImageBitmap class > > This CL adds a origin clean flag, such that in the case when the source > of the ImageBitmap contains cross-origin content, we can simply set this > flag instead of reject the promise. > > BUG=569779 > > Committed: https://crrev.com/10b9b4435e25fb8ede2122482426ae81c7980630 > Cr-Commit-Position: refs/heads/master@{#368595} TBR=junov@chromium.org,xidachen@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=569779 Review URL: https://codereview.chromium.org/1577783003 Cr-Commit-Position: refs/heads/master@{#368598}
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast/canvas')
-rw-r--r--third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-drawImage.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-drawImage.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-drawImage.html
index cd81dcf..6442e2a 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-drawImage.html
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-drawImage.html
@@ -154,6 +154,7 @@ function loaded() {
if (imageLoaded && imageBitmapLoaded && blobLoaded) {
// check all of these elements
elements = [image, aCanvas, d, testBitmap, blob];
+
// wait for callback to finish before each check to ensure synchronous behavior
nextCheck(0);
}