Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: src/liveedit.h

Issue 6017008: Add fine-grained diff implementation to LiveEdit engine. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: merge Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/liveedit.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 // A copy of this is in liveedit-debugger.js. 120 // A copy of this is in liveedit-debugger.js.
121 enum FunctionPatchabilityStatus { 121 enum FunctionPatchabilityStatus {
122 FUNCTION_AVAILABLE_FOR_PATCH = 1, 122 FUNCTION_AVAILABLE_FOR_PATCH = 1,
123 FUNCTION_BLOCKED_ON_ACTIVE_STACK = 2, 123 FUNCTION_BLOCKED_ON_ACTIVE_STACK = 2,
124 FUNCTION_BLOCKED_ON_OTHER_STACK = 3, 124 FUNCTION_BLOCKED_ON_OTHER_STACK = 3,
125 FUNCTION_BLOCKED_UNDER_NATIVE_CODE = 4, 125 FUNCTION_BLOCKED_UNDER_NATIVE_CODE = 4,
126 FUNCTION_REPLACED_ON_ACTIVE_STACK = 5 126 FUNCTION_REPLACED_ON_ACTIVE_STACK = 5
127 }; 127 };
128 128
129 // Compares 2 strings line-by-line and returns diff in form of array of 129 // Compares 2 strings line-by-line, then token-wise and returns diff in form
130 // triplets (pos1, pos1_end, pos2_end) describing list of diff chunks. 130 // of array of triplets (pos1, pos1_end, pos2_end) describing list
131 static Handle<JSArray> CompareStringsLinewise(Handle<String> s1, 131 // of diff chunks.
132 Handle<String> s2); 132 static Handle<JSArray> CompareStrings(Handle<String> s1,
133 Handle<String> s2);
133 }; 134 };
134 135
135 136
136 // A general-purpose comparator between 2 arrays. 137 // A general-purpose comparator between 2 arrays.
137 class Comparator { 138 class Comparator {
138 public: 139 public:
139 140
140 // Holds 2 arrays of some elements allowing to compare any pair of 141 // Holds 2 arrays of some elements allowing to compare any pair of
141 // element from the first array and element from the second array. 142 // element from the first array and element from the second array.
142 class Input { 143 class Input {
(...skipping 21 matching lines...) Expand all
164 static void CalculateDifference(Input* input, 165 static void CalculateDifference(Input* input,
165 Output* result_writer); 166 Output* result_writer);
166 }; 167 };
167 168
168 #endif // ENABLE_DEBUGGER_SUPPORT 169 #endif // ENABLE_DEBUGGER_SUPPORT
169 170
170 171
171 } } // namespace v8::internal 172 } } // namespace v8::internal
172 173
173 #endif /* V*_LIVEEDIT_H_ */ 174 #endif /* V*_LIVEEDIT_H_ */
OLDNEW
« no previous file with comments | « no previous file | src/liveedit.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698