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

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

Issue 330933002: Revert of Removing "using" declarations that import names in the C++ Standard library. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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/editing/htmlediting.cpp ('k') | Source/core/fileapi/FileReaderLoader.cpp » ('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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "core/frame/LocalFrame.h" 53 #include "core/frame/LocalFrame.h"
54 #include "core/html/HTMLBodyElement.h" 54 #include "core/html/HTMLBodyElement.h"
55 #include "core/html/HTMLElement.h" 55 #include "core/html/HTMLElement.h"
56 #include "core/html/HTMLTableCellElement.h" 56 #include "core/html/HTMLTableCellElement.h"
57 #include "core/html/HTMLTextFormControlElement.h" 57 #include "core/html/HTMLTextFormControlElement.h"
58 #include "core/rendering/RenderObject.h" 58 #include "core/rendering/RenderObject.h"
59 #include "platform/weborigin/KURL.h" 59 #include "platform/weborigin/KURL.h"
60 #include "wtf/StdLibExtras.h" 60 #include "wtf/StdLibExtras.h"
61 #include "wtf/text/StringBuilder.h" 61 #include "wtf/text/StringBuilder.h"
62 62
63 using namespace std;
64
63 namespace WebCore { 65 namespace WebCore {
64 66
65 using namespace HTMLNames; 67 using namespace HTMLNames;
66 68
67 static bool propertyMissingOrEqualToNone(StylePropertySet*, CSSPropertyID); 69 static bool propertyMissingOrEqualToNone(StylePropertySet*, CSSPropertyID);
68 70
69 class AttributeChange { 71 class AttributeChange {
70 ALLOW_ONLY_INLINE_ALLOCATION(); 72 ALLOW_ONLY_INLINE_ALLOCATION();
71 public: 73 public:
72 AttributeChange() 74 AttributeChange()
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 return; 1079 return;
1078 1080
1079 RefPtrWillBeRawPtr<Text> textNode = toText(node.get()); 1081 RefPtrWillBeRawPtr<Text> textNode = toText(node.get());
1080 RefPtrWillBeRawPtr<Text> textNext = toText(next); 1082 RefPtrWillBeRawPtr<Text> textNext = toText(next);
1081 textNode->appendData(textNext->data()); 1083 textNode->appendData(textNext->data());
1082 if (textNext->parentNode()) // Might have been removed by mutation event. 1084 if (textNext->parentNode()) // Might have been removed by mutation event.
1083 textNext->remove(exceptionState); 1085 textNext->remove(exceptionState);
1084 } 1086 }
1085 1087
1086 } 1088 }
OLDNEW
« no previous file with comments | « Source/core/editing/htmlediting.cpp ('k') | Source/core/fileapi/FileReaderLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698