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

Side by Side Diff: Source/core/html/canvas/CanvasRenderingContext2D.h

Issue 293963009: Fixing GraphicsContext state checks to support oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: removed change to test expectations 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 | Annotate | Revision Log
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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 328
329 template<class T> void fullCanvasCompositedFill(const T&); 329 template<class T> void fullCanvasCompositedFill(const T&);
330 template<class T> void fullCanvasCompositedStroke(const T&); 330 template<class T> void fullCanvasCompositedStroke(const T&);
331 template<class T> void fullCanvasCompositedDrawImage(T*, const FloatRect&, c onst FloatRect&, CompositeOperator); 331 template<class T> void fullCanvasCompositedDrawImage(T*, const FloatRect&, c onst FloatRect&, CompositeOperator);
332 332
333 void drawFocusIfNeededInternal(const Path&, Element*); 333 void drawFocusIfNeededInternal(const Path&, Element*);
334 bool focusRingCallIsValid(const Path&, Element*); 334 bool focusRingCallIsValid(const Path&, Element*);
335 void updateFocusRingAccessibility(const Path&, Element*); 335 void updateFocusRingAccessibility(const Path&, Element*);
336 void drawFocusRing(const Path&); 336 void drawFocusRing(const Path&);
337 337
338 void validateStateStack();
339
338 virtual bool is2d() const OVERRIDE { return true; } 340 virtual bool is2d() const OVERRIDE { return true; }
339 virtual bool isAccelerated() const OVERRIDE; 341 virtual bool isAccelerated() const OVERRIDE;
340 virtual bool hasAlpha() const OVERRIDE { return m_hasAlpha; } 342 virtual bool hasAlpha() const OVERRIDE { return m_hasAlpha; }
341 343
342 virtual bool isTransformInvertible() const OVERRIDE { return state().m_inver tibleCTM; } 344 virtual bool isTransformInvertible() const OVERRIDE { return state().m_inver tibleCTM; }
343 345
344 virtual blink::WebLayer* platformLayer() const OVERRIDE; 346 virtual blink::WebLayer* platformLayer() const OVERRIDE;
345 347
346 WillBeHeapVector<OwnPtrWillBeMember<State> > m_stateStack; 348 WillBeHeapVector<OwnPtrWillBeMember<State> > m_stateStack;
347 bool m_usesCSSCompatibilityParseMode; 349 bool m_usesCSSCompatibilityParseMode;
348 bool m_hasAlpha; 350 bool m_hasAlpha;
349 bool m_isContextLost; 351 bool m_isContextLost;
350 bool m_contextRestorable; 352 bool m_contextRestorable;
351 Canvas2DContextStorage m_storageMode; 353 Canvas2DContextStorage m_storageMode;
352 MutableStylePropertyMap m_fetchedFonts; 354 MutableStylePropertyMap m_fetchedFonts;
353 unsigned m_tryRestoreContextAttemptCount; 355 unsigned m_tryRestoreContextAttemptCount;
354 Timer<CanvasRenderingContext2D> m_dispatchContextLostEventTimer; 356 Timer<CanvasRenderingContext2D> m_dispatchContextLostEventTimer;
355 Timer<CanvasRenderingContext2D> m_dispatchContextRestoredEventTimer; 357 Timer<CanvasRenderingContext2D> m_dispatchContextRestoredEventTimer;
356 Timer<CanvasRenderingContext2D> m_tryRestoreContextEventTimer; 358 Timer<CanvasRenderingContext2D> m_tryRestoreContextEventTimer;
357 }; 359 };
358 360
359 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d()); 361 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());
360 362
361 } // namespace WebCore 363 } // namespace WebCore
362 364
363 #endif 365 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLCanvasElement.cpp ('k') | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698