Merge 76889 - 2011-01-27 Finnur Thorarinsson <finnur.webkit@gmail.com>

Source/WebKit/chromium/src/WebFrameImpl.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 1513 matching lines @@
         scopeStringMatchesSoon(
             identifier,
             searchText,
             options,
             false); // false=we just reset, so don't do it again.
         return;
     }
 
     RefPtr<Range> searchRange(rangeOfContents(frame()->document()));
 
+    Node* originalEndContainer = searchRange->endContainer();
+    int originalEndOffset = searchRange->endOffset();
+
     ExceptionCode ec = 0, ec2 = 0;
     if (m_resumeScopingFromRange.get()) {
         // This is a continuation of a scoping operation that timed out and didn't
         // complete last time around, so we should start from where we left off.
         searchRange->setStart(m_resumeScopingFromRange->startContainer(),
                               m_resumeScopingFromRange->startOffset(ec2) + 1,
                               ec);
         if (ec || ec2) {
             if (ec2) // A non-zero |ec| happens when navigating during search.
                 ASSERT_NOT_REACHED();
             return;
         }
     }
 
-    Node* originalEndContainer = searchRange->endContainer();
-    int originalEndOffset = searchRange->endOffset();
-
     // This timeout controls how long we scope before releasing control.  This
     // value does not prevent us from running for longer than this, but it is
     // periodically checked to see if we have exceeded our allocated time.
     const double maxScopingDuration = 0.1; // seconds
 
     int matchCount = 0;
     bool timedOut = false;
     double startTime = currentTime();
     do {
         // Find next occurrence of the search string.
@@ skipping 723 matching lines @@
 
     String scriptResult;
     if (!result.getString(scriptResult))
         return;
 
     if (!m_frame->navigationScheduler()->locationChangePending())
         m_frame->loader()->writer()->replaceDocument(scriptResult);
 }
 
 } // namespace WebKit