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

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 // Eagerly finalize WebGLRenderingContextBase in order for it 412 // Eagerly finalize WebGLRenderingContextBase in order for it
413 // to (first) be able to detach its WebGLContextObjects, before 413 // to (first) be able to detach its WebGLContextObjects, before
414 // they're later swept and finalized. 414 // they're later swept and finalized.
415 EAGERLY_FINALIZE(); 415 EAGERLY_FINALIZE();
416 DECLARE_VIRTUAL_TRACE(); 416 DECLARE_VIRTUAL_TRACE();
417 417
418 // Returns approximate gpu memory allocated per pixel. 418 // Returns approximate gpu memory allocated per pixel.
419 int externallyAllocatedBytesPerPixel() override; 419 int externallyAllocatedBytesPerPixel() override;
420 420
421 class TextureUnitState { 421 class TextureUnitState {
422 ALLOW_ONLY_INLINE_ALLOCATION(); 422 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
423 public: 423 public:
424 Member<WebGLTexture> m_texture2DBinding; 424 Member<WebGLTexture> m_texture2DBinding;
425 Member<WebGLTexture> m_textureCubeMapBinding; 425 Member<WebGLTexture> m_textureCubeMapBinding;
426 Member<WebGLTexture> m_texture3DBinding; 426 Member<WebGLTexture> m_texture3DBinding;
427 Member<WebGLTexture> m_texture2DArrayBinding; 427 Member<WebGLTexture> m_texture2DArrayBinding;
428 428
429 DECLARE_TRACE(); 429 DECLARE_TRACE();
430 }; 430 };
431 431
432 void setFilterQuality(SkFilterQuality) override; 432 void setFilterQuality(SkFilterQuality) override;
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 static WebGLRenderingContextBase* oldestEvictedContext(); 1130 static WebGLRenderingContextBase* oldestEvictedContext();
1131 }; 1131 };
1132 1132
1133 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d()); 1133 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d());
1134 1134
1135 } // namespace blink 1135 } // namespace blink
1136 1136
1137 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState); 1137 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState);
1138 1138
1139 #endif // WebGLRenderingContextBase_h 1139 #endif // WebGLRenderingContextBase_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698