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

Unified Diff: JavaScriptCore/runtime/Operations.h

Issue 28077: WebKit side of merge from r41149 to r41181. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/WebKit/
Patch Set: Created 11 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « JavaScriptCore/runtime/JSString.h ('k') | JavaScriptCore/wrec/WREC.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: JavaScriptCore/runtime/Operations.h
===================================================================
--- JavaScriptCore/runtime/Operations.h (revision 10232)
+++ JavaScriptCore/runtime/Operations.h (working copy)
@@ -146,8 +146,8 @@
if (v1.getNumber(n1) && v2.getNumber(n2))
return n1 < n2;
- Interpreter* interpreter = callFrame->interpreter();
- if (interpreter->isJSString(v1) && interpreter->isJSString(v2))
+ JSGlobalData* globalData = &callFrame->globalData();
+ if (isJSString(globalData, v1) && isJSString(globalData, v2))
return asString(v1)->value() < asString(v2)->value();
JSValuePtr p1;
@@ -171,8 +171,8 @@
if (v1.getNumber(n1) && v2.getNumber(n2))
return n1 <= n2;
- Interpreter* interpreter = callFrame->interpreter();
- if (interpreter->isJSString(v1) && interpreter->isJSString(v2))
+ JSGlobalData* globalData = &callFrame->globalData();
+ if (isJSString(globalData, v1) && isJSString(globalData, v2))
return !(asString(v2)->value() < asString(v1)->value());
JSValuePtr p1;
« no previous file with comments | « JavaScriptCore/runtime/JSString.h ('k') | JavaScriptCore/wrec/WREC.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698