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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "core/inspector/ConsoleMessage.h" 80 #include "core/inspector/ConsoleMessage.h"
81 #include "core/layout/HitTestResult.h" 81 #include "core/layout/HitTestResult.h"
82 #include "core/layout/LayoutImage.h" 82 #include "core/layout/LayoutImage.h"
83 #include "core/loader/EmptyClients.h" 83 #include "core/loader/EmptyClients.h"
84 #include "core/page/EditorClient.h" 84 #include "core/page/EditorClient.h"
85 #include "core/page/FocusController.h" 85 #include "core/page/FocusController.h"
86 #include "core/page/Page.h" 86 #include "core/page/Page.h"
87 #include "core/svg/SVGImageElement.h" 87 #include "core/svg/SVGImageElement.h"
88 #include "platform/KillRing.h" 88 #include "platform/KillRing.h"
89 #include "platform/weborigin/KURL.h" 89 #include "platform/weborigin/KURL.h"
90 #include "wtf/PtrUtil.h"
90 #include "wtf/text/CharacterNames.h" 91 #include "wtf/text/CharacterNames.h"
91 92
92 namespace blink { 93 namespace blink {
93 94
94 using namespace HTMLNames; 95 using namespace HTMLNames;
95 using namespace WTF; 96 using namespace WTF;
96 using namespace Unicode; 97 using namespace Unicode;
97 98
98 Editor::RevealSelectionScope::RevealSelectionScope(Editor* editor) 99 Editor::RevealSelectionScope::RevealSelectionScope(Editor* editor)
99 : m_editor(editor) 100 : m_editor(editor)
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 { 762 {
762 return new Editor(frame); 763 return new Editor(frame);
763 } 764 }
764 765
765 Editor::Editor(LocalFrame& frame) 766 Editor::Editor(LocalFrame& frame)
766 : m_frame(&frame) 767 : m_frame(&frame)
767 , m_preventRevealSelection(0) 768 , m_preventRevealSelection(0)
768 , m_shouldStartNewKillRingSequence(false) 769 , m_shouldStartNewKillRingSequence(false)
769 // This is off by default, since most editors want this behavior (this match es IE but not FF). 770 // This is off by default, since most editors want this behavior (this match es IE but not FF).
770 , m_shouldStyleWithCSS(false) 771 , m_shouldStyleWithCSS(false)
771 , m_killRing(adoptPtr(new KillRing)) 772 , m_killRing(wrapUnique(new KillRing))
772 , m_areMarkedTextMatchesHighlighted(false) 773 , m_areMarkedTextMatchesHighlighted(false)
773 , m_defaultParagraphSeparator(EditorParagraphSeparatorIsDiv) 774 , m_defaultParagraphSeparator(EditorParagraphSeparatorIsDiv)
774 , m_overwriteModeEnabled(false) 775 , m_overwriteModeEnabled(false)
775 { 776 {
776 } 777 }
777 778
778 Editor::~Editor() 779 Editor::~Editor()
779 { 780 {
780 } 781 }
781 782
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 } 1370 }
1370 1371
1371 DEFINE_TRACE(Editor) 1372 DEFINE_TRACE(Editor)
1372 { 1373 {
1373 visitor->trace(m_frame); 1374 visitor->trace(m_frame);
1374 visitor->trace(m_lastEditCommand); 1375 visitor->trace(m_lastEditCommand);
1375 visitor->trace(m_mark); 1376 visitor->trace(m_mark);
1376 } 1377 }
1377 1378
1378 } // namespace blink 1379 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/editing/Editor.h ('k') | third_party/WebKit/Source/core/editing/FrameSelection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698