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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/modules/imagebitmap/ImageBitmapFactories.cpp

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp ('k') | Source/modules/indexeddb/IDBCursor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/imagebitmap/ImageBitmapFactories.cpp
diff --git a/Source/modules/imagebitmap/ImageBitmapFactories.cpp b/Source/modules/imagebitmap/ImageBitmapFactories.cpp
index 4cad33c139321f997fd3c6794632169f2062ab97..88f0c559e36a6e02fa2db58896753c9ef4b537bd 100644
--- a/Source/modules/imagebitmap/ImageBitmapFactories.cpp
+++ b/Source/modules/imagebitmap/ImageBitmapFactories.cpp
@@ -73,129 +73,129 @@ static ScriptPromise fulfillImageBitmap(ExecutionContext* context, PassRefPtr<Im
return promise;
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, ExceptionState& exceptionState)
{
LayoutSize s = sizeFor(image);
- return createImageBitmap(eventTarget, image, 0, 0, s.width(), s.height(), es);
+ return createImageBitmap(eventTarget, image, 0, 0, s.width(), s.height(), exceptionState);
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
{
// This variant does not work in worker threads.
ASSERT(eventTarget->toDOMWindow());
if (!image) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return ScriptPromise();
}
if (!image->cachedImage()) {
- es.throwUninformativeAndGenericDOMException(InvalidStateError);
+ exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
return ScriptPromise();
}
if (image->cachedImage()->image()->isSVGImage()) {
- es.throwUninformativeAndGenericDOMException(InvalidStateError);
+ exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
return ScriptPromise();
}
if (!sw || !sh) {
- es.throwUninformativeAndGenericDOMException(IndexSizeError);
+ exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
return ScriptPromise();
}
if (!image->cachedImage()->image()->currentFrameHasSingleSecurityOrigin()) {
- es.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "the source image contains cross-origin image data."));
+ exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "the source image contains cross-origin image data."));
return ScriptPromise();
}
if (!image->cachedImage()->passesAccessControlCheck(eventTarget->toDOMWindow()->document()->securityOrigin())
&& eventTarget->toDOMWindow()->document()->securityOrigin()->taintsCanvas(image->src())) {
- es.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "cross-origin access to the source image is denied."));
+ exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "cross-origin access to the source image is denied."));
return ScriptPromise();
}
// FIXME: make ImageBitmap creation asynchronous crbug.com/258082
return fulfillImageBitmap(eventTarget->executionContext(), ImageBitmap::create(image, IntRect(sx, sy, sw, sh)));
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, ExceptionState& exceptionState)
{
IntSize s = sizeFor(video);
- return createImageBitmap(eventTarget, video, 0, 0, s.width(), s.height(), es);
+ return createImageBitmap(eventTarget, video, 0, 0, s.width(), s.height(), exceptionState);
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
{
// This variant does not work in worker threads.
ASSERT(eventTarget->toDOMWindow());
if (!video) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return ScriptPromise();
}
if (!video->player()) {
- es.throwUninformativeAndGenericDOMException(InvalidStateError);
+ exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
return ScriptPromise();
}
if (video->networkState() == HTMLMediaElement::NETWORK_EMPTY) {
- es.throwUninformativeAndGenericDOMException(InvalidStateError);
+ exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
return ScriptPromise();
}
if (video->player()->readyState() <= MediaPlayer::HaveMetadata) {
- es.throwUninformativeAndGenericDOMException(InvalidStateError);
+ exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
return ScriptPromise();
}
if (!sw || !sh) {
- es.throwUninformativeAndGenericDOMException(IndexSizeError);
+ exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
return ScriptPromise();
}
if (!video->hasSingleSecurityOrigin()) {
- es.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "the source video contains cross-origin image data."));
+ exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "the source video contains cross-origin image data."));
return ScriptPromise();
}
if (!video->player()->didPassCORSAccessCheck() && eventTarget->toDOMWindow()->document()->securityOrigin()->taintsCanvas(video->currentSrc())) {
- es.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "cross-origin access to the source video is denied."));
+ exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("createImageBitmap", "ImageBitmapFactories", "cross-origin access to the source video is denied."));
return ScriptPromise();
}
// FIXME: make ImageBitmap creation asynchronous crbug.com/258082
return fulfillImageBitmap(eventTarget->executionContext(), ImageBitmap::create(video, IntRect(sx, sy, sw, sh)));
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, ExceptionState& exceptionState)
{
- return createImageBitmap(eventTarget, context->canvas(), es);
+ return createImageBitmap(eventTarget, context->canvas(), exceptionState);
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
{
- return createImageBitmap(eventTarget, context->canvas(), sx, sy, sw, sh, es);
+ return createImageBitmap(eventTarget, context->canvas(), sx, sy, sw, sh, exceptionState);
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, ExceptionState& exceptionState)
{
- return createImageBitmap(eventTarget, canvas, 0, 0, canvas->width(), canvas->height(), es);
+ return createImageBitmap(eventTarget, canvas, 0, 0, canvas->width(), canvas->height(), exceptionState);
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
{
// This variant does not work in worker threads.
ASSERT(eventTarget->toDOMWindow());
if (!canvas) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return ScriptPromise();
}
if (!canvas->originClean()) {
- es.throwUninformativeAndGenericDOMException(InvalidStateError);
+ exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
return ScriptPromise();
}
if (!sw || !sh) {
- es.throwUninformativeAndGenericDOMException(IndexSizeError);
+ exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
return ScriptPromise();
}
// FIXME: make ImageBitmap creation asynchronous crbug.com/258082
return fulfillImageBitmap(eventTarget->executionContext(), ImageBitmap::create(canvas, IntRect(sx, sy, sw, sh)));
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, Blob* blob, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, Blob* blob, ExceptionState& exceptionState)
{
if (!blob) {
- es.throwUninformativeAndGenericDOMException(TypeError);
+ exceptionState.throwUninformativeAndGenericDOMException(TypeError);
return ScriptPromise();
}
ScriptPromise promise = ScriptPromise::createPending(eventTarget->executionContext());
@@ -206,14 +206,14 @@ ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget,
return promise;
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, Blob* blob, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, Blob* blob, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
{
if (!blob) {
- es.throwUninformativeAndGenericDOMException(TypeError);
+ exceptionState.throwUninformativeAndGenericDOMException(TypeError);
return ScriptPromise();
}
if (!sw || !sh) {
- es.throwUninformativeAndGenericDOMException(IndexSizeError);
+ exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
return ScriptPromise();
}
ScriptPromise promise = ScriptPromise::createPending(eventTarget->executionContext());
@@ -224,38 +224,38 @@ ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget,
return promise;
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageData* data, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageData* data, ExceptionState& exceptionState)
{
- return createImageBitmap(eventTarget, data, 0, 0, data->width(), data->height(), es);
+ return createImageBitmap(eventTarget, data, 0, 0, data->width(), data->height(), exceptionState);
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageData* data, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageData* data, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
{
if (!data) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return ScriptPromise();
}
if (!sw || !sh) {
- es.throwUninformativeAndGenericDOMException(IndexSizeError);
+ exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
return ScriptPromise();
}
// FIXME: make ImageBitmap creation asynchronous crbug.com/258082
return fulfillImageBitmap(eventTarget->executionContext(), ImageBitmap::create(data, IntRect(sx, sy, sw, sh)));
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, ExceptionState& exceptionState)
{
- return createImageBitmap(eventTarget, bitmap, 0, 0, bitmap->width(), bitmap->height(), es);
+ return createImageBitmap(eventTarget, bitmap, 0, 0, bitmap->width(), bitmap->height(), exceptionState);
}
-ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptPromise ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
{
if (!bitmap) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return ScriptPromise();
}
if (!sw || !sh) {
- es.throwUninformativeAndGenericDOMException(IndexSizeError);
+ exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
return ScriptPromise();
}
// FIXME: make ImageBitmap creation asynchronous crbug.com/258082
« no previous file with comments | « Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp ('k') | Source/modules/indexeddb/IDBCursor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698