diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/SConscript.main | 2 | ||||
| -rw-r--r-- | net/disk_cache/backend_impl.cc | 11 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 13 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/npruntime.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/platform/graphics/GraphicsContextSkia.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/event_sending_controller.cc | 1 |
8 files changed, 23 insertions, 12 deletions
@@ -15,7 +15,7 @@ deps = { "/trunk/deps/third_party/WebKit@5138", "src/third_party/icu38": - "/trunk/deps/third_party/icu38@5041", + "/trunk/deps/third_party/icu38@5179", "src/v8": "http://v8.googlecode.com/svn/trunk@696", diff --git a/build/SConscript.main b/build/SConscript.main index 45cafa2..10792fa 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -444,7 +444,7 @@ linux_env.Append( BUILD_SCONSCRIPTS = [ '$LIBEVENT_DIR/libevent.scons', ], - CCFLAGS = ['-m32', '-g', '-pthread'], + CCFLAGS = ['-m32', '-pthread'], CXXFLAGS = ['-Wall', '-Werror'] + excluded_warnings, LINKFLAGS = ['-m32', '-pthread'], ) diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index 20e6348..75af4e4 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -340,12 +340,15 @@ bool BackendImpl::DoomEntry(const std::string& key) { if (disabled_) return false; - EntryImpl* entry; - if (!OpenEntry(key, reinterpret_cast<Entry**>(&entry))) + Entry* entry; + if (!OpenEntry(key, &entry)) return false; - entry->Doom(); - entry->Release(); + // Note that you'd think you could just pass &entry_impl to OpenEntry, + // but that triggers strict aliasing problems with gcc. + EntryImpl* entry_impl = reinterpret_cast<EntryImpl*>(entry); + entry_impl->Doom(); + entry_impl->Release(); return true; } diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 4517df0..9d904cb 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -26,10 +26,15 @@ if env['PLATFORM'] == 'win32': else: # We need to include the parts of icu and libxml that we want here: env.Append( - CPPPATH = [ - '$ICU38_DIR/public/common', - '$LIBXML_DIR/include', - ]) + CCFLAGS = [ + # TODO(port): fix HTMLNames etc. generator and remove this. + '-fno-strict-aliasing', + ], + CPPPATH = [ + '$ICU38_DIR/public/common', + '$LIBXML_DIR/include', + ] + ) inputs = [ '$SHARED_DIR/PausedTimeouts.cpp', diff --git a/webkit/port/bindings/v8/npruntime.cpp b/webkit/port/bindings/v8/npruntime.cpp index f47790a..df30e13 100644 --- a/webkit/port/bindings/v8/npruntime.cpp +++ b/webkit/port/bindings/v8/npruntime.cpp @@ -321,7 +321,9 @@ void _NPN_UnregisterObject(NPObject* obj) { ASSERT(g_root_objects.find(obj) != g_root_objects.end()); NPObjectSet* set = g_root_objects[obj]; while (set->size() > 0) { +#ifndef NDEBUG size_t size = set->size(); +#endif NPObject* sub_object = *(set->begin()); // The sub-object should not be a owner! ASSERT(g_root_objects.find(sub_object) == g_root_objects.end()); diff --git a/webkit/port/platform/graphics/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/GraphicsContextSkia.cpp index 59e694e..4c3f045 100644 --- a/webkit/port/platform/graphics/GraphicsContextSkia.cpp +++ b/webkit/port/platform/graphics/GraphicsContextSkia.cpp @@ -753,7 +753,7 @@ void GraphicsContext::setPlatformShadow(const IntSize& size, int blur, const Col if (color.isValid()) c = color.rgb(); else - SkColorSetARGB(0xFF/3, 0, 0, 0); // "std" apple shadow color + c = SkColorSetARGB(0xFF/3, 0, 0, 0); // "std" apple shadow color SkDrawLooper* dl = new SkBlurDrawLooper(SkIntToScalar(blur), SkIntToScalar(size.width()), diff --git a/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp index ebdbbaf..157b2ad 100644 --- a/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp +++ b/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp @@ -98,7 +98,7 @@ public: /* Allocate and initialize JPEG decompression object */ jpeg_create_decompress(&m_info); - decoder_source_mgr* src; + decoder_source_mgr* src = NULL; if (!m_info.src) { src = (decoder_source_mgr*)fastCalloc(sizeof(decoder_source_mgr), 1); if (!src) { diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index aea9aed..dc27f68 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -367,6 +367,7 @@ int EventSendingController::GetButtonNumberFromSingleArg( } #elif defined(OS_LINUX) // TODO(agl): We obviously need to do something about keycodes here + code = 0; // Appease variable-used-without-initialization compiler warning. if (true) { NOTIMPLEMENTED(); } |