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

Side by Side Diff: Source/core/editing/markup.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/markup.h ('k') | Source/core/html/HTMLLinkElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 Node* next = textNode->nextSibling(); 692 Node* next = textNode->nextSibling();
693 if (!next || !next->isTextNode()) 693 if (!next || !next->isTextNode())
694 return; 694 return;
695 695
696 RefPtrWillBeRawPtr<Text> textNext = toText(next); 696 RefPtrWillBeRawPtr<Text> textNext = toText(next);
697 textNode->appendData(textNext->data()); 697 textNode->appendData(textNext->data());
698 if (textNext->parentNode()) // Might have been removed by mutation event. 698 if (textNext->parentNode()) // Might have been removed by mutation event.
699 textNext->remove(exceptionState); 699 textNext->remove(exceptionState);
700 } 700 }
701 701
702 String createStyledMarkupForNavigationTransition(Node* node) 702 template class CORE_EXPORT CreateMarkupAlgorithm<EditingStrategy>;
703 {
704 node->document().updateLayoutIgnorePendingStylesheets();
705
706 StyledMarkupSerializer<EditingStrategy> serializer(ResolveAllURLs, AnnotateF orNavigationTransition, Position(), Position(), 0);
707 serializer.serializeNodes(node, NodeTraversal::nextSkippingChildren(*node));
708
709 static const char* documentMarkup = "<!DOCTYPE html><meta name=\"viewport\" content=\"width=device-width, user-scalable=0\">";
710 return documentMarkup + serializer.takeResults();
711 }
712
713 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingStrategy>;
714 703
715 } 704 }
OLDNEW
« no previous file with comments | « Source/core/editing/markup.h ('k') | Source/core/html/HTMLLinkElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698