← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/editing/DeleteFromTextNodeCommand.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/editing/DeleteFromTextNodeCommand.cpp
45
45
{
46
46
    ASSERT(m_node);
47
47
 
 
48
    if (!m_node->isContentEditable())
 
49
        return;
 
50
 
48
51
    ExceptionCode ec = 0;
49
52
    m_text = m_node->substringData(m_offset, m_count, ec);
50
53
    if (ec)
57
60
{
58
61
    ASSERT(m_node);
59
62
 
 
63
    if (!m_node->isContentEditable())
 
64
        return;
 
65
        
60
66
    ExceptionCode ec;
61
67
    m_node->insertData(m_offset, m_text, ec);
62
68
}