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

Side by Side Diff: WebCore/bridge/qt/qt_runtime.cpp

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « WebCore/bindings/v8/ScriptValue.cpp ('k') | WebCore/dom/Element.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 2 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public 5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 static JSRealType valueRealType(ExecState* exec, JSValuePtr val) 116 static JSRealType valueRealType(ExecState* exec, JSValuePtr val)
117 { 117 {
118 if (val.isNumber()) 118 if (val.isNumber())
119 return Number; 119 return Number;
120 else if (val.isString()) 120 else if (val.isString())
121 return String; 121 return String;
122 else if (val.isBoolean()) 122 else if (val.isBoolean())
123 return Boolean; 123 return Boolean;
124 else if (val.isNull()) 124 else if (val.isNull())
125 return Null; 125 return Null;
126 else if (exec->interpreter()->isJSByteArray(val)) 126 else if (isJSByteArray(&exec->globalData(), val))
127 return JSByteArray; 127 return JSByteArray;
128 else if (val.isObject()) { 128 else if (val.isObject()) {
129 JSObject *object = val.toObject(exec); 129 JSObject *object = val.toObject(exec);
130 if (object->inherits(&RuntimeArray::s_info)) // RuntimeArray 'inherits' from Array, but not in C++ 130 if (object->inherits(&RuntimeArray::s_info)) // RuntimeArray 'inherits' from Array, but not in C++
131 return RTArray; 131 return RTArray;
132 else if (object->inherits(&JSArray::info)) 132 else if (object->inherits(&JSArray::info))
133 return Array; 133 return Array;
134 else if (object->inherits(&DateInstance::info)) 134 else if (object->inherits(&DateInstance::info))
135 return Date; 135 return Date;
136 else if (object->inherits(&RegExpObject::info)) 136 else if (object->inherits(&RegExpObject::info))
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1764 return convertQVariantToValue(exec, rootObject(), QVariant::fromValue(va l)); 1764 return convertQVariantToValue(exec, rootObject(), QVariant::fromValue(va l));
1765 } 1765 }
1766 1766
1767 return jsUndefined(); 1767 return jsUndefined();
1768 } 1768 }
1769 1769
1770 // =============== 1770 // ===============
1771 1771
1772 } } 1772 } }
1773 1773
OLDNEW
« no previous file with comments | « WebCore/bindings/v8/ScriptValue.cpp ('k') | WebCore/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698