ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 999 matching lines @@
                     Image*,
                     WebGLImageConversion::ImageHtmlDomSource,
                     bool flipY,
                     bool premultiplyAlpha,
                     const IntRect&,
                     GLsizei depth,
                     GLint unpackImageHeight);
 
   template <typename T>
   IntRect getTextureSourceSize(T* textureSource) {
+    /* DO NOT SUBMIT - merge conflict marker.
+     * Please spell |width| and |height| below. */
     return IntRect(0, 0, textureSource->width(), textureSource->height());
   }
 
   template <typename T>
   bool validateTexImageSubRectangle(const char* functionName,
                                     TexImageFunctionID functionID,
                                     T* image,
                                     const IntRect& subRect,
                                     GLsizei depth,
                                     GLint unpackImageHeight,
                                     bool* selectingSubRectangle) {
     DCHECK(functionName);
     DCHECK(selectingSubRectangle);
     DCHECK(image);
+    /* DO NOT SUBMIT - merge conflict marker.
+     * Please spell |width| and |height| in the 2 lines below. */
     int imageWidth = static_cast<int>(image->width());
     int imageHeight = static_cast<int>(image->height());
     *selectingSubRectangle =
         !(subRect.x() == 0 && subRect.y() == 0 &&
           subRect.width() == imageWidth && subRect.height() == imageHeight);
     // If the source image rect selects anything except the entire
     // contents of the image, assert that we're running WebGL 2.0 or
     // higher, since this should never happen for WebGL 1.0 (even though
     // the code could support it). If the image is null, that will be
     // signaled as an error later.
@@ skipping 622 matching lines @@
                   context,
                   context->is3d(),
                   context.is3d());
 
 }  // namespace blink
 
 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(
     blink::WebGLRenderingContextBase::TextureUnitState);
 
 #endif  // WebGLRenderingContextBase_h