← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/platform/text/StringImpl.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/platform/text/StringImpl.cpp
34
34
#include "TextBreakIterator.h"
35
35
#include "TextEncoding.h"
36
36
#include "ThreadGlobalData.h"
 
37
#include <runtime/UString.h>
37
38
#include <wtf/dtoa.h>
38
39
#include <wtf/Assertions.h>
39
40
#include <wtf/Threading.h>
979
980
{
980
981
    SharedUChar* sharedBuffer = this->sharedBuffer();
981
982
    if (sharedBuffer)
982
 
        return JSC::UString::Rep::create(const_cast<UChar*>(m_data), m_length, sharedBuffer);
 
983
        return JSC::UString::Rep::create(sharedBuffer, const_cast<UChar*>(m_data), m_length);
983
984
 
984
985
    return JSC::UString(m_data, m_length);
985
986
}