Source/modules/webgl/WebGLRenderingContext.h - Issue 1325453007: Added support for EXTDisjointTimerQuery on the Blink side.

Side by Side Diff: Source/modules/webgl/WebGLRenderingContext.h

Issue 1325453007: Added support for EXTDisjointTimerQuery on the Blink side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: GL_INVALID_ENUM when timer query not enabled for GetParameter, use context3d for deletion Created 5 years, 3 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

« no previous file with comments | « Source/modules/webgl/WebGLExtensionName.h ('k') | Source/modules/webgl/WebGLRenderingContext.cpp » ('j') | no next file with comments »

OLD	NEW
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 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 EAGERLY_FINALIZE();	57 EAGERLY_FINALIZE();

58 DECLARE_VIRTUAL_TRACE();	58 DECLARE_VIRTUAL_TRACE();

59	59

60 private:	60 private:

61 WebGLRenderingContext(HTMLCanvasElement*, PassOwnPtr<WebGraphicsContext3D>, const WebGLContextAttributes&);	61 WebGLRenderingContext(HTMLCanvasElement*, PassOwnPtr<WebGraphicsContext3D>, const WebGLContextAttributes&);

62	62

63 // Enabled extension objects.	63 // Enabled extension objects.

64 PersistentWillBeMember<ANGLEInstancedArrays> m_angleInstancedArrays;	64 PersistentWillBeMember<ANGLEInstancedArrays> m_angleInstancedArrays;

65 PersistentWillBeMember<CHROMIUMSubscribeUniform> m_chromiumSubscribeUniform;	65 PersistentWillBeMember<CHROMIUMSubscribeUniform> m_chromiumSubscribeUniform;

66 PersistentWillBeMember<EXTBlendMinMax> m_extBlendMinMax;	66 PersistentWillBeMember<EXTBlendMinMax> m_extBlendMinMax;

	67 PersistentWillBeMember<EXTDisjointTimerQuery> m_extDisjointTimerQuery;

67 PersistentWillBeMember<EXTFragDepth> m_extFragDepth;	68 PersistentWillBeMember<EXTFragDepth> m_extFragDepth;

68 PersistentWillBeMember<EXTShaderTextureLOD> m_extShaderTextureLOD;	69 PersistentWillBeMember<EXTShaderTextureLOD> m_extShaderTextureLOD;

69 PersistentWillBeMember<EXTsRGB> m_extsRGB;	70 PersistentWillBeMember<EXTsRGB> m_extsRGB;

70 PersistentWillBeMember<EXTTextureFilterAnisotropic> m_extTextureFilterAnisot ropic;	71 PersistentWillBeMember<EXTTextureFilterAnisotropic> m_extTextureFilterAnisot ropic;

71 PersistentWillBeMember<OESTextureFloat> m_oesTextureFloat;	72 PersistentWillBeMember<OESTextureFloat> m_oesTextureFloat;

72 PersistentWillBeMember<OESTextureFloatLinear> m_oesTextureFloatLinear;	73 PersistentWillBeMember<OESTextureFloatLinear> m_oesTextureFloatLinear;

73 PersistentWillBeMember<OESTextureHalfFloat> m_oesTextureHalfFloat;	74 PersistentWillBeMember<OESTextureHalfFloat> m_oesTextureHalfFloat;

74 PersistentWillBeMember<OESTextureHalfFloatLinear> m_oesTextureHalfFloatLinea r;	75 PersistentWillBeMember<OESTextureHalfFloatLinear> m_oesTextureHalfFloatLinea r;

75 PersistentWillBeMember<OESStandardDerivatives> m_oesStandardDerivatives;	76 PersistentWillBeMember<OESStandardDerivatives> m_oesStandardDerivatives;

76 PersistentWillBeMember<OESVertexArrayObject> m_oesVertexArrayObject;	77 PersistentWillBeMember<OESVertexArrayObject> m_oesVertexArrayObject;

(...skipping 10 matching lines...) Expand all Loading...
87 PersistentWillBeMember<WebGLDepthTexture> m_webglDepthTexture;	88 PersistentWillBeMember<WebGLDepthTexture> m_webglDepthTexture;

88 };	89 };

89	90

90 DEFINE_TYPE_CASTS(WebGLRenderingContext, CanvasRenderingContext, context,	91 DEFINE_TYPE_CASTS(WebGLRenderingContext, CanvasRenderingContext, context,

91 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 1,	92 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 1,

92 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 1) ;	93 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 1) ;

93	94

94 } // namespace blink	95 } // namespace blink

95	96

96 #endif // WebGLRenderingContext_h	97 #endif // WebGLRenderingContext_h

OLD	NEW