| Index: Source/core/editing/SplitElementCommand.cpp
|
| diff --git a/Source/core/editing/SplitElementCommand.cpp b/Source/core/editing/SplitElementCommand.cpp
|
| index d3e92512a6651a2b6f7c8582223a21b13aaca9d6..69323c31688cc77707d15211be6303a09eba76b7 100644
|
| --- a/Source/core/editing/SplitElementCommand.cpp
|
| +++ b/Source/core/editing/SplitElementCommand.cpp
|
| @@ -20,7 +20,7 @@
|
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #include "config.h"
|
| @@ -46,13 +46,13 @@ void SplitElementCommand::executeApply()
|
| {
|
| if (m_atChild->parentNode() != m_element2)
|
| return;
|
| -
|
| +
|
| Vector<RefPtr<Node> > children;
|
| for (Node* node = m_element2->firstChild(); node != m_atChild; node = node->nextSibling())
|
| children.append(node);
|
| -
|
| +
|
| ExceptionCode ec = 0;
|
| -
|
| +
|
| ContainerNode* parent = m_element2->parentNode();
|
| if (!parent || !parent->rendererIsEditable())
|
| return;
|
| @@ -67,11 +67,11 @@ void SplitElementCommand::executeApply()
|
| for (size_t i = 0; i < size; ++i)
|
| m_element1->appendChild(children[i], ec);
|
| }
|
| -
|
| +
|
| void SplitElementCommand::doApply()
|
| {
|
| m_element1 = m_element2->cloneElementWithoutChildren();
|
| -
|
| +
|
| executeApply();
|
| }
|
|
|
| @@ -101,7 +101,7 @@ void SplitElementCommand::doReapply()
|
| {
|
| if (!m_element1)
|
| return;
|
| -
|
| +
|
| executeApply();
|
| }
|
|
|
| @@ -113,5 +113,5 @@ void SplitElementCommand::getNodesInCommand(HashSet<Node*>& nodes)
|
| addNodeAndDescendants(m_atChild.get(), nodes);
|
| }
|
| #endif
|
| -
|
| +
|
| } // namespace WebCore
|
|
|