Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(589)

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

Issue 1140153006: Remove Navigation Transitions from Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed layout tests. Created 5 years, 7 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
« no previous file with comments | « Source/core/editing/StyledMarkupAccumulator.cpp ('k') | Source/core/editing/markup.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/StyledMarkupSerializer.cpp
diff --git a/Source/core/editing/StyledMarkupSerializer.cpp b/Source/core/editing/StyledMarkupSerializer.cpp
index 8d7009f504c3bc85eb17266a7902f72b53bc6c79..8c0dc2bd2f39b4e2fe3bb3dd421e0bda2e81ae90 100644
--- a/Source/core/editing/StyledMarkupSerializer.cpp
+++ b/Source/core/editing/StyledMarkupSerializer.cpp
@@ -241,12 +241,8 @@ Node* StyledMarkupSerializer<Strategy>::serializeNodes(Node* startNode, Node* pa
Node* highestNodeToBeSerialized = m_markupAccumulator.highestNodeToBeSerialized();
if (highestNodeToBeSerialized && Strategy::parent(*highestNodeToBeSerialized)) {
- bool shouldAnnotate = m_shouldAnnotate == AnnotateForInterchange || m_shouldAnnotate == AnnotateForNavigationTransition;
+ bool shouldAnnotate = m_shouldAnnotate == AnnotateForInterchange;
RefPtrWillBeRawPtr<EditingStyle> wrappingStyle = EditingStyle::wrappingStyleForSerialization(Strategy::parent(*highestNodeToBeSerialized), shouldAnnotate);
- if (m_shouldAnnotate == AnnotateForNavigationTransition) {
- wrappingStyle->style()->removeProperty(CSSPropertyBackgroundColor);
- wrappingStyle->style()->removeProperty(CSSPropertyBackgroundImage);
- }
m_markupAccumulator.setWrappingStyle(wrappingStyle.release());
}
return traverseNodesForSerialization(startNode, pastEnd, EmitString);
@@ -276,7 +272,7 @@ Node* StyledMarkupSerializer<Strategy>::traverseNodesForSerialization(Node* star
continue;
}
- if (!n->layoutObject() && !enclosingElementWithTag(firstPositionInOrBeforeNode(n), selectTag) && m_shouldAnnotate != AnnotateForNavigationTransition) {
+ if (!n->layoutObject() && !enclosingElementWithTag(firstPositionInOrBeforeNode(n), selectTag)) {
next = Strategy::nextSkippingChildren(*n);
// Don't skip over pastEnd.
if (pastEnd && Strategy::isDescendantOf(*pastEnd, *n))
« no previous file with comments | « Source/core/editing/StyledMarkupAccumulator.cpp ('k') | Source/core/editing/markup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698