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

Unified Diff: sdk/lib/_internal/compiler/implementation/lib/native_helper.dart

Issue 11364213: Rename classes, methods and fields when minifying (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 1 month 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
Index: sdk/lib/_internal/compiler/implementation/lib/native_helper.dart
diff --git a/sdk/lib/_internal/compiler/implementation/lib/native_helper.dart b/sdk/lib/_internal/compiler/implementation/lib/native_helper.dart
index 196136dd81486569fad33384bc3cbf2f1adb2e70..8a4a490136e52cd6d8903925f9e348ce7c9cd395 100644
--- a/sdk/lib/_internal/compiler/implementation/lib/native_helper.dart
+++ b/sdk/lib/_internal/compiler/implementation/lib/native_helper.dart
@@ -203,21 +203,31 @@ dynamicBind(var obj,
String name,
var methods,
List arguments) {
+ // The tag is related to the class name. E.g. the dart:html class
+ // '_ButtonElement' has the tag 'HTMLButtonElement'. TODO(erikcorry): rename
+ // getTypeNameOf to getTypeTag.
String tag = getTypeNameOf(obj);
- var method = JS('var', '#[#]', methods, tag);
+ var hasOwnProperty = JS('var', 'Object.prototype.hasOwnProperty');
+ var method = lookupDynamicClass(hasOwnProperty, methods, tag);
if (method == null && _dynamicMetadata != null) {
+ // Look at the inheritance data, getting the class tags and using them
+ // to check the methods table for this method name.
for (int i = 0; i < arrayLength(_dynamicMetadata); i++) {
MetaInfo entry = arrayGet(_dynamicMetadata, i);
- if (JS('bool', '#', propertyGet(entry._set, tag))) {
- method = propertyGet(methods, entry._tag);
+ if (JS('bool', '#.call(#, #)', hasOwnProperty, entry._set, tag)) {
+ method = lookupDynamicClass(hasOwnProperty, methods, entry._tag);
+ // Stop if we found it in the methods array.
if (method != null) break;
}
}
}
+ // If we didn't find the method then look up in the Dart Object class, using
+ // getTypeNameOf in case the minifier has renamed Object.
if (method == null) {
- method = propertyGet(methods, 'Object');
+ String nameOfObjectClass = getTypeNameOf(const Object());
+ method = lookupDynamicClass(hasOwnProperty, methods, nameOfObjectClass);
}
var proto = JS('var', 'Object.getPrototypeOf(#)', obj);
@@ -237,13 +247,24 @@ dynamicBind(var obj,
proto, name, name);
}
- if (JS('bool', '!#.hasOwnProperty(#)', proto, name)) {
+ if (JS('bool', '!#.call(#, #)', hasOwnProperty, proto, name)) {
defineProperty(proto, name, method);
}
return JS('var', '#.apply(#, #)', method, obj, arguments);
}
+// For each method name and class inheritance subtree, we use an ordinary JS
+// object as a hash map to store the method for each class. Entries are added
+// in native_emitter.dart (see dynamicName). In order to avoid the class names
+// clashing with the method names on Object.prototype (needed for native
+// objects) we must always use hasOwnProperty.
+var lookupDynamicClass(var hasOwnProperty, var methods, String className) {
+ return JS('bool', '#.call(#, #)', hasOwnProperty, methods, className) ?
+ JS('var', '#[#]', methods, className) :
+ null;
+}
+
/**
* Code for doing the dynamic dispatch on JavaScript prototypes that are not
* available at compile-time. Each property of a native Dart class
@@ -271,8 +292,13 @@ dynamicFunction(name) {
var methods = JS('var', '{}');
// If there is a method attached to the Dart Object class, use it as
// the method to call in case no method is registered for that type.
- var dartMethod = JS('var', 'Object.getPrototypeOf(#)[#]', const Object(), name);
- if (dartMethod != null) propertySet(methods, 'Object', dartMethod);
+ var dartMethod =
+ JS('var', 'Object.getPrototypeOf(#)[#]', const Object(), name);
+ // Take the method from the Dart Object class if we didn't find it yet and it
+ // is there.
+ if (dartMethod != null) {
+ JS('void', '#["Object"] = #', methods, dartMethod);
ngeoffray 2012/11/13 10:51:49 Why this change?
erikcorry 2012/11/16 10:08:30 Undone (2nd part).
+ }
var bind = JS('var',
'function() {'

Powered by Google App Engine
This is Rietveld 408576698