Support multi-chunk differences

src/liveedit.cc

 // Copyright 2010 the V8 project authors. 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
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 328 matching lines @@
 
  private:
   Handle<String> s1_;
   Handle<String> s2_;
   LineEndsWrapper line_ends1_;
   LineEndsWrapper line_ends2_;
 };
 
 
 // Stores compare result in JSArray. Each chunk is stored as 3 array elements:
-// (pos1, len1, len2).
+// (pos1_begin, pos1_end, pos2_end).
 class LineArrayCompareOutput : public Compare::Output {
  public:
   LineArrayCompareOutput(LineEndsWrapper line_ends1, LineEndsWrapper line_ends2)
       : array_(Factory::NewJSArray(10)), current_size_(0),
         line_ends1_(line_ends1), line_ends2_(line_ends2) {
   }
 
   void AddChunk(int line_pos1, int line_pos2, int line_len1, int line_len2) {
     int char_pos1 = line_ends1_.GetLineStart(line_pos1);
     int char_pos2 = line_ends2_.GetLineStart(line_pos2);
     int char_len1 = line_ends1_.GetLineStart(line_pos1 + line_len1) - char_pos1;
     int char_len2 = line_ends2_.GetLineStart(line_pos2 + line_len2) - char_pos2;
 
     SetElement(array_, current_size_, Handle<Object>(Smi::FromInt(char_pos1)));
     SetElement(array_, current_size_ + 1,
-               Handle<Object>(Smi::FromInt(char_len1)));
+               Handle<Object>(Smi::FromInt(char_pos1 + char_len1)));
     SetElement(array_, current_size_ + 2,
-               Handle<Object>(Smi::FromInt(char_len2)));
+               Handle<Object>(Smi::FromInt(char_pos2 + char_len2)));
     current_size_ += 3;
   }
 
   Handle<JSArray> GetResult() {
     return array_;
   }
 
  private:
   Handle<JSArray> array_;
   int current_size_;
@@ skipping 332 matching lines @@
 
   virtual void VisitPointers(Object** start, Object** end) {
     for (Object** p = start; p < end; p++) {
       if (*p == original_) {
         rvalues_.Add(p);
       }
     }
   }
 
   void VisitCodeTarget(RelocInfo* rinfo) {
-    ASSERT(RelocInfo::IsCodeTarget(rinfo->rmode()));
-    if (Code::GetCodeFromTargetAddress(rinfo->target_address()) == original_) {
+    if (RelocInfo::IsCodeTarget(rinfo->rmode()) &&
+        Code::GetCodeFromTargetAddress(rinfo->target_address()) == original_) {
       reloc_infos_.Add(*rinfo);
     }
   }
 
   virtual void VisitDebugTarget(RelocInfo* rinfo) {
     VisitCodeTarget(rinfo);
   }
 
   // Post-visiting method that iterates over all collected references and
   // modifies them.
@@ skipping 671 matching lines @@
 
 bool LiveEditFunctionTracker::IsActive() {
   return false;
 }
 
 #endif  // ENABLE_DEBUGGER_SUPPORT
 
 
 
 } }  // namespace v8::internal