WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/platform/graphics/chromium/TransparencyWin.cpp

 /*
  * Copyright (C) 2009 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 139 matching lines @@
     , m_transformMode(KeepTransform)
     , m_drawContext(0)
     , m_savedOnDrawContext(false)
     , m_layerBuffer(0)
     , m_referenceBitmap(0)
 {
 }
 
 TransparencyWin::~TransparencyWin()
 {
+    // This should be false, since calling composite() is mandatory.
+    ASSERT(!m_savedOnDrawContext);
+}
+
+void TransparencyWin::composite()
+{
     // Matches the save() in initializeNewTextContext (or the constructor for
     // SCALE) to put the context back into the same state we found it.
-    if (m_savedOnDrawContext)
+    if (m_savedOnDrawContext) {
         m_drawContext->restore();
+        m_savedOnDrawContext = false;
+    }
 
     switch (m_layerMode) {
     case NoLayer:
         break;
     case OpaqueCompositeLayer:
     case WhiteLayer:
         compositeOpaqueComposite();
         break;
     case TextComposite:
         compositeTextComposite();
         break;
     }
 }
 
 void TransparencyWin::init(GraphicsContext* dest,
                            LayerMode layerMode,
                            TransformMode transformMode,
-                           const IntRect& region) {
+                           const IntRect& region)
+{
     m_destContext = dest;
     m_orgTransform = dest->getCTM();
     m_layerMode = layerMode;
     m_transformMode = transformMode;
     m_sourceRect = region;
 
     computeLayerSize();
     setupLayer();
     setupTransform(region);
 }
@@ skipping 270 matching lines @@
         canvas()->getTopPlatformDevice().accessBitmap(true));
     for (int y = 0; y < m_layerSize.height(); y++) {
         uint32_t* row = bitmap.getAddr32(0, y);
         for (int x = 0; x < m_layerSize.width(); x++)
             row[x] |= 0xFF000000;
     }
 }
 
 } // namespace WebCore