Merge pull request #1404 from dvoytenko/move-resources

Move Resources to services/resources-impl.js

Author: dvoytenko

build-system/tasks/presubmit-checks.js

@@ -76,6 +76,7 @@ var forbiddenTerms = {
     whitelist: [
       'src/amp-core-service.js',
       'src/service/history-impl.js',
+      'src/service/resources-impl.js',
       'src/service/viewer-impl.js',
       'src/service/viewport-impl.js',
       'src/service/vsync-impl.js',
@@ -85,17 +86,26 @@ var forbiddenTerms = {
     message: privateServiceFactory,
     whitelist: [
       'src/amp-core-service.js',
+      'src/service/resources-impl.js',
       'src/service/viewport-impl.js',
     ],
   },
   'installVsyncService': {
     message: privateServiceFactory,
     whitelist: [
       'src/amp-core-service.js',
+      'src/service/resources-impl.js',
       'src/service/viewport-impl.js',
       'src/service/vsync-impl.js',
     ],
   },
+  'installResourcesService': {
+    message: privateServiceFactory,
+    whitelist: [
+      'src/amp-core-service.js',
+      'src/service/resources-impl.js',
+    ],
+  },
   // Privacy sensitive
   'cidFor': {
     message: requiresReviewPrivacy,

extensions/amp-iframe/0.1/test/test-amp-iframe.js

@@ -20,6 +20,7 @@ import {adopt} from '../../../../src/runtime';
 import {createIframePromise, pollForLayout, poll}
     from '../../../../testing/iframe';
 import {loadPromise} from '../../../../src/event-helper';
+import {viewportFor} from '../../../../src/viewport';
 import * as sinon from 'sinon';
 
 adopt(window);
@@ -58,6 +59,7 @@ describe('amp-iframe', () => {
       if (opt_height) {
         iframe.iframe.style.height = opt_height;
       }
+      viewportFor(iframe.win).resize_();
       const top = opt_top || '600px';
       i.style.position = 'absolute';
       i.style.top = top;

src/amp-core-service.js

@@ -16,6 +16,7 @@
 
 import {installActionService} from './service/action-impl';
 import {installHistoryService} from './service/history-impl';
+import {installResourcesService} from './service/resources-impl';
 import {installViewerService} from './service/viewer-impl';
 import {installViewportService} from './service/viewport-impl';
 import {installVsyncService} from './service/vsync-impl';
@@ -32,4 +33,5 @@ export function installCoreServices(window) {
   installHistoryService(window);
   installVsyncService(window);
   installActionService(window);
+  installResourcesService(window);
 }