WebKit side of merge from r41149 to r41181.

JavaScriptCore/runtime/Operations.h

 /*
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
  *  Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
@@ skipping 128 matching lines @@
     inline bool jsLess(CallFrame* callFrame, JSValuePtr v1, JSValuePtr v2)
     {
         if (JSValuePtr::areBothInt32Fast(v1, v2))
             return v1.getInt32Fast() < v2.getInt32Fast();
 
         double n1;
         double n2;
         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;
         JSValuePtr p2;
         bool wasNotString1 = v1.getPrimitiveNumber(callFrame, n1, p1);
         bool wasNotString2 = v2.getPrimitiveNumber(callFrame, n2, p2);
 
         if (wasNotString1 | wasNotString2)
             return n1 < n2;
 
         return asString(p1)->value() < asString(p2)->value();
     }
 
     inline bool jsLessEq(CallFrame* callFrame, JSValuePtr v1, JSValuePtr v2)
     {
         if (JSValuePtr::areBothInt32Fast(v1, v2))
             return v1.getInt32Fast() <= v2.getInt32Fast();
 
         double n1;
         double n2;
         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;
         JSValuePtr p2;
         bool wasNotString1 = v1.getPrimitiveNumber(callFrame, n1, p1);
         bool wasNotString2 = v2.getPrimitiveNumber(callFrame, n2, p2);
 
         if (wasNotString1 | wasNotString2)
             return n1 <= n2;
 
@@ skipping 100 matching lines @@
             ++next;
         }
 
         ASSERT_NOT_REACHED();
         return noValue();
     }
 
 } // namespace JSC
 
 #endif // Operations_h