Merge 67645 - 2010-09-16 Daniel Cheng <dcheng@chromium.org>...

WebCore/page/chromium/FrameChromium.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 68 matching lines @@
 
     IntRect topLevelRect;
     IntRect paintingRect = renderer->paintingRootRect(topLevelRect);
 
     OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size()));
     if (!buffer)
         return 0;
     buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
     buffer->context()->clip(FloatRect(0, 0, paintingRect.right(), paintingRect.bottom()));
 
-    m_view->paint(buffer->context(), paintingRect);
+    m_view->paintContents(buffer->context(), paintingRect);
 
     RefPtr<Image> image = buffer->copyImage();
     return createDragImageFromImage(image.get());
 }
 
 DragImageRef Frame::dragImageForSelection()
 {
     if (!selection()->isRange())
         return 0;
 
     const ScopedState state(this, 0);
     m_view->setPaintBehavior(PaintBehaviorSelectionOnly);
     m_doc->updateLayout();
 
     IntRect paintingRect = enclosingIntRect(selectionBounds());
 
     OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size()));
     if (!buffer)
         return 0;
     buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
     buffer->context()->clip(FloatRect(0, 0, paintingRect.right(), paintingRect.bottom()));
 
-    m_view->paint(buffer->context(), paintingRect);
+    m_view->paintContents(buffer->context(), paintingRect);
 
     RefPtr<Image> image = buffer->copyImage();
     return createDragImageFromImage(image.get());
 }
 
 } // namespace WebCore