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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/GraphicsContext.h

Issue 2513893002: Make ifdefs consistent in WebKit/Source/core/ (Closed)
Patch Set: Added #if DCHECK_IS_ON where needed. Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008-2009 Torch Mobile, Inc. 3 * Copyright (C) 2008-2009 Torch Mobile, Inc.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. 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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 unsigned m_paintStateIndex; 442 unsigned m_paintStateIndex;
443 443
444 // Raw pointer to the current state. 444 // Raw pointer to the current state.
445 GraphicsContextState* m_paintState; 445 GraphicsContextState* m_paintState;
446 446
447 SkPictureRecorder m_pictureRecorder; 447 SkPictureRecorder m_pictureRecorder;
448 448
449 SkMetaData m_metaData; 449 SkMetaData m_metaData;
450 450
451 #if DCHECK_IS_ON() 451 #if DCHECK_IS_ON()
452 unsigned m_layerCount; 452 int m_layerCount;
Yuta Kitamura 2016/11/21 09:26:12 You don't have to change this.
Alexander Alekseev 2016/11/23 09:20:30 Compilation of DCHECK_GT fails on windows with "si
453 bool m_disableDestructionChecks; 453 bool m_disableDestructionChecks;
454 bool m_inDrawingRecorder; 454 bool m_inDrawingRecorder;
455 #endif 455 #endif
456 456
457 const DisabledMode m_disabledState; 457 const DisabledMode m_disabledState;
458 458
459 float m_deviceScaleFactor; 459 float m_deviceScaleFactor;
460 460
461 unsigned m_printing : 1; 461 unsigned m_printing : 1;
462 unsigned m_hasMetaData : 1; 462 unsigned m_hasMetaData : 1;
463 }; 463 };
464 464
465 } // namespace blink 465 } // namespace blink
466 466
467 #endif // GraphicsContext_h 467 #endif // GraphicsContext_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698