Remove Compiler.commonElements

pkg/compiler/lib/src/js_emitter/startup_emitter/emitter.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.js_emitter.startup_emitter;
 
 import 'package:js_runtime/shared/embedded_names.dart'
     show JsBuiltin, METADATA, STATIC_FUNCTION_NAME_TO_CLOSURE, TYPES;
 
 import '../../common.dart';
@@ skipping 22 matching lines @@
   @override
   Emitter createEmitter(
       CodeEmitterTask task, Namer namer, ClosedWorld closedWorld) {
     return new Emitter(task.compiler, namer, task.nativeEmitter, closedWorld,
         task, generateSourceMap);
   }
 }
 
 class Emitter extends emitterTask.EmitterBase {
   final Compiler _compiler;
+  final ClosedWorld _closedWorld;
   final Namer namer;
   final ModelEmitter _emitter;
 
   JavaScriptBackend get _backend => _compiler.backend;
 
-  Emitter(
-      Compiler compiler,
-      Namer namer,
-      NativeEmitter nativeEmitter,
-      ClosedWorld closedWorld,
-      CodeEmitterTask task,
-      bool shouldGenerateSourceMap)
-      : this._compiler = compiler,
-        this.namer = namer,
-        _emitter = new ModelEmitter(compiler, namer, nativeEmitter, closedWorld,
-            task, shouldGenerateSourceMap);
+  Emitter(this._compiler, this.namer, NativeEmitter nativeEmitter,
+      this._closedWorld, CodeEmitterTask task, bool shouldGenerateSourceMap)
+      : _emitter = new ModelEmitter(_compiler, namer, nativeEmitter,
+            _closedWorld, task, shouldGenerateSourceMap);
 
   DiagnosticReporter get reporter => _compiler.reporter;
 
   @override
   int emitProgram(ProgramBuilder programBuilder) {
     Program program = programBuilder.buildProgram();
     return _emitter.emitProgram(program);
   }
 
   @override
@@ skipping 42 matching lines @@
         hasBeenInstantiated ? constructorAccess(element) : typeAccess(element);
     return js.js('#.prototype', constructor);
   }
 
   @override
   js.Template templateForBuiltin(JsBuiltin builtin) {
     String typeNameProperty = ModelEmitter.typeNameProperty;
 
     switch (builtin) {
       case JsBuiltin.dartObjectConstructor:
-        ClassElement objectClass = _compiler.commonElements.objectClass;
+        ClassElement objectClass = _closedWorld.commonElements.objectClass;
         return js.js.expressionTemplateYielding(typeAccess(objectClass));
 
       case JsBuiltin.isCheckPropertyToJsConstructorName:
         int isPrefixLength = namer.operatorIsPrefix.length;
         return js.js.expressionTemplateFor('#.substring($isPrefixLength)');
 
       case JsBuiltin.isFunctionType:
         return _backend.rtiEncoder.templateForIsFunctionType;
 
       case JsBuiltin.rawRtiToJsConstructorName:
@@ skipping 35 matching lines @@
     }
   }
 
   @override
   int generatedSize(OutputUnit unit) {
     Fragment key = _emitter.outputBuffers.keys
         .firstWhere((Fragment fragment) => fragment.outputUnit == unit);
     return _emitter.outputBuffers[key].length;
   }
 }