Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Side by Side Diff: Source/modules/imagebitmap/ImageBitmapFactories.cpp

Issue 320843002: Safeguard for webMediaPlayer() access (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed review comments Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 ScriptPromise ImageBitmapFactories::createImageBitmap(ScriptState* scriptState, EventTarget& eventTarget, HTMLVideoElement* video, int sx, int sy, int sw, int s h, ExceptionState& exceptionState) 122 ScriptPromise ImageBitmapFactories::createImageBitmap(ScriptState* scriptState, EventTarget& eventTarget, HTMLVideoElement* video, int sx, int sy, int sw, int s h, ExceptionState& exceptionState)
123 { 123 {
124 // This variant does not work in worker threads. 124 // This variant does not work in worker threads.
125 ASSERT(eventTarget.toDOMWindow()); 125 ASSERT(eventTarget.toDOMWindow());
126 126
127 if (video->networkState() == HTMLMediaElement::NETWORK_EMPTY) { 127 if (video->networkState() == HTMLMediaElement::NETWORK_EMPTY) {
128 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t has not retrieved data."); 128 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t has not retrieved data.");
129 return ScriptPromise(); 129 return ScriptPromise();
130 } 130 }
131 if (video->readyState() <= HTMLMediaElement::HAVE_METADATA) { 131 // FIXME: Remove the below null check once we fix the bug 382721
132 if (video->readyState() <= HTMLMediaElement::HAVE_METADATA || !video->webMed iaPlayer()) {
132 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t's player has no current data."); 133 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t's player has no current data.");
133 return ScriptPromise(); 134 return ScriptPromise();
134 } 135 }
135 if (!sw || !sh) { 136 if (!sw || !sh) {
136 exceptionState.throwDOMException(IndexSizeError, String::format("The sou rce %s provided is 0.", sw ? "height" : "width")); 137 exceptionState.throwDOMException(IndexSizeError, String::format("The sou rce %s provided is 0.", sw ? "height" : "width"));
137 return ScriptPromise(); 138 return ScriptPromise();
138 } 139 }
139 if (!video->hasSingleSecurityOrigin()) { 140 if (!video->hasSingleSecurityOrigin()) {
140 exceptionState.throwSecurityError("The source video contains image data from multiple origins."); 141 exceptionState.throwSecurityError("The source video contains image data from multiple origins.");
141 return ScriptPromise(); 142 return ScriptPromise();
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 { 332 {
332 rejectPromise(); 333 rejectPromise();
333 } 334 }
334 335
335 void ImageBitmapFactories::ImageBitmapLoader::trace(Visitor* visitor) 336 void ImageBitmapFactories::ImageBitmapLoader::trace(Visitor* visitor)
336 { 337 {
337 visitor->trace(m_factory); 338 visitor->trace(m_factory);
338 } 339 }
339 340
340 } // namespace WebCore 341 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698