diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebCore/editing/JoinTextNodesCommand.cpp | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebCore/editing/JoinTextNodesCommand.cpp')
| -rw-r--r-- | WebCore/editing/JoinTextNodesCommand.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/editing/JoinTextNodesCommand.cpp b/WebCore/editing/JoinTextNodesCommand.cpp index 9d51043..dddf43c 100644 --- a/WebCore/editing/JoinTextNodesCommand.cpp +++ b/WebCore/editing/JoinTextNodesCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. + * Copyright (C) 2005, 2008 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,8 +30,8 @@ namespace WebCore { -JoinTextNodesCommand::JoinTextNodesCommand(Text *text1, Text *text2) - : EditCommand(text1->document()), m_text1(text1), m_text2(text2) +JoinTextNodesCommand::JoinTextNodesCommand(PassRefPtr<Text> text1, PassRefPtr<Text> text2) + : SimpleEditCommand(text1->document()), m_text1(text1), m_text2(text2) { ASSERT(m_text1); ASSERT(m_text2); |