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

Side by Side Diff: Source/core/page/PageSerializer.cpp

Issue 634883002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/page (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/page/PagePopupController.h ('k') | Source/core/page/PointerLockController.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 { 91 {
92 return isHTMLScriptElement(element) || isHTMLNoScriptElement(element) || isC harsetSpecifyingNode(element); 92 return isHTMLScriptElement(element) || isHTMLNoScriptElement(element) || isC harsetSpecifyingNode(element);
93 } 93 }
94 94
95 static const QualifiedName& frameOwnerURLAttributeName(const HTMLFrameOwnerEleme nt& frameOwner) 95 static const QualifiedName& frameOwnerURLAttributeName(const HTMLFrameOwnerEleme nt& frameOwner)
96 { 96 {
97 // FIXME: We should support all frame owners including applets. 97 // FIXME: We should support all frame owners including applets.
98 return isHTMLObjectElement(frameOwner) ? HTMLNames::dataAttr : HTMLNames::sr cAttr; 98 return isHTMLObjectElement(frameOwner) ? HTMLNames::dataAttr : HTMLNames::sr cAttr;
99 } 99 }
100 100
101 class SerializerMarkupAccumulator FINAL : public MarkupAccumulator { 101 class SerializerMarkupAccumulator final : public MarkupAccumulator {
102 public: 102 public:
103 SerializerMarkupAccumulator(PageSerializer*, const Document&, WillBeHeapVect or<RawPtrWillBeMember<Node> >*); 103 SerializerMarkupAccumulator(PageSerializer*, const Document&, WillBeHeapVect or<RawPtrWillBeMember<Node> >*);
104 virtual ~SerializerMarkupAccumulator(); 104 virtual ~SerializerMarkupAccumulator();
105 105
106 protected: 106 protected:
107 virtual void appendText(StringBuilder& out, Text&) OVERRIDE; 107 virtual void appendText(StringBuilder& out, Text&) override;
108 virtual void appendElement(StringBuilder& out, Element&, Namespaces*) OVERRI DE; 108 virtual void appendElement(StringBuilder& out, Element&, Namespaces*) overri de;
109 virtual void appendCustomAttributes(StringBuilder& out, const Element&, Name spaces*) OVERRIDE; 109 virtual void appendCustomAttributes(StringBuilder& out, const Element&, Name spaces*) override;
110 virtual void appendEndTag(const Element&) OVERRIDE; 110 virtual void appendEndTag(const Element&) override;
111 111
112 private: 112 private:
113 PageSerializer* m_serializer; 113 PageSerializer* m_serializer;
114 const Document& m_document; 114 const Document& m_document;
115 }; 115 };
116 116
117 SerializerMarkupAccumulator::SerializerMarkupAccumulator(PageSerializer* seriali zer, const Document& document, WillBeHeapVector<RawPtrWillBeMember<Node> >* node s) 117 SerializerMarkupAccumulator::SerializerMarkupAccumulator(PageSerializer* seriali zer, const Document& document, WillBeHeapVector<RawPtrWillBeMember<Node> >* node s)
118 : MarkupAccumulator(nodes, ResolveAllURLs, nullptr) 118 : MarkupAccumulator(nodes, ResolveAllURLs, nullptr)
119 , m_serializer(serializer) 119 , m_serializer(serializer)
120 , m_document(document) 120 , m_document(document)
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 if (iter != m_blankFrameURLs.end()) 383 if (iter != m_blankFrameURLs.end())
384 return iter->value; 384 return iter->value;
385 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); 385 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
386 KURL fakeURL(ParsedURLString, url); 386 KURL fakeURL(ParsedURLString, url);
387 m_blankFrameURLs.add(frame, fakeURL); 387 m_blankFrameURLs.add(frame, fakeURL);
388 388
389 return fakeURL; 389 return fakeURL;
390 } 390 }
391 391
392 } 392 }
OLDNEW
« no previous file with comments | « Source/core/page/PagePopupController.h ('k') | Source/core/page/PointerLockController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698