Coreify specific layout.js, CE, and BE functions

src/base-element.js

@@ -17,8 +17,8 @@
 import {ActionTrust, DEFAULT_ACTION} from './core/constants/action-constants';
 import {Layout, LayoutPriority} from './layout';
 import {Services} from './services';
+import {applyFillContent, dispatchCustomEvent} from './core/dom';
 import {devAssert, user, userAssert} from './log';
-import {dispatchCustomEvent} from './core/dom';
 import {getData, listen, loadPromise} from './event-helper';
 import {getMode} from './mode';
 import {isArray} from './core/types';
@@ -869,22 +869,14 @@ export class BaseElement {
  }
 
  /**
- * Configures the supplied element to have a "fill content" layout. The
- * exact interpretation of "fill content" depends on the element's layout.
- *
- * If `opt_replacedContent` is specified, it indicates whether the "replaced
- * content" styling should be applied. Replaced content is not allowed to
- * have its own paddings or border.
+ * See src/core/dom.js for full description.
  *
  * @param {!Element} element
  * @param {boolean=} opt_replacedContent
  * @public @final
  */
  applyFillContent(element, opt_replacedContent) {
- element.classList.add('i-amphtml-fill-content');
- if (opt_replacedContent) {
- element.classList.add('i-amphtml-replaced-content');
- }
+ applyFillContent(element, opt_replacedContent);
  }
 
  /**

src/core/dom/index.js

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
+import {childNodes, matches} from './query';
 import {dict} from '../types/object';
-import {matches} from './query';
+import {isInternalOrServiceNode} from '../layout';
 import {toWin} from '../window';
 
 const HTML_ESCAPE_CHARS = {
@@ -536,3 +537,34 @@ export function dispatchCustomEvent(node, name, opt_data, opt_options) {
 export function containsNotSelf(parent, child) {
  return child !== parent && parent.contains(child);
 }
+
+/**
+ * Configures the supplied element to have a "fill content" layout. The
+ * exact interpretation of "fill content" depends on the element's layout.
+ *
+ * If `opt_replacedContent` is specified, it indicates whether the "replaced
+ * content" styling should be applied. Replaced content is not allowed to
+ * have its own paddings or border.
+ *
+ * @param {!Element} element
+ * @param {boolean=} opt_replacedContent
+ * @public @final
+ */
+export function applyFillContent(element, opt_replacedContent) {
+ element.classList.add('i-amphtml-fill-content');
+ if (opt_replacedContent) {
+ element.classList.add('i-amphtml-replaced-content');
+ }
+}
+
+/**
+ * Returns the original nodes of the custom element without any service
+ * nodes that could have been added for markup. These nodes can include
+ * Text, Comment and other child nodes.
+ *
+ * @param {!Node} element
+ * @return {!Array<!Node>}
+ */
+export function getRealChildNodes(element) {
+ return childNodes(element, (node) => !isInternalOrServiceNode(node));
+}

src/core/layout.js

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2015 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {devAssertElement} from './assert';
+
+/**
+ * Returns "true" for internal AMP nodes or for placeholder elements.
+ * @param {!Node} node
+ * @return {boolean}
+ */
+export function isInternalOrServiceNode(node) {
+ if (node.nodeType !== Node.ELEMENT_NODE) {
+ return false;
+ }
+ node = devAssertElement(node);
+
+ if (node.tagName.toLowerCase().startsWith('i-')) {
+ return true;
+ }
+ if (
+ node.hasAttribute('placeholder') ||
+ node.hasAttribute('fallback') ||
+ node.hasAttribute('overflow')
+ ) {
+ return true;
+ }
+ return false;
+}

src/custom-element.js

@@ -23,7 +23,6 @@ import {
  Layout,
  LayoutPriority,
  applyStaticLayout,
- isInternalElement,
  isLoadingAllowed,
 } from './layout';
 import {MediaQueryProps} from './core/dom/media-query-props';
@@ -47,6 +46,7 @@ import {getIntersectionChangeEntry} from './utils/intersection-observer-3p-host'
 import {getMode} from './mode';
 import {getSchedulerForDoc} from './service/scheduler';
 import {isExperimentOn} from './experiments';
+import {isInternalOrServiceNode} from './core/layout';
 import {rethrowAsync} from './core/error';
 import {setStyle} from './core/dom/style';
 import {shouldBlockOnConsentByMeta} from './consent';
@@ -1897,14 +1897,15 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
  }
 
  /**
- * Returns the original nodes of the custom element without any service
- * nodes that could have been added for markup. These nodes can include
- * Text, Comment and other child nodes.
- * @return {!Array<!Node>}
+ * See dom.getRealChildNodes for the full description.
+ * TODO: migrate to the fn in dom.js.
+ * @deprecated
  * @package @final
+ *
+ * @return {!Array<!Node>}
  */
  getRealChildNodes() {
- return query.childNodes(this, (node) => !isInternalOrServiceNode(node));
+ return dom.getRealChildNodes(this);
  }
 
  /**
@@ -2171,26 +2172,6 @@ function assertNotTemplate(element) {
  devAssert(!element.isInTemplate_, 'Must never be called in template');
 }
 
-/**
- * Returns "true" for internal AMP nodes or for placeholder elements.
- * @param {!Node} node
- * @return {boolean}
- */
-function isInternalOrServiceNode(node) {
- if (isInternalElement(node)) {
- return true;
- }
- if (
- node.tagName &&
- (node.hasAttribute('placeholder') ||
- node.hasAttribute('fallback') ||
- node.hasAttribute('overflow'))
- ) {
- return true;
- }
- return false;
-}
-
 /**
  * Creates a new custom element class prototype.
  *

src/layout.js

@@ -173,16 +173,6 @@ export function isLayoutSizeFixed(layout) {
  return layout == Layout.FIXED || layout == Layout.FIXED_HEIGHT;
 }
 
-/**
- * Whether the tag is an internal (service) AMP tag.
- * @param {!Node|string} tag
- * @return {boolean}
- */
-export function isInternalElement(tag) {
- const tagName = typeof tag == 'string' ? tag : tag.tagName;
- return tagName && tagName.toLowerCase().startsWith('i-');
-}
-
 /**
  * Parses the CSS length value. If no units specified, the assumed value is
  * "px". Returns undefined in case of parsing error.