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

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

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 years, 10 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) 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 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 Image*, 1007 Image*,
1008 WebGLImageConversion::ImageHtmlDomSource, 1008 WebGLImageConversion::ImageHtmlDomSource,
1009 bool flipY, 1009 bool flipY,
1010 bool premultiplyAlpha, 1010 bool premultiplyAlpha,
1011 const IntRect&, 1011 const IntRect&,
1012 GLsizei depth, 1012 GLsizei depth,
1013 GLint unpackImageHeight); 1013 GLint unpackImageHeight);
1014 1014
1015 template <typename T> 1015 template <typename T>
1016 IntRect getTextureSourceSize(T* textureSource) { 1016 IntRect getTextureSourceSize(T* textureSource) {
1017 /* DO NOT SUBMIT - merge conflict marker.
1018 * Please spell |width| and |height| below. */
1019 return IntRect(0, 0, texture_source->width(), texture_source->height());
1017 return IntRect(0, 0, textureSource->width(), textureSource->height()); 1020 return IntRect(0, 0, textureSource->width(), textureSource->height());
1018 } 1021 }
1019 1022
1020 template <typename T> 1023 template <typename T>
1021 bool validateTexImageSubRectangle(const char* functionName, 1024 bool validateTexImageSubRectangle(const char* functionName,
1022 TexImageFunctionID functionID, 1025 TexImageFunctionID functionID,
1023 T* image, 1026 T* image,
1024 const IntRect& subRect, 1027 const IntRect& subRect,
1025 GLsizei depth, 1028 GLsizei depth,
1026 GLint unpackImageHeight, 1029 GLint unpackImageHeight,
1027 bool* selectingSubRectangle) { 1030 bool* selectingSubRectangle) {
1028 DCHECK(functionName); 1031 DCHECK(functionName);
1029 DCHECK(selectingSubRectangle); 1032 DCHECK(selectingSubRectangle);
1030 DCHECK(image); 1033 DCHECK(image);
1034 /* DO NOT SUBMIT - merge conflict marker.
1035 * Please spell |width| and |height| in the 2 lines below. */
1031 int imageWidth = static_cast<int>(image->width()); 1036 int imageWidth = static_cast<int>(image->width());
1032 int imageHeight = static_cast<int>(image->height()); 1037 int imageHeight = static_cast<int>(image->height());
1033 *selectingSubRectangle = 1038 *selectingSubRectangle =
1034 !(subRect.x() == 0 && subRect.y() == 0 && 1039 !(subRect.x() == 0 && subRect.y() == 0 &&
1035 subRect.width() == imageWidth && subRect.height() == imageHeight); 1040 subRect.width() == imageWidth && subRect.height() == imageHeight);
1036 // If the source image rect selects anything except the entire 1041 // If the source image rect selects anything except the entire
1037 // contents of the image, assert that we're running WebGL 2.0 or 1042 // contents of the image, assert that we're running WebGL 2.0 or
1038 // higher, since this should never happen for WebGL 1.0 (even though 1043 // higher, since this should never happen for WebGL 1.0 (even though
1039 // the code could support it). If the image is null, that will be 1044 // the code could support it). If the image is null, that will be
1040 // signaled as an error later. 1045 // signaled as an error later.
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 context, 1667 context,
1663 context->is3d(), 1668 context->is3d(),
1664 context.is3d()); 1669 context.is3d());
1665 1670
1666 } // namespace blink 1671 } // namespace blink
1667 1672
1668 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS( 1673 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(
1669 blink::WebGLRenderingContextBase::TextureUnitState); 1674 blink::WebGLRenderingContextBase::TextureUnitState);
1670 1675
1671 #endif // WebGLRenderingContextBase_h 1676 #endif // WebGLRenderingContextBase_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698