Merge mc->Maple

2012-03-13 11:05:28 -04:00
parent db205def09 83a08cc477
commit bbefdec4f2
578 changed files with 12639 additions and 4868 deletions
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -232,6 +232,8 @@ ImageLayerOGL::RenderLayer(int,

  NS_ASSERTION(image->GetFormat() != Image::REMOTE_IMAGE_BITMAP,
    "Remote images aren't handled yet in OGL layers!");
+  NS_ASSERTION(mScaleMode == SCALE_NONE,
+    "Scale modes other than none not handled yet in OGL layers!");

  if (image->GetFormat() == Image::PLANAR_YCBCR) {
    PlanarYCbCrImage *yuvImage =