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/MergeIdenticalElementsCommand.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/MergeIdenticalElementsCommand.cpp')
| -rw-r--r-- | WebCore/editing/MergeIdenticalElementsCommand.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/editing/MergeIdenticalElementsCommand.cpp b/WebCore/editing/MergeIdenticalElementsCommand.cpp index 0b9b019..1819b92 100644 --- a/WebCore/editing/MergeIdenticalElementsCommand.cpp +++ b/WebCore/editing/MergeIdenticalElementsCommand.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 { -MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(Element* first, Element* second) - : EditCommand(first->document()), m_element1(first), m_element2(second) +MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(PassRefPtr<Element> first, PassRefPtr<Element> second) + : SimpleEditCommand(first->document()), m_element1(first), m_element2(second) { ASSERT(m_element1); ASSERT(m_element2); |