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

Unified Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
index 5381db0a186105987795d0bf50e0422ea3bd75f4..54accd53d2dca6338cff3e2a5c958dbe6e2176c8 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
@@ -64,8 +64,8 @@ typedef HTMLImageElementOrHTMLVideoElementOrHTMLCanvasElementOrImageBitmap Canva
class MODULES_EXPORT CanvasRenderingContext2D final : public CanvasRenderingContext, public BaseRenderingContext2D, public WebThread::TaskObserver, public SVGResourceClient {
DEFINE_WRAPPERTYPEINFO();
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext2D);
- WILL_BE_USING_PRE_FINALIZER(CanvasRenderingContext2D, dispose);
+ USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext2D);
+ USING_PRE_FINALIZER(CanvasRenderingContext2D, dispose);
public:
class Factory : public CanvasRenderingContextFactory {
WTF_MAKE_NONCOPYABLE(Factory);
@@ -73,9 +73,9 @@ public:
Factory() {}
~Factory() override {}
- PassOwnPtrWillBeRawPtr<CanvasRenderingContext> create(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs, Document& document) override
+ RawPtr<CanvasRenderingContext> create(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs, Document& document) override
{
- return adoptPtrWillBeNoop(new CanvasRenderingContext2D(canvas, attrs, document));
+ return new CanvasRenderingContext2D(canvas, attrs, document);
}
CanvasRenderingContext::ContextType getContextType() const override { return CanvasRenderingContext::Context2d; }
void onError(HTMLCanvasElement*, const String& error) override { }
@@ -205,7 +205,7 @@ private:
WebLayer* platformLayer() const override;
- PersistentWillBeMember<HitRegionManager> m_hitRegionManager;
+ Member<HitRegionManager> m_hitRegionManager;
bool m_hasAlpha;
LostContextMode m_contextLostMode;
bool m_contextRestorable;

Powered by Google App Engine
This is Rietveld 408576698