Ensure canvas state is preserved when 2d canvas falls out of display list mode

Source/platform/graphics/RecordingImageBufferSurface.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "platform/graphics/RecordingImageBufferSurface.h"
 
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
@@ skipping 70 matching lines @@
         return;
     }
 
     m_fallbackSurface = m_fallbackFactory->createSurface(size(), opacityMode());
     m_fallbackSurface->setImageBuffer(m_imageBuffer);
 
     if (m_previousFrame) {
         m_previousFrame->draw(m_fallbackSurface->canvas());
         m_previousFrame.clear();
     }
+
     if (m_currentFrame) {
+        bool savedState = false;
+        StateStack stateStack;
+        savedState = saveState(m_currentFrame->getRecordingCanvas(), &stateStack);
         RefPtr<SkPicture> currentPicture = adoptRef(m_currentFrame->endRecording());
         currentPicture->draw(m_fallbackSurface->canvas());
         m_currentFrame.clear();
+        if (savedState)
+            setCurrentState(m_fallbackSurface->canvas(), &stateStack);
     }
 
     if (m_imageBuffer) {
         m_imageBuffer->context()->setRegionTrackingMode(GraphicsContext::RegionTrackingDisabled);
         m_imageBuffer->context()->resetCanvas(m_fallbackSurface->canvas());
     }
 }
 
 SkCanvas* RecordingImageBufferSurface::canvas() const
 {
@@ skipping 175 matching lines @@
 
 void RecordingImageBufferSurface::setIsHidden(bool hidden)
 {
     if (m_fallbackSurface)
         m_fallbackSurface->setIsHidden(hidden);
     else
         ImageBufferSurface::setIsHidden(hidden);
 }
 
 } // namespace blink