Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages

Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp

 /*
  * 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 24 matching lines @@
 #include "CanvasLayerChromium.h"
 
 #include "cc/CCLayerImpl.h"
 #include "GraphicsContext3D.h"
 #include "LayerRendererChromium.h"
 
 namespace WebCore {
 
 CanvasLayerChromium::CanvasLayerChromium(GraphicsLayerChromium* owner)
     : LayerChromium(owner)
-    , m_textureChanged(true)
-    , m_textureId(0)
     , m_hasAlpha(true)
     , m_premultipliedAlpha(true)
 {
 }
 
 CanvasLayerChromium::~CanvasLayerChromium()
 {
 }
 
 PassRefPtr<CCLayerImpl> CanvasLayerChromium::createCCLayerImpl()
 {
     return CCCanvasLayerImpl::create(this, m_layerId);
 }
 
 void CanvasLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
 {
     LayerChromium::pushPropertiesTo(layer);
 
     CCCanvasLayerImpl* canvasLayer = static_cast<CCCanvasLayerImpl*>(layer);
-    canvasLayer->setTextureId(m_textureId);
+    canvasLayer->setTextureId(textureId());
     canvasLayer->setHasAlpha(m_hasAlpha);
     canvasLayer->setPremultipliedAlpha(m_premultipliedAlpha);
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)