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

Side by Side Diff: third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: Created 4 years, 9 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
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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 completeURLs(*fragment, baseURL); 284 completeURLs(*fragment, baseURL);
285 285
286 return fragment.release(); 286 return fragment.release();
287 } 287 }
288 288
289 static const char fragmentMarkerTag[] = "webkit-fragment-marker"; 289 static const char fragmentMarkerTag[] = "webkit-fragment-marker";
290 290
291 static bool findNodesSurroundingContext(DocumentFragment* fragment, RefPtrWillBe RawPtr<Comment>& nodeBeforeContext, RefPtrWillBeRawPtr<Comment>& nodeAfterContex t) 291 static bool findNodesSurroundingContext(DocumentFragment* fragment, RefPtrWillBe RawPtr<Comment>& nodeBeforeContext, RefPtrWillBeRawPtr<Comment>& nodeAfterContex t)
292 { 292 {
293 for (Node& node : NodeTraversal::startsAt(fragment->firstChild())) { 293 for (Node& node : NodeTraversal::startsAt(fragment->firstChild())) {
294 if (node.nodeType() == Node::COMMENT_NODE && toComment(node).data() == f ragmentMarkerTag) { 294 if (node.getNodeType() == Node::COMMENT_NODE && toComment(node).data() = = fragmentMarkerTag) {
295 if (!nodeBeforeContext) { 295 if (!nodeBeforeContext) {
296 nodeBeforeContext = &toComment(node); 296 nodeBeforeContext = &toComment(node);
297 } else { 297 } else {
298 nodeAfterContext = &toComment(node); 298 nodeAfterContext = &toComment(node);
299 return true; 299 return true;
300 } 300 }
301 } 301 }
302 } 302 }
303 return false; 303 return false;
304 } 304 }
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 RefPtrWillBeRawPtr<Text> textNext = toText(next); 698 RefPtrWillBeRawPtr<Text> textNext = toText(next);
699 textNode->appendData(textNext->data()); 699 textNode->appendData(textNext->data());
700 if (textNext->parentNode()) // Might have been removed by mutation event. 700 if (textNext->parentNode()) // Might have been removed by mutation event.
701 textNext->remove(exceptionState); 701 textNext->remove(exceptionState);
702 } 702 }
703 703
704 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingStrategy>; 704 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingStrategy>;
705 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingInFlatTreeStrat egy>; 705 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingInFlatTreeStrat egy>;
706 706
707 } // namespace blink 707 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698