Merge 96868 - Crash in VisiblePosition::canonicalPosition.

Source/WebCore/editing/VisiblePosition.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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 466 matching lines @@
     Position position = passedPosition;
 
     // FIXME (9535):  Canonicalizing to the leftmost candidate means that if we're at a line wrap, we will 
     // ask renderers to paint downstream carets for other renderers.
     // To fix this, we need to either a) add code to all paintCarets to pass the responsibility off to
     // the appropriate renderer for VisiblePosition's like these, or b) canonicalize to the rightmost candidate
     // unless the affinity is upstream.
     if (position.isNull())
         return Position();
 
-    Node* node = position.containerNode();
-
     ASSERT(position.document());
     position.document()->updateLayoutIgnorePendingStylesheets();
 
+    Node* node = position.containerNode();
+
     Position candidate = position.upstream();
     if (candidate.isCandidate())
         return candidate;
     candidate = position.downstream();
     if (candidate.isCandidate())
         return candidate;
 
     // When neither upstream or downstream gets us to a candidate (upstream/downstream won't leave 
     // blocks or enter new ones), we search forward and backward until we find one.
     Position next = canonicalizeCandidate(nextCandidate(position));
@@ skipping 216 matching lines @@
     if (vpos)
         vpos->showTreeForThis();
 }
 
 void showTree(const WebCore::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif