Merge 121388

Source/WebCore/page/win/FrameCGWin.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 75 matching lines @@
     FloatRect fr = frame->selection()->bounds();
     IntRect ir(static_cast<int>(fr.x()), static_cast<int>(fr.y()),
                static_cast<int>(fr.width()), static_cast<int>(fr.height()));
     HBITMAP image = imageFromRect(frame, ir);
     frame->view()->setPaintBehavior(PaintBehaviorNormal);
     return image;
 }
 
 DragImageRef Frame::nodeImage(Node* node)
 {
+    document()->updateLayout();
+
     RenderObject* renderer = node->renderer();
     if (!renderer)
         return 0;
 
     LayoutRect topLevelRect;
     IntRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
 
-    document()->updateLayout();
-
     m_view->setNodeToDraw(node); // invoke special sub-tree drawing mode
     HBITMAP result = imageFromRect(this, paintingRect);
     m_view->setNodeToDraw(0);
 
     return result;
 }
 
 } // namespace WebCore