Source/core/editing/markup.cpp - Issue 281383006: Navigation transitions: Added createStyledMarkupForNavigationTransition

Unified Diff: Source/core/editing/markup.cpp

Issue 281383006: Navigation transitions: Added createStyledMarkupForNavigationTransition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Review fixes Created 6 years, 5 months 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: Source/core/editing/markup.cpp

diff --git a/Source/core/editing/markup.cpp b/Source/core/editing/markup.cpp

index 7fd5c1206aa37277290104e49b303d7585e3641f..d8f1e43ebff91555f83bdaafc376a92b440042f9 100644

--- a/Source/core/editing/markup.cpp

+++ b/Source/core/editing/markup.cpp

@@ -146,7 +146,7 @@ private:

enum NodeTraversalMode { EmitString, DoNotEmitString };

Node* traverseNodesForSerialization(Node* startNode, Node* pastEnd, NodeTraversalMode);

- bool shouldAnnotate() { return m_shouldAnnotate == AnnotateForInterchange; }

+ bool shouldAnnotate() const { return m_shouldAnnotate == AnnotateForInterchange || m_shouldAnnotate == AnnotateForNavigationTransition; }

bool shouldApplyWrappingStyle(const Node& node) const

{

return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode() == node.parentNode()

@@ -317,6 +317,9 @@ void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element

if (shouldAnnotate())

newInlineStyle->mergeStyleFromRulesForSerialization(&toHTMLElement(element));

+ if (&element == m_highestNodeToBeSerialized && m_shouldAnnotate == AnnotateForNavigationTransition)

+ newInlineStyle->addAbsolutePositioningFromElement(element);

if (addDisplayInline)

newInlineStyle->forceInline();

@@ -343,8 +346,14 @@ Node* StyledMarkupAccumulator::serializeNodes(Node* startNode, Node* pastEnd)

m_highestNodeToBeSerialized = lastClosed;

}

- if (m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode())

+ if (m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode()) {

m_wrappingStyle = EditingStyle::wrappingStyleForSerialization(m_highestNodeToBeSerialized->parentNode(), shouldAnnotate());

+ if (m_shouldAnnotate == AnnotateForNavigationTransition) {

+ m_wrappingStyle->style()->removeProperty(CSSPropertyBackgroundColor);

+ m_wrappingStyle->style()->removeProperty(CSSPropertyBackgroundImage);

+ }

return traverseNodesForSerialization(startNode, pastEnd, EmitString);

}

@@ -371,7 +380,7 @@ Node* StyledMarkupAccumulator::traverseNodesForSerialization(Node* startNode, No

// Don't write out empty block containers that aren't fully selected.

continue;

- if (!n->renderer() && !enclosingNodeWithTag(firstPositionInOrBeforeNode(n), selectTag)) {

+ if (!n->renderer() && !enclosingNodeWithTag(firstPositionInOrBeforeNode(n), selectTag) && m_shouldAnnotate != AnnotateForNavigationTransition) {

next = NodeTraversal::nextSkippingChildren(*n);

// Don't skip over pastEnd.

if (pastEnd && pastEnd->isDescendantOf(n))

@@ -1095,4 +1104,15 @@ void mergeWithNextTextNode(PassRefPtrWillBeRawPtr<Node> node, ExceptionState& ex

textNext->remove(exceptionState);

}

+String createStyledMarkupForNavigationTransition(Node* node)

+ node->document().updateLayoutIgnorePendingStylesheets();

+ StyledMarkupAccumulator accumulator(0, ResolveAllURLs, AnnotateForNavigationTransition, nullptr, 0);

+ accumulator.serializeNodes(node, NodeTraversal::nextSkippingChildren(*node));

+ static const char* documentMarkup = "<!DOCTYPE html><meta name=\"viewport\" content=\"width=device-width, user-scalable=0\">";

+ return documentMarkup + accumulator.takeResults();

}

« no previous file with comments | « Source/core/editing/markup.h ('k') | Source/core/testing/Internals.h » ('j') | no next file with comments »