← Back to branch summary

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

« back to all changes in this revision

Viewing changes to JavaScriptCore/assembler/AbstractMacroAssembler.h

  • 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:
JavaScriptCore/assembler/AbstractMacroAssembler.h
173
173
    struct Imm32 {
174
174
        explicit Imm32(int32_t value)
175
175
            : m_value(value)
176
 
#if PLATFORM(ARM)
 
176
#if CPU(ARM)
177
177
            , m_isPointer(false)
178
178
#endif
179
179
        {
180
180
        }
181
181
 
182
 
#if !PLATFORM(X86_64)
 
182
#if !CPU(X86_64)
183
183
        explicit Imm32(ImmPtr ptr)
184
184
            : m_value(ptr.asIntptr())
185
 
#if PLATFORM(ARM)
 
185
#if CPU(ARM)
186
186
            , m_isPointer(true)
187
187
#endif
188
188
        {
190
190
#endif
191
191
 
192
192
        int32_t m_value;
193
 
#if PLATFORM(ARM)
 
193
#if CPU(ARM)
194
194
        // We rely on being able to regenerate code to recover exception handling
195
195
        // information.  Since ARMv7 supports 16-bit immediates there is a danger
196
196
        // that if pointer values change the layout of the generated code will change.