Merge 78787 - 2011-02-16 Victoria Kirst <vrk@google.com>...

Source/WebCore/platform/graphics/chromium/VideoFrameChromium.h

 /*
  * Copyright (C) 2010 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 51 matching lines @@
     };
 
     enum SurfaceType {
         TypeSystemMemory,
         TypeTexture,
     };
 
     virtual SurfaceType surfaceType() const = 0;
     virtual Format format() const = 0;
     virtual unsigned width() const = 0;
+    virtual unsigned width(unsigned plane) const = 0;
     virtual unsigned height() const = 0;
+    virtual unsigned height(unsigned plane) const = 0;
     virtual unsigned planes() const = 0;
     virtual int stride(unsigned plane) const = 0;
     virtual const void* data(unsigned plane) const = 0;
     virtual unsigned texture(unsigned plane) const = 0;
     virtual const IntSize requiredTextureSize(unsigned plane) const = 0;
+    virtual bool hasPaddingBytes(unsigned plane) const = 0;
 };
 
 } // namespace WebCore
 
 #endif