Skip to content

Commit 8e6b786

Browse files
author
Steven Orvell
committed
Merge branch 'master' into legacy-undefined
2 parents 32c3083 + 1302641 commit 8e6b786

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

externs/polymer-externs.js

+10
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ PolymerInit.prototype.template;
4747
PolymerInit.prototype.hostAttributes;
4848
/** @type {(!Object<string, string> | undefined)} */
4949
PolymerInit.prototype.listeners;
50+
/** @type {(!Object| !Array<!Object> | undefined)} */
51+
PolymerInit.prototype.behaviors;
5052

5153
/** @record */
5254
let PolymerElementConstructor = function () {};
@@ -110,6 +112,8 @@ function JSCompiler_renameProperty(string, obj) {}
110112
function PolymerTelemetry() {}
111113
/** @type {number} */
112114
PolymerTelemetry.instanceCount;
115+
/** @type {function():void} */
116+
PolymerTelemetry.incrementInstanceCount;
113117
/** @type {Array<HTMLElement>} */
114118
PolymerTelemetry.registrations;
115119
/** @type {function(HTMLElement)} */
@@ -125,6 +129,12 @@ Polymer.telemetry;
125129
/** @type {string} */
126130
Polymer.version;
127131

132+
/** @type {boolean} */
133+
Polymer.legacyOptimizations;
134+
135+
/** @type {boolean} */
136+
Polymer.syncInitialRender;
137+
128138
// nb. This is explicitly 'var', as Closure Compiler checks that this is the case.
129139
/**
130140
* @constructor

externs/webcomponents-externs.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var HTMLImports = {
1818
*/
1919
whenReady(callback) {},
2020
/**
21-
* @param {Element} element
22-
* @returns {Document} document
21+
* @param {!Node} element
22+
* @return {?HTMLLinkElement|?Document|undefined}
2323
*/
2424
importForElement(element) {}
2525
};
@@ -42,7 +42,11 @@ var ShadyDOM = {
4242
/**
4343
* @param {Node} node
4444
*/
45-
patch(node) {}
45+
patch(node) {},
46+
/**
47+
* @param {!ShadowRoot} shadowroot
48+
*/
49+
flushInitial(shadowroot) {}
4650
};
4751

4852
window.ShadyDOM = ShadyDOM;

0 commit comments

Comments
 (0)