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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.h

Issue 2101823002: Revert of Make 2D canvas disable gpu acceleration when getImageData is called (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp » ('j') | 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) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 // CanvasImageSource implementation 166 // CanvasImageSource implementation
167 PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*, AccelerationHi nt, SnapshotReason, const FloatSize&) const override; 167 PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*, AccelerationHi nt, SnapshotReason, const FloatSize&) const override;
168 bool wouldTaintOrigin(SecurityOrigin*) const override; 168 bool wouldTaintOrigin(SecurityOrigin*) const override;
169 FloatSize elementSize(const FloatSize&) const override; 169 FloatSize elementSize(const FloatSize&) const override;
170 bool isCanvasElement() const override { return true; } 170 bool isCanvasElement() const override { return true; }
171 bool isOpaque() const override; 171 bool isOpaque() const override;
172 172
173 // ImageBufferClient implementation 173 // ImageBufferClient implementation
174 void notifySurfaceInvalid() override; 174 void notifySurfaceInvalid() override;
175 bool isDirty() override { return !m_dirtyRect.isEmpty(); } 175 bool isDirty() override { return !m_dirtyRect.isEmpty(); }
176 void didDisableAcceleration() override;
177 void didFinalizeFrame() override; 176 void didFinalizeFrame() override;
178 void restoreCanvasMatrixClipStack(SkCanvas*) const override; 177 void restoreCanvasMatrixClipStack(SkCanvas*) const override;
179 178
180 void doDeferredPaintInvalidation(); 179 void doDeferredPaintInvalidation();
181 180
182 // ImageBitmapSource implementation 181 // ImageBitmapSource implementation
183 IntSize bitmapSourceSize() const override; 182 IntSize bitmapSourceSize() const override;
184 ScriptPromise createImageBitmap(ScriptState*, EventTarget&, int sx, int sy, int sw, int sh, const ImageBitmapOptions&, ExceptionState&) override; 183 ScriptPromise createImageBitmap(ScriptState*, EventTarget&, int sx, int sy, int sw, int sh, const ImageBitmapOptions&, ExceptionState&) override;
185 184
186 DECLARE_VIRTUAL_TRACE(); 185 DECLARE_VIRTUAL_TRACE();
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 257
259 mutable RefPtr<Image> m_copiedImage; // FIXME: This is temporary for platfor ms that have to copy the image buffer to render (and for CSSCanvasValue). 258 mutable RefPtr<Image> m_copiedImage; // FIXME: This is temporary for platfor ms that have to copy the image buffer to render (and for CSSCanvasValue).
260 259
261 // Used for OffscreenCanvas that controls this HTML canvas element 260 // Used for OffscreenCanvas that controls this HTML canvas element
262 std::unique_ptr<CanvasSurfaceLayerBridge> m_surfaceLayerBridge; 261 std::unique_ptr<CanvasSurfaceLayerBridge> m_surfaceLayerBridge;
263 }; 262 };
264 263
265 } // namespace blink 264 } // namespace blink
266 265
267 #endif // HTMLCanvasElement_h 266 #endif // HTMLCanvasElement_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698