Merge r120507 to chromium 1132 branch.

WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 34 matching lines @@
 
 #include "GraphicsLayerChromium.h"
 
 #include "Canvas2DLayerChromium.h"
 #include "ContentLayerChromium.h"
 #include "FloatConversion.h"
 #include "FloatRect.h"
 #include "Image.h"
 #include "ImageLayerChromium.h"
 #include "LayerChromium.h"
+#include "NativeImageSkia.h"
 #include "PlatformString.h"
 #include "SystemTime.h"
 
 #include <wtf/CurrentTime.h>
 #include <wtf/StringExtras.h>
 #include <wtf/text/CString.h>
 
 using namespace std;
 
 namespace {
@@ skipping 293 matching lines @@
 {
     bool childrenChanged = false;
     if (image) {
         if (!m_contentsLayer.get() || m_contentsLayerPurpose != ContentsLayerForImage) {
             RefPtr<ImageLayerChromium> imageLayer = ImageLayerChromium::create();
             setupContentsLayer(imageLayer.get());
             m_contentsLayerPurpose = ContentsLayerForImage;
             childrenChanged = true;
         }
         ImageLayerChromium* imageLayer = static_cast<ImageLayerChromium*>(m_contentsLayer.get());
-        imageLayer->setContents(image);
+        NativeImageSkia* nativeImage = image->nativeImageForCurrentFrame();
+        imageLayer->setBitmap(nativeImage->bitmap());
         imageLayer->setOpaque(image->isBitmapImage() && !image->currentFrameHasAlpha());
         updateContentsRect();
     } else {
         if (m_contentsLayer) {
             childrenChanged = true;
 
             // The old contents layer will be removed via updateChildList.
             m_contentsLayer = 0;
         }
     }
@@ skipping 386 matching lines @@
 }
 
 void GraphicsLayerChromium::notifyAnimationFinished(double)
 {
     // Do nothing.
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)