Source/core/editing/markup.cpp - Issue 750353008: Remove the tagNamesToSkip argument on MarkupAccumulator::serializeNodes

Side by Side Diff: Source/core/editing/markup.cpp

Issue 750353008: Remove the tagNamesToSkip argument on MarkupAccumulator::serializeNodes (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.	2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.

3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved.	3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved.

4 * Copyright (C) 2011 Igalia S.L.	4 * Copyright (C) 2011 Igalia S.L.

5 * Copyright (C) 2011 Motorola Mobility. All rights reserved.	5 * Copyright (C) 2011 Motorola Mobility. All rights reserved.

6 *	6 *

7 * Redistribution and use in source and binary forms, with or without	7 * Redistribution and use in source and binary forms, with or without

8 * modification, are permitted provided that the following conditions	8 * modification, are permitted provided that the following conditions

9 * are met:	9 * are met:

10 * 1. Redistributions of source code must retain the above copyright	10 * 1. Redistributions of source code must retain the above copyright

(...skipping 735 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
746 if (specialCommonAncestor)	746 if (specialCommonAncestor)

747 fragment->appendChild(specialCommonAncestor);	747 fragment->appendChild(specialCommonAncestor);

748 else	748 else

749 fragment->parserTakeAllChildrenFrom(toContainerNode(*commonAncestor));	749 fragment->parserTakeAllChildrenFrom(toContainerNode(*commonAncestor));

750	750

751 trimFragment(fragment.get(), nodeBeforeContext.get(), nodeAfterContext.get() );	751 trimFragment(fragment.get(), nodeBeforeContext.get(), nodeAfterContext.get() );

752	752

753 return fragment;	753 return fragment;

754 }	754 }

755	755

756 String createMarkup(const Node* node, EChildrenOnly childrenOnly, WillBeHeapVect or<RawPtrWillBeMember<Node>>* nodes, EAbsoluteURLs shouldResolveURLs, Vector<Qua lifiedName>* tagNamesToSkip)	756 String createMarkup(const Node* node, EChildrenOnly childrenOnly, WillBeHeapVect or<RawPtrWillBeMember<Node>>* nodes, EAbsoluteURLs shouldResolveURLs)

757 {	757 {

758 if (!node)	758 if (!node)

759 return "";	759 return "";

760	760

761 MarkupAccumulator accumulator(nodes, shouldResolveURLs);	761 MarkupAccumulator accumulator(nodes, shouldResolveURLs);

762 return accumulator.serializeNodes(const_cast<Node&>(*node), childrenOnly, ta gNamesToSkip);	762 return accumulator.serializeNodes(const_cast<Node&>(*node), childrenOnly);

763 }	763 }

764	764

765 static void fillContainerFromString(ContainerNode* paragraph, const String& stri ng)	765 static void fillContainerFromString(ContainerNode* paragraph, const String& stri ng)

766 {	766 {

767 Document& document = paragraph->document();	767 Document& document = paragraph->document();

768	768

769 if (string.isEmpty()) {	769 if (string.isEmpty()) {

770 paragraph->appendChild(createBlockPlaceholderElement(document));	770 paragraph->appendChild(createBlockPlaceholderElement(document));

771 return;	771 return;

772 }	772 }

(...skipping 314 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1087 node->document().updateLayoutIgnorePendingStylesheets();	1087 node->document().updateLayoutIgnorePendingStylesheets();

1088	1088

1089 StyledMarkupAccumulator accumulator(0, ResolveAllURLs, AnnotateForNavigation Transition, nullptr, 0);	1089 StyledMarkupAccumulator accumulator(0, ResolveAllURLs, AnnotateForNavigation Transition, nullptr, 0);

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

1091	1091

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

1093 return documentMarkup + accumulator.takeResults();	1093 return documentMarkup + accumulator.takeResults();

1094 }	1094 }

1095	1095

1096 }	1096 }

OLD	NEW

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