← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/platform/text/AtomicString.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/AtomicString.cpp
103
103
    if (string->length() != length)
104
104
        return false;
105
105
 
106
 
#if PLATFORM(ARM) || PLATFORM(SPARC) || PLATFORM(SH4)
 
106
#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
 
107
    // FIXME: perhaps we should have a more abstract macro that indicates when
 
108
    // going 4 bytes at a time is unsafe
107
109
    const UChar* stringCharacters = string->characters();
108
110
    for (unsigned i = 0; i != length; ++i) {
109
111
        if (*stringCharacters++ != *characters++)