From 759e20569a9645cf0658ef241ae38b5b2fd91992 Mon Sep 17 00:00:00 2001 From: Ian Neal Date: Sun, 28 Oct 2012 22:13:50 +0000 Subject: [PATCH 1/6] Bug 805753 - Gtk 2.10 compat layer misses gtk_widget_set_has_window r=roc --- widget/gtk2/compat/gtk/gtkwidget.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/widget/gtk2/compat/gtk/gtkwidget.h b/widget/gtk2/compat/gtk/gtkwidget.h index 69c43ced1c08..c8d487e08b9a 100644 --- a/widget/gtk2/compat/gtk/gtkwidget.h +++ b/widget/gtk2/compat/gtk/gtkwidget.h @@ -66,6 +66,12 @@ gtk_widget_has_grab(GtkWidget *widget) return GTK_WIDGET_HAS_GRAB(widget); } +static inline gboolean +gtk_widget_get_has_window(GtkWidget *widget) +{ + return !GTK_WIDGET_NO_WINDOW(widget); +} + static inline void gtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation) { @@ -87,6 +93,15 @@ gtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus) GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS); } +static inline void +gtk_widget_set_has_window(GtkWidget *widget, gboolean has_window) +{ + if (has_window) + GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_WINDOW); + else + GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW); +} + static inline void gtk_widget_set_window(GtkWidget *widget, GdkWindow *window) { From 2ac33a741af18939e10a61f2dc3485dda5f0f822 Mon Sep 17 00:00:00 2001 From: "philringnalda@gmail.com" Date: Sun, 28 Oct 2012 15:39:31 -0700 Subject: [PATCH 2/6] No bug, Automated blocklist update from host slice --- browser/app/blocklist.xml | 45 ++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 8c03d0ceb54f..cd1a393442b2 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ - + @@ -65,6 +65,10 @@ + + + + @@ -128,8 +132,10 @@ - + + + @@ -294,6 +300,10 @@ + + + + @@ -426,11 +436,11 @@ - - + + - - + + @@ -438,7 +448,7 @@ - + @@ -452,8 +462,23 @@ + + + + + + + + + + + + + + + - + @@ -467,6 +492,10 @@ DIRECT3D_9_LAYERS BLOCKED_DRIVER_VERSION 8.17.12.5896 LESS_THAN_OR_EQUAL WINNT 5.1 0x10de DIRECT3D_9_LAYERS BLOCKED_DRIVER_VERSION 7.0.0.0 GREATER_THAN_OR_EQUAL + All 0x1002 DIRECT2D BLOCKED_DRIVER_VERSION 8.982.0.0 EQUAL + All 0x1022 DIRECT2D BLOCKED_DRIVER_VERSION 8.982.0.0 EQUAL + All 0x1022 DIRECT3D_9_LAYERS BLOCKED_DRIVER_VERSION 8.982.0.0 EQUAL + All 0x1002 DIRECT3D_9_LAYERS BLOCKED_DRIVER_VERSION 8.982.0.0 EQUAL From d91f0430760224358d45e420bafd7594aea3a1b0 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Sun, 28 Oct 2012 23:48:36 -0400 Subject: [PATCH 3/6] Bug 806169: proxy all SendPackets to the STS thread r=ekr --- netwerk/sctp/datachannel/DataChannel.cpp | 22 ++++++++++++++++++++-- netwerk/sctp/datachannel/DataChannel.h | 11 +++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp index 51ce1d018935..b70fc7d5f9d6 100644 --- a/netwerk/sctp/datachannel/DataChannel.cpp +++ b/netwerk/sctp/datachannel/DataChannel.cpp @@ -190,6 +190,12 @@ DataChannelConnection::Init(unsigned short aPort, uint16_t aNumStreams, bool aUs gDataChannelShutdown->Init(); } } + // XXX FIX! make this a global we get once + // Find the STS thread + + nsresult res; + mSTS = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &res); + MOZ_ASSERT(NS_SUCCEEDED(res)); // Open sctp association across tunnel if ((mMasterSocket = usrsctp_socket( @@ -394,7 +400,6 @@ DataChannelConnection::PacketReceived(TransportFlow *flow, usrsctp_conninput(static_cast(this), data, len, 0); } -// XXX Merge with SctpDtlsOutput? int DataChannelConnection::SendPacket(const unsigned char *data, size_t len) { @@ -408,8 +413,21 @@ DataChannelConnection::SctpDtlsOutput(void *addr, void *buffer, size_t length, uint8_t tos, uint8_t set_df) { DataChannelConnection *peer = static_cast(addr); + int res; - return peer->SendPacket(static_cast(buffer), length); + if (peer->IsSTSThread()) { + res = peer->SendPacket(static_cast(buffer), length); + } else { + res = -1; + // XXX It might be worthwhile to add an assertion against the thread + // somehow getting into the DataChannel/SCTP code again, as + // DISPATCH_SYNC is not fully blocking. This may be tricky, as it + // needs to be a per-thread check, not a global. + peer->mSTS->Dispatch(WrapRunnableRet( + peer, &DataChannelConnection::SendPacket, static_cast(buffer), length, &res + ), NS_DISPATCH_SYNC); + } + return res; } #endif diff --git a/netwerk/sctp/datachannel/DataChannel.h b/netwerk/sctp/datachannel/DataChannel.h index 463a7dd9d4f9..bba9aa13c6af 100644 --- a/netwerk/sctp/datachannel/DataChannel.h +++ b/netwerk/sctp/datachannel/DataChannel.h @@ -216,6 +216,16 @@ private: void HandleStreamChangeEvent(const struct sctp_stream_change_event *strchg); void HandleNotification(const union sctp_notification *notif, size_t n); +#ifdef SCTP_DTLS_SUPPORTED + bool IsSTSThread() { + bool on = false; + if (mSTS) { + mSTS->IsOnCurrentThread(&on); + } + return on; + } +#endif + // NOTE: while these arrays will auto-expand, increases in the number of // channels available from the stack must be negotiated! nsAutoTArray mStreamsOut; @@ -231,6 +241,7 @@ private: #ifdef SCTP_DTLS_SUPPORTED nsRefPtr mTransportFlow; + nsCOMPtr mSTS; #endif uint16_t mLocalPort; uint16_t mRemotePort; From f8d44aeb6fa66601726ad77114ff0e648ae50e7e Mon Sep 17 00:00:00 2001 From: Ben Hearsum Date: Mon, 29 Oct 2012 10:07:55 -0400 Subject: [PATCH 4/6] bug 805788: exclude override.ini from mac signatures. r=ted --- browser/app/macbuild/Contents/_CodeSignature/CodeResources | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/app/macbuild/Contents/_CodeSignature/CodeResources b/browser/app/macbuild/Contents/_CodeSignature/CodeResources index 3d06206e07bd..22666b944d20 100644 --- a/browser/app/macbuild/Contents/_CodeSignature/CodeResources +++ b/browser/app/macbuild/Contents/_CodeSignature/CodeResources @@ -18,6 +18,12 @@ weight 10 + ^MacOS/override.ini + omit + + weight + 10 + ^MacOS/updates/.* omit From 7f3ec9a0717e30e5814c5733ed35f190c5717f2b Mon Sep 17 00:00:00 2001 From: Doug Turner Date: Mon, 29 Oct 2012 09:54:35 -0700 Subject: [PATCH 5/6] Bug 804789 - Fix commented out code cause by Bug 793955. r=bent --- dom/ipc/ContentParent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 7caab77c54ea..f81c93c580d4 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -1240,7 +1240,7 @@ ContentParent::GetOrCreateActorForBlob(nsIDOMBlob* aBlob) BlobConstructorParams params; - if (blob->IsSizeUnknown() || /*blob->IsDateUnknown()*/ 0) { + if (blob->IsSizeUnknown() || blob->IsDateUnknown()) { // We don't want to call GetSize or GetLastModifiedDate // yet since that may stat a file on the main thread // here. Instead we'll learn the size lazily from the From 5260f5e609a3902d24b285c13e905383e2033373 Mon Sep 17 00:00:00 2001 From: John Ford Date: Mon, 29 Oct 2012 14:01:18 -0700 Subject: [PATCH 6/6] bug 806548 - sync 32bit and 64bit linux desktop b2g mozconfigs rs=cjones DONTBUILD because NPOTB --- b2g/config/mozconfigs/linux64_gecko/nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/b2g/config/mozconfigs/linux64_gecko/nightly b/b2g/config/mozconfigs/linux64_gecko/nightly index 2503d51d1196..cf5b1f0f002b 100644 --- a/b2g/config/mozconfigs/linux64_gecko/nightly +++ b/b2g/config/mozconfigs/linux64_gecko/nightly @@ -1,12 +1,12 @@ +. "$topsrcdir/b2g/config/mozconfigs/common" + ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-update-packaging ac_add_options --enable-codesighs ac_add_options --enable-signmar # Nightlies only since this has a cost in performance -ac_add_options --enable-js-diagnostics - -. $topsrcdir/build/unix/mozconfig.linux +#ac_add_options --enable-js-diagnostics # Avoid dependency on libstdc++ 4.5 ac_add_options --enable-stdcxx-compat