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

Side by Side Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h

Issue 2229743003: add HitTestCanvasResult Class instend of std::pair<Element*, String> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add HitTestCanvasResult Class instend of std::pair<Element*, String> Created 4 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed.
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 class CanvasImageSource; 48 class CanvasImageSource;
49 class Element; 49 class Element;
50 class ExceptionState; 50 class ExceptionState;
51 class FloatRect; 51 class FloatRect;
52 class FloatSize; 52 class FloatSize;
53 class Font; 53 class Font;
54 class FontMetrics; 54 class FontMetrics;
55 class HitRegion; 55 class HitRegion;
56 class HitRegionOptions; 56 class HitRegionOptions;
57 class HitRegionManager; 57 class HitRegionManager;
58 class HitTestCanvasResult;
58 class Path2D; 59 class Path2D;
59 class SVGMatrixTearOff; 60 class SVGMatrixTearOff;
60 class TextMetrics; 61 class TextMetrics;
61 62
62 typedef HTMLImageElementOrHTMLVideoElementOrHTMLCanvasElementOrImageBitmap Canva sImageSourceUnion; 63 typedef HTMLImageElementOrHTMLVideoElementOrHTMLCanvasElementOrImageBitmap Canva sImageSourceUnion;
63 64
64 class MODULES_EXPORT CanvasRenderingContext2D final : public CanvasRenderingCont ext, public BaseRenderingContext2D, public WebThread::TaskObserver, public SVGRe sourceClient { 65 class MODULES_EXPORT CanvasRenderingContext2D final : public CanvasRenderingCont ext, public BaseRenderingContext2D, public WebThread::TaskObserver, public SVGRe sourceClient {
65 DEFINE_WRAPPERTYPEINFO(); 66 DEFINE_WRAPPERTYPEINFO();
66 USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext2D); 67 USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext2D);
67 USING_PRE_FINALIZER(CanvasRenderingContext2D, dispose); 68 USING_PRE_FINALIZER(CanvasRenderingContext2D, dispose);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 void loseContext(LostContextMode) override; 128 void loseContext(LostContextMode) override;
128 void didSetSurfaceSize() override; 129 void didSetSurfaceSize() override;
129 130
130 void restoreCanvasMatrixClipStack(SkCanvas*) const override; 131 void restoreCanvasMatrixClipStack(SkCanvas*) const override;
131 132
132 // TaskObserver implementation 133 // TaskObserver implementation
133 void didProcessTask() override; 134 void didProcessTask() override;
134 void willProcessTask() override { } 135 void willProcessTask() override { }
135 136
136 void styleDidChange(const ComputedStyle* oldStyle, const ComputedStyle& newS tyle) override; 137 void styleDidChange(const ComputedStyle* oldStyle, const ComputedStyle& newS tyle) override;
137 std::pair<Element*, String> getControlAndIdIfHitRegionExists(const LayoutPoi nt& location) override; 138 HitTestCanvasResult* getControlAndIdIfHitRegionExists(const LayoutPoint& loc ation) override;
138 String getIdFromControl(const Element*) override; 139 String getIdFromControl(const Element*) override;
139 140
140 // SVGResourceClient implementation 141 // SVGResourceClient implementation
141 void filterNeedsInvalidation() override; 142 void filterNeedsInvalidation() override;
142 143
143 // BaseRenderingContext2D implementation 144 // BaseRenderingContext2D implementation
144 bool originClean() const final; 145 bool originClean() const final;
145 void setOriginTainted() final; 146 void setOriginTainted() final;
146 bool wouldTaintOrigin(CanvasImageSource* source, ExecutionContext*) final { return CanvasRenderingContext::wouldTaintOrigin(source); } 147 bool wouldTaintOrigin(CanvasImageSource* source, ExecutionContext*) final { return CanvasRenderingContext::wouldTaintOrigin(source); }
147 148
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 bool m_pruneLocalFontCacheScheduled; 226 bool m_pruneLocalFontCacheScheduled;
226 ListHashSet<String> m_fontLRUList; 227 ListHashSet<String> m_fontLRUList;
227 }; 228 };
228 229
229 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, 230 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context,
230 context->is2d() && context->canvas(), context.is2d() && context.canvas()); 231 context->is2d() && context->canvas(), context.is2d() && context.canvas());
231 232
232 } // namespace blink 233 } // namespace blink
233 234
234 #endif // CanvasRenderingContext2D_h 235 #endif // CanvasRenderingContext2D_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698