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

Side by Side Diff: third_party/WebKit/WebCore/dom/CharacterData.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 13 matching lines...) Expand all
24 24
25 #include "CString.h" 25 #include "CString.h"
26 #include "EventNames.h" 26 #include "EventNames.h"
27 #include "ExceptionCode.h" 27 #include "ExceptionCode.h"
28 #include "MutationEvent.h" 28 #include "MutationEvent.h"
29 #include "RenderText.h" 29 #include "RenderText.h"
30 30
31 namespace WebCore { 31 namespace WebCore {
32 32
33 CharacterData::CharacterData(Document *doc, bool isText) 33 CharacterData::CharacterData(Document *doc, bool isText)
34 : Node(doc, false, false, isText) 34 : EventTargetNode(doc, false, false, isText)
35 , m_data(StringImpl::empty()) 35 , m_data(StringImpl::empty())
36 { 36 {
37 } 37 }
38 38
39 CharacterData::CharacterData(Document* document, const String& text, bool isText ) 39 CharacterData::CharacterData(Document* document, const String& text, bool isText )
40 : Node(document, false, false, isText) 40 : EventTargetNode(document, false, false, isText)
41 { 41 {
42 m_data = text.impl() ? text.impl() : StringImpl::empty(); 42 m_data = text.impl() ? text.impl() : StringImpl::empty();
43 } 43 }
44 44
45 CharacterData::~CharacterData() 45 CharacterData::~CharacterData()
46 { 46 {
47 } 47 }
48 48
49 void CharacterData::setData(const String& data, ExceptionCode&) 49 void CharacterData::setData(const String& data, ExceptionCode&)
50 { 50 {
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 217
218 int CharacterData::maxCharacterOffset() const 218 int CharacterData::maxCharacterOffset() const
219 { 219 {
220 return static_cast<int>(length()); 220 return static_cast<int>(length());
221 } 221 }
222 222
223 bool CharacterData::rendererIsNeeded(RenderStyle *style) 223 bool CharacterData::rendererIsNeeded(RenderStyle *style)
224 { 224 {
225 if (!m_data || !length()) 225 if (!m_data || !length())
226 return false; 226 return false;
227 return Node::rendererIsNeeded(style); 227 return EventTargetNode::rendererIsNeeded(style);
228 } 228 }
229 229
230 bool CharacterData::offsetInCharacters() const 230 bool CharacterData::offsetInCharacters() const
231 { 231 {
232 return true; 232 return true;
233 } 233 }
234 234
235 } // namespace WebCore 235 } // namespace WebCore
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/dom/CharacterData.h ('k') | third_party/WebKit/WebCore/dom/CharacterData.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698