tor-commits October 2016

tor-commits@lists.torproject.org

18 participants
868 discussions

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit a1f4bb1991e98d27c4702822dec781a743ba0934 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 11:16:34 2016 +0000 Update translations for torbutton-torbuttondtd --- it/torbutton.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/it/torbutton.dtd b/it/torbutton.dtd index 37ddb70..3d73a2a 100644 --- a/it/torbutton.dtd +++ b/it/torbutton.dtd @@ -25,17 +25,17 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "… [View More]Proteggi i nuovi cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie"> <!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy"> -<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use."> +<!ENTITY torbutton.prefs.priv_caption_tooltip "Quando selezionate, le seguenti impostazioni aiutano a tenere nascosta la tua identità e storia di navigazione. Per un uso normale del Browser Tor, ti raccomandiamo fortemente di mantenere selezionati tutti i box relativi alla privacy."> <!ENTITY torbutton.prefs.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)"> -<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites."> +<!ENTITY torbutton.prefs.block_disk_tooltip "Mantieni questo box selezionato per evitare di salvare dati sensibili sul disco fisso, inclusa la cache del browser, la tua storia di navigazione, il database dei cookie, la storia dei tuoi download, certificati TLS intermedi, and le autorizzazioni che hai concesso ai siti."> <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Mantieni questo box selezionato per evitare che diverse funzionalità del browser possano essere utilizzate per tracciare la tua navigazione. Le funzionalità modificate includono URL blob, canali di trasmissione, la cache del browser, cookie, favicon, intestazioni di Auth HTTP, link a cui ti sei connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers, a ticket di sessioni TLS."> <!ENTITY torbutton.prefs.block_plugins "Disabilita i plugin del browser (come Flash)"> -<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track."> +<!ENTITY torbutton.prefs.block_plugins_tooltip "Mantieni questo box selezionato per interrompere il caricamento di tutti i plugin binari. I Plugin rappresentano un serio rischio per la privacy poichè possono lasciar trapelare la tua storia di navigazione o comunque rendere più facile tracciarti."> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantieni questo box selezionato per nascondere ai siti informazioni univoche su di te, incluse lo stato della batteria, le performance del computer, il layout della tastiera, locale, il luogo di installazione dei plugin, la lista dei plugin installati, lo stato della tua rete, l'orientamento dello schermo, le dimensioni dello schermo, livelli di zoom specifici per i siti, le tipologie di file supportati, i colori del sistema, and le capacità di gestire WebGL."> <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Il Security Slider ti permette di disabilitare determinate funzionalità del browser che potrebbero renderlo più vulnerabile a tentativi di attacco."> <!ENTITY torbutton.prefs.sec_low "Basso (default)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Questo permette la migliore esperienza di usablità."> <!ENTITY torbutton.prefs.sec_low_desc "A questo livello di sicurezza, tutte le features del browser sono abilitate."> [View Less]

1 0

[tor-messenger-build/master] Add patches for trac 20204
by arlo＠torproject.org 01 Oct '16

01 Oct '16

commit eb37fc7a210b86efd6a407b8527a41cb1330ebfb Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 30 21:44:52 2016 -0700 Add patches for trac 20204 --- ChangeLog | 3 +- ...d-mozilla-ViewRegion-which-assembles-a.mozpatch | 192 ++++++++++++++++++++ ...e-ViewRegion-for-vibrant-areas-in-Vibr.mozpatch | 180 +++++++++++++++++++ ...e-ViewRegion-for-window-dragging.-r-sp.mozpatch | 199 +++++++++++++++++++++ projects/instantbird/config … [View More] | 3 + 5 files changed, 576 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 164a902..50ca933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,8 @@ Tor Messenger 0.2.0b3 -- * Bug 20208: Put conversations on hold by default * Properly handle incoming xmpp server messages (bugzilla 1246431) * Mac - * Bug 20206: Avoid prompting to download font "Osaka" + * Bug 20206: Avoid prompting to download font "Osaka" on macOS Sierra + * Bug 20204: Windows don't drag on macOS Sierra Tor Messenger 0.2.0b2 -- September 06, 2016 * Mac diff --git a/projects/instantbird/0001-Bug-1070710-Add-mozilla-ViewRegion-which-assembles-a.mozpatch b/projects/instantbird/0001-Bug-1070710-Add-mozilla-ViewRegion-which-assembles-a.mozpatch new file mode 100644 index 0000000..c5280e8 --- /dev/null +++ b/projects/instantbird/0001-Bug-1070710-Add-mozilla-ViewRegion-which-assembles-a.mozpatch @@ -0,0 +1,192 @@ +From 20344dc64a7177eb6d894df3ee6a77419c67284b Mon Sep 17 00:00:00 2001 +From: Markus Stange <mstange(a)themasta.com> +Date: Sat, 16 Jul 2016 17:07:45 -0400 +Subject: [PATCH 1/3] Bug 1070710 - Add mozilla::ViewRegion which assembles a + LayoutDeviceIntRegion as NSViews. r=spohl + +MozReview-Commit-ID: RrVzLcv27T + +--HG-- +extra : amend_source : d14dc262bf300a81feaf03954d5783ea1c7451cb +extra : histedit_source : aa39b53c122a719a5181b5a41d5351bbdf04cbd8 +--- + widget/cocoa/ViewRegion.h | 53 ++++++++++++++++++++++++++++++++ + widget/cocoa/ViewRegion.mm | 70 +++++++++++++++++++++++++++++++++++++++++++ + widget/cocoa/moz.build | 1 + + widget/cocoa/nsScreenCocoa.mm | 4 +-- + 4 files changed, 126 insertions(+), 2 deletions(-) + create mode 100644 widget/cocoa/ViewRegion.h + create mode 100644 widget/cocoa/ViewRegion.mm + +diff --git a/widget/cocoa/ViewRegion.h b/widget/cocoa/ViewRegion.h +new file mode 100644 +index 0000000..a8efcca +--- /dev/null ++++ b/widget/cocoa/ViewRegion.h +@@ -0,0 +1,53 @@ ++/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* vim: set ts=8 sts=2 et sw=2 tw=80: */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef ViewRegion_h ++#define ViewRegion_h ++ ++#include "Units.h" ++#include "nsTArray.h" ++ ++@class NSView; ++ ++namespace mozilla { ++ ++/** ++ * Manages a set of NSViews to cover a LayoutDeviceIntRegion. ++ */ ++class ViewRegion { ++public: ++ ~ViewRegion(); ++ ++ mozilla::LayoutDeviceIntRegion Region() { return mRegion; } ++ ++ /** ++ * Update the region. ++ * @param aRegion The new region. ++ * @param aCoordinateConverter The nsChildView to use for converting ++ * LayoutDeviceIntRect device pixel coordinates into Cocoa NSRect coordinates. ++ * @param aContainerView The view that's going to be the superview of the ++ * NSViews which will be created for this region. ++ * @param aViewCreationCallback A block that instantiates new NSViews. ++ * @return Whether or not the region changed. ++ */ ++ bool UpdateRegion(const mozilla::LayoutDeviceIntRegion& aRegion, ++ const nsChildView& aCoordinateConverter, ++ NSView* aContainerView, ++ NSView* (^aViewCreationCallback)()); ++ ++ /** ++ * Return an NSView from the region, if there is any. ++ */ ++ NSView* GetAnyView() { return mViews.Length() > 0 ? mViews[0] : nil; } ++ ++private: ++ mozilla::LayoutDeviceIntRegion mRegion; ++ nsTArray<NSView*> mViews; ++}; ++ ++} // namespace mozilla ++ ++#endif // ViewRegion_h +diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm +new file mode 100644 +index 0000000..3459849 +--- /dev/null ++++ b/widget/cocoa/ViewRegion.mm +@@ -0,0 +1,70 @@ ++/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* vim: set ts=8 sts=2 et sw=2 tw=80: */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this file, ++ * You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "ViewRegion.h" ++#import <Cocoa/Cocoa.h> ++ ++using namespace mozilla; ++ ++ViewRegion::~ViewRegion() ++{ ++ for (size_t i = 0; i < mViews.Length(); i++) { ++ [mViews[i] removeFromSuperview]; ++ } ++} ++ ++bool ++ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, ++ const nsChildView& aCoordinateConverter, ++ NSView* aContainerView, ++ NSView* (^aViewCreationCallback)()) ++{ ++ if (mRegion == aRegion) { ++ return false; ++ } ++ ++ // We need to construct the required region using as many EffectViews ++ // as necessary. We try to update the geometry of existing views if ++ // possible, or create new ones or remove old ones if the number of ++ // rects in the region has changed. ++ ++ nsTArray<NSView*> viewsToRecycle; ++ mViews.SwapElements(viewsToRecycle); ++ // The mViews array is now empty. ++ ++ LayoutDeviceIntRegion::RectIterator iter(aRegion); ++ const LayoutDeviceIntRect* iterRect = nullptr; ++ for (size_t i = 0; (iterRect = iter.Next()) || i < viewsToRecycle.Length(); ++i) { ++ if (iterRect) { ++ NSView* view = nil; ++ NSRect rect = aCoordinateConverter.DevPixelsToCocoaPoints(*iterRect); ++ if (i < viewsToRecycle.Length()) { ++ view = viewsToRecycle[i]; ++ } else { ++ view = aViewCreationCallback(); ++ [aContainerView addSubview:view]; ++ ++ // Now that the view is in the view hierarchy, it'll be kept alive by ++ // its superview, so we can drop our reference. ++ [view release]; ++ } ++ if (!NSEqualRects(rect, [view frame])) { ++ [view setFrame:rect]; ++ } ++ [view setNeedsDisplay:YES]; ++ mViews.AppendElement(view); ++ iter.Next(); ++ } else { ++ // Our new region is made of fewer rects than the old region, so we can ++ // remove this view. We only have a weak reference to it, so removing it ++ // from the view hierarchy will release it. ++ [viewsToRecycle[i] removeFromSuperview]; ++ } ++ } ++ ++ mRegion = aRegion; ++ return true; ++} +diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build +index aa8bfac..21b9369 100644 +--- a/widget/cocoa/moz.build ++++ b/widget/cocoa/moz.build +@@ -58,6 +58,7 @@ UNIFIED_SOURCES += [ + 'SwipeTracker.mm', + 'TextInputHandler.mm', + 'VibrancyManager.mm', ++ 'ViewRegion.mm', + 'WidgetTraceEvent.mm', + ] + +diff --git a/widget/cocoa/nsScreenCocoa.mm b/widget/cocoa/nsScreenCocoa.mm +index 1b72bbf..bd3eef3 100644 +--- a/widget/cocoa/nsScreenCocoa.mm ++++ b/widget/cocoa/nsScreenCocoa.mm +@@ -44,7 +44,7 @@ nsScreenCocoa::GetRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t + { + NSRect frame = [mScreen frame]; + +- LayoutDeviceIntRect r = ++ mozilla::LayoutDeviceIntRect r = + nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor()); + + *outX = r.x; +@@ -60,7 +60,7 @@ nsScreenCocoa::GetAvailRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int + { + NSRect frame = [mScreen visibleFrame]; + +- LayoutDeviceIntRect r = ++ mozilla::LayoutDeviceIntRect r = + nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor()); + + *outX = r.x; +-- +2.10.0 + diff --git a/projects/instantbird/0002-Bug-1070710-Use-ViewRegion-for-vibrant-areas-in-Vibr.mozpatch b/projects/instantbird/0002-Bug-1070710-Use-ViewRegion-for-vibrant-areas-in-Vibr.mozpatch new file mode 100644 index 0000000..c54ae43 --- /dev/null +++ b/projects/instantbird/0002-Bug-1070710-Use-ViewRegion-for-vibrant-areas-in-Vibr.mozpatch @@ -0,0 +1,180 @@ +From 6222ca8ecd339b8fa7ffb1987558ee23970bf071 Mon Sep 17 00:00:00 2001 +From: Markus Stange <mstange(a)themasta.com> +Date: Mon, 11 Jul 2016 14:47:05 -0400 +Subject: [PATCH 2/3] Bug 1070710 - Use ViewRegion for vibrant areas in + VibrancyManager. r=spohl + +MozReview-Commit-ID: 5qVo59SV7QG + +--HG-- +extra : histedit_source : 12980052172b2a858a52978fdd98dea28a9ea854 +--- + widget/cocoa/VibrancyManager.h | 14 +++------ + widget/cocoa/VibrancyManager.mm | 70 +++++++++-------------------------------- + 2 files changed, 18 insertions(+), 66 deletions(-) + +diff --git a/widget/cocoa/VibrancyManager.h b/widget/cocoa/VibrancyManager.h +index 464a106..737fdc2 100644 +--- a/widget/cocoa/VibrancyManager.h ++++ b/widget/cocoa/VibrancyManager.h +@@ -11,6 +11,7 @@ + #include "nsClassHashtable.h" + #include "nsRegion.h" + #include "nsTArray.h" ++#include "ViewRegion.h" + + #import <Foundation/NSGeometry.h> + +@@ -100,20 +101,13 @@ public: + */ + static bool SystemSupportsVibrancy(); + +- // The following are only public because otherwise ClearVibrantRegionFunc +- // can't see them. +- struct VibrantRegion { +- LayoutDeviceIntRegion region; +- nsTArray<NSView*> effectViews; +- }; +- void ClearVibrantRegion(const VibrantRegion& aVibrantRegion) const; +- + protected: +- NSView* CreateEffectView(VibrancyType aType, NSRect aRect); ++ void ClearVibrantRegion(const LayoutDeviceIntRegion& aVibrantRegion) const; ++ NSView* CreateEffectView(VibrancyType aType); + + const nsChildView& mCoordinateConverter; + NSView* mContainerView; +- nsClassHashtable<nsUint32HashKey, VibrantRegion> mVibrantRegions; ++ nsClassHashtable<nsUint32HashKey, ViewRegion> mVibrantRegions; + }; + + } // namespace mozilla +diff --git a/widget/cocoa/VibrancyManager.mm b/widget/cocoa/VibrancyManager.mm +index 26f9670..f12cac6 100644 +--- a/widget/cocoa/VibrancyManager.mm ++++ b/widget/cocoa/VibrancyManager.mm +@@ -15,63 +15,25 @@ VibrancyManager::UpdateVibrantRegion(VibrancyType aType, + const LayoutDeviceIntRegion& aRegion) + { + auto& vr = *mVibrantRegions.LookupOrAdd(uint32_t(aType)); +- if (vr.region == aRegion) { +- return; +- } +- +- // We need to construct the required region using as many EffectViews +- // as necessary. We try to update the geometry of existing views if +- // possible, or create new ones or remove old ones if the number of +- // rects in the region has changed. +- +- nsTArray<NSView*> viewsToRecycle; +- vr.effectViews.SwapElements(viewsToRecycle); +- // vr.effectViews is now empty. +- +- LayoutDeviceIntRegion::RectIterator iter(aRegion); +- const LayoutDeviceIntRect* iterRect = nullptr; +- for (size_t i = 0; (iterRect = iter.Next()) || i < viewsToRecycle.Length(); ++i) { +- if (iterRect) { +- NSView* view = nil; +- NSRect rect = mCoordinateConverter.DevPixelsToCocoaPoints(*iterRect); +- if (i < viewsToRecycle.Length()) { +- view = viewsToRecycle[i]; +- [view setFrame:rect]; +- [view setNeedsDisplay:YES]; +- } else { +- view = CreateEffectView(aType, rect); +- [mContainerView addSubview:view]; +- +- // Now that the view is in the view hierarchy, it'll be kept alive by +- // its superview, so we can drop our reference. +- [view release]; +- } +- vr.effectViews.AppendElement(view); +- } else { +- // Our new region is made of less rects than the old region, so we can +- // remove this view. We only have a weak reference to it, so removing it +- // from the view hierarchy will release it. +- [viewsToRecycle[i] removeFromSuperview]; +- } +- } +- +- vr.region = aRegion; ++ vr.UpdateRegion(aRegion, mCoordinateConverter, mContainerView, ^() { ++ return this->CreateEffectView(aType); ++ }); + } + + void + VibrancyManager::ClearVibrantAreas() const + { + for (auto iter = mVibrantRegions.ConstIter(); !iter.Done(); iter.Next()) { +- ClearVibrantRegion(*iter.UserData()); ++ ClearVibrantRegion(iter.UserData()->Region()); + } + } + + void +-VibrancyManager::ClearVibrantRegion(const VibrantRegion& aVibrantRegion) const ++VibrancyManager::ClearVibrantRegion(const LayoutDeviceIntRegion& aVibrantRegion) const + { + [[NSColor clearColor] set]; + +- LayoutDeviceIntRegion::RectIterator iter(aVibrantRegion.region); ++ LayoutDeviceIntRegion::RectIterator iter(aVibrantRegion); + while (const LayoutDeviceIntRect* rect = iter.Next()) { + NSRectFill(mCoordinateConverter.DevPixelsToCocoaPoints(*rect)); + } +@@ -97,15 +59,13 @@ AdjustedColor(NSColor* aFillColor, VibrancyType aType) + NSColor* + VibrancyManager::VibrancyFillColorForType(VibrancyType aType) + { +- const nsTArray<NSView*>& views = +- mVibrantRegions.LookupOrAdd(uint32_t(aType))->effectViews; ++ NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView(); + +- if (!views.IsEmpty() && +- [views[0] respondsToSelector:@selector(_currentFillColor)]) { ++ if (view && [view respondsToSelector:@selector(_currentFillColor)]) { + // -[NSVisualEffectView _currentFillColor] is the color that our view + // would draw during its drawRect implementation, if we hadn't + // disabled that. +- return AdjustedColor([views[0] _currentFillColor], aType); ++ return AdjustedColor([view _currentFillColor], aType); + } + return [NSColor whiteColor]; + } +@@ -117,12 +77,10 @@ VibrancyManager::VibrancyFillColorForType(VibrancyType aType) + NSColor* + VibrancyManager::VibrancyFontSmoothingBackgroundColorForType(VibrancyType aType) + { +- const nsTArray<NSView*>& views = +- mVibrantRegions.LookupOrAdd(uint32_t(aType))->effectViews; ++ NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView(); + +- if (!views.IsEmpty() && +- [views[0] respondsToSelector:@selector(fontSmoothingBackgroundColor)]) { +- return [views[0] fontSmoothingBackgroundColor]; ++ if (view && [view respondsToSelector:@selector(fontSmoothingBackgroundColor)]) { ++ return [view fontSmoothingBackgroundColor]; + } + return [NSColor clearColor]; + } +@@ -250,14 +208,14 @@ enum { + @end + + NSView* +-VibrancyManager::CreateEffectView(VibrancyType aType, NSRect aRect) ++VibrancyManager::CreateEffectView(VibrancyType aType) + { + static Class EffectViewClassWithoutForegroundVibrancy = CreateEffectViewClass(NO); + static Class EffectViewClassWithForegroundVibrancy = CreateEffectViewClass(YES); + + Class EffectViewClass = HasVibrantForeground(aType) + ? EffectViewClassWithForegroundVibrancy : EffectViewClassWithoutForegroundVibrancy; +- NSView* effectView = [[EffectViewClass alloc] initWithFrame:aRect]; ++ NSView* effectView = [[EffectViewClass alloc] initWithFrame:NSZeroRect]; + [effectView performSelector:@selector(setAppearance:) + withObject:AppearanceForVibrancyType(aType)]; + [effectView setState:VisualEffectStateForVibrancyType(aType)]; +-- +2.10.0 + diff --git a/projects/instantbird/0003-Bug-1070710-Use-ViewRegion-for-window-dragging.-r-sp.mozpatch b/projects/instantbird/0003-Bug-1070710-Use-ViewRegion-for-window-dragging.-r-sp.mozpatch new file mode 100644 index 0000000..94a92fd --- /dev/null +++ b/projects/instantbird/0003-Bug-1070710-Use-ViewRegion-for-window-dragging.-r-sp.mozpatch @@ -0,0 +1,199 @@ +From d378445257ad07190569b98bc1ad3ee93729cc38 Mon Sep 17 00:00:00 2001 +From: Markus Stange <mstange(a)themasta.com> +Date: Mon, 11 Jul 2016 16:15:07 -0400 +Subject: [PATCH 3/3] Bug 1070710 - Use ViewRegion for window dragging. r=spohl + +MozReview-Commit-ID: 5x2XHl20P6a + +--HG-- +extra : histedit_source : 56b671bffe9e6cd497ade61ff9beed2e3bf98e14 +--- + widget/cocoa/nsChildView.h | 5 +- + widget/cocoa/nsChildView.mm | 117 ++++++++++++++------------------------------ + 2 files changed, 40 insertions(+), 82 deletions(-) + +diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h +index 8f07c70..e7bd6b0 100644 +--- a/widget/cocoa/nsChildView.h ++++ b/widget/cocoa/nsChildView.h +@@ -28,6 +28,7 @@ + + #include "nsString.h" + #include "nsIDragService.h" ++#include "ViewRegion.h" + + #import <Carbon/Carbon.h> + #import <Cocoa/Cocoa.h> +@@ -493,7 +494,7 @@ public: + virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) override; + + virtual void UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) override; +- const LayoutDeviceIntRegion& GetDraggableRegion() { return mDraggableRegion; } ++ LayoutDeviceIntRegion GetNonDraggableRegion() { return mNonDraggableRegion.Region(); } + + virtual void ReportSwipeStarted(uint64_t aInputBlockId, bool aStartSwipe) override; + +@@ -659,7 +660,7 @@ protected: + // uploaded to to mTitlebarImage. Main thread only. + nsIntRegion mDirtyTitlebarRegion; + +- LayoutDeviceIntRegion mDraggableRegion; ++ mozilla::ViewRegion mNonDraggableRegion; + + // Cached value of [mView backingScaleFactor], to avoid sending two obj-c + // messages (respondsToSelector, backingScaleFactor) every time we need to +diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm +index 8dbeacc..1415664 100644 +--- a/widget/cocoa/nsChildView.mm ++++ b/widget/cocoa/nsChildView.mm +@@ -2720,12 +2720,41 @@ nsChildView::DoRemoteComposition(const LayoutDeviceIntRect& aRenderRect) + [(ChildView*)mView postRender:mGLPresenter->GetNSOpenGLContext()]; + } + ++@interface NonDraggableView : NSView ++@end ++ ++@implementation NonDraggableView ++- (BOOL)mouseDownCanMoveWindow { return NO; } ++- (NSView*)hitTest:(NSPoint)aPoint { return nil; } ++@end ++ + void + nsChildView::UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) + { +- if (mDraggableRegion != aRegion) { +- mDraggableRegion = aRegion; +- [(ChildView*)mView updateWindowDraggableState]; ++ // mView returns YES from mouseDownCanMoveWindow, so we need to put NSViews ++ // that return NO from mouseDownCanMoveWindow in the places that shouldn't ++ // be draggable. We can't do it the other way round because returning ++ // YES from mouseDownCanMoveWindow doesn't have any effect if there's a ++ // superview that returns NO. ++ LayoutDeviceIntRegion nonDraggable; ++ nonDraggable.Sub(LayoutDeviceIntRect(0, 0, mBounds.width, mBounds.height), aRegion); ++ ++ __block bool changed = false; ++ ++ // Suppress calls to setNeedsDisplay during NSView geometry changes. ++ ManipulateViewWithoutNeedingDisplay(mView, ^() { ++ changed = mNonDraggableRegion.UpdateRegion(nonDraggable, *this, mView, ^() { ++ return [[NonDraggableView alloc] initWithFrame:NSZeroRect]; ++ }); ++ }); ++ ++ if (changed) { ++ // Trigger an update to the window server. This will call ++ // mouseDownCanMoveWindow. ++ // Doing this manually is only necessary because we're suppressing ++ // setNeedsDisplay calls above. ++ [[mView window] setMovableByWindowBackground:NO]; ++ [[mView window] setMovableByWindowBackground:YES]; + } + } + +@@ -3566,8 +3595,10 @@ NSEvent* gLastDragMouseDownEvent = nil; + + - (BOOL)mouseDownCanMoveWindow + { +- // Return YES so that _regionForOpaqueDescendants gets called, where the +- // actual draggable region will be assembled. ++ // Return YES so that parts of this view can be draggable. The non-draggable ++ // parts will be covered by NSViews that return NO from ++ // mouseDownCanMoveWindow and thus override draggability from the inside. ++ // These views are assembled in nsChildView::UpdateWindowDraggingRegion. + return YES; + } + +@@ -4572,7 +4603,7 @@ NSEvent* gLastDragMouseDownEvent = nil; + CGFloat locationInTitlebar = [[self window] frame].size.height - [theEvent locationInWindow].y; + LayoutDeviceIntPoint pos = geckoEvent.refPoint; + if (!defaultPrevented && [theEvent clickCount] == 2 && +- mGeckoChild->GetDraggableRegion().Contains(pos.x, pos.y) && ++ !mGeckoChild->GetNonDraggableRegion().Contains(pos.x, pos.y) && + [[self window] isKindOfClass:[ToolbarWindow class]] && + (locationInTitlebar < [(ToolbarWindow*)[self window] titlebarHeight] || + locationInTitlebar < [(ToolbarWindow*)[self window] unifiedToolbarHeight])) { +@@ -4607,80 +4638,6 @@ NSEvent* gLastDragMouseDownEvent = nil; + mGeckoChild->DispatchEvent(&event, status); + } + +-- (void)updateWindowDraggableState +-{ +- // Trigger update to the window server. +- [[self window] setMovableByWindowBackground:NO]; +- [[self window] setMovableByWindowBackground:YES]; +-} +- +-// aRect is in view coordinates relative to this NSView. +-- (CGRect)convertToFlippedWindowCoordinates:(NSRect)aRect +-{ +- // First, convert the rect to regular window coordinates... +- NSRect inWindowCoords = [self convertRect:aRect toView:nil]; +- // ... and then flip it again because window coordinates have their origin +- // in the bottom left corner, and we need it to be in the top left corner. +- inWindowCoords.origin.y = [[self window] frame].size.height - NSMaxY(inWindowCoords); +- return NSRectToCGRect(inWindowCoords); +-} +- +-static CGSRegionObj +-NewCGSRegionFromRegion(const LayoutDeviceIntRegion& aRegion, +- CGRect (^aRectConverter)(const LayoutDeviceIntRect&)) +-{ +- nsTArray<CGRect> rects; +- LayoutDeviceIntRegion::RectIterator iter(aRegion); +- for (;;) { +- const LayoutDeviceIntRect* r = iter.Next(); +- if (!r) { +- break; +- } +- rects.AppendElement(aRectConverter(*r)); +- } +- +- CGSRegionObj region; +- CGSNewRegionWithRectList(rects.Elements(), rects.Length(), &region); +- return region; +-} +- +-// This function is called with forMove:YES to calculate the draggable region +-// of the window which will be submitted to the window server. Window dragging +-// is handled on the window server without calling back into our process, so it +-// also works while our app is unresponsive. +-- (CGSRegionObj)_regionForOpaqueDescendants:(NSRect)aRect forMove:(BOOL)aForMove +-{ +- if (!aForMove || !mGeckoChild) { +- return [super _regionForOpaqueDescendants:aRect forMove:aForMove]; +- } +- +- LayoutDeviceIntRect boundingRect = mGeckoChild->CocoaPointsToDevPixels(aRect); +- +- LayoutDeviceIntRegion opaqueRegion; +- opaqueRegion.Sub(boundingRect, mGeckoChild->GetDraggableRegion()); +- +- return NewCGSRegionFromRegion(opaqueRegion, ^(const LayoutDeviceIntRect& r) { +- return [self convertToFlippedWindowCoordinates:mGeckoChild->DevPixelsToCocoaPoints(r)]; +- }); +-} +- +-// Starting with 10.10, in addition to the traditional +-// -[NSView _regionForOpaqueDescendants:forMove:] method, there's a new form with +-// an additional forUnderTitlebar argument, which is sometimes called instead of +-// the old form. We need to override the new variant as well. +-- (CGSRegionObj)_regionForOpaqueDescendants:(NSRect)aRect +- forMove:(BOOL)aForMove +- forUnderTitlebar:(BOOL)aForUnderTitlebar +-{ +- if (!aForMove || !mGeckoChild) { +- return [super _regionForOpaqueDescendants:aRect +- forMove:aForMove +- forUnderTitlebar:aForUnderTitlebar]; +- } +- +- return [self _regionForOpaqueDescendants:aRect forMove:aForMove]; +-} +- + - (void)handleMouseMoved:(NSEvent*)theEvent + { + NS_OBJC_BEGIN_TRY_ABORT_BLOCK; +-- +2.10.0 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 32cc28c..19aaba6 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -142,6 +142,9 @@ input_files: - filename: Update-load-local-changes-bug-16940-second.mozpatch - filename: Updater-Linux-search-path-bug-18900.mozpatch - filename: aboutTBUpdateLogo.png + - filename: 0001-Bug-1070710-Add-mozilla-ViewRegion-which-assembles-a.mozpatch + - filename: 0002-Bug-1070710-Use-ViewRegion-for-vibrant-areas-in-Vibr.mozpatch + - filename: 0003-Bug-1070710-Use-ViewRegion-for-window-dragging.-r-sp.mozpatch - filename: trac-16475.mozpatch - filename: updater-remove-links.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch [View Less]

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit 7b2796974ea0f0bded9a1c1e6806bc8439fb15cb Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 05:16:49 2016 +0000 Update translations for tor-and-https_completed --- vi.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vi.po b/vi.po index 9d08bcb..f997dc4 100644 --- a/vi.po +++ b/vi.po @@ -1,15 +1,15 @@ # # Translators: # Anh Phan <vietnamesel10n(a)gmail.com>, 2014 -# Khanh Nguyen <nguyenduykhanh85(a)… [View More]

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit bfcb09b7c26d97f39fd7fb5bd9c9c78b965522a3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 05:16:45 2016 +0000 Update translations for tor-and-https --- vi.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vi.po b/vi.po index 9d08bcb..f997dc4 100644 --- a/vi.po +++ b/vi.po @@ -1,15 +1,15 @@ # # Translators: # Anh Phan <vietnamesel10n(a)gmail.com>, 2014 -# Khanh Nguyen <nguyenduykhanh85(a)gmail.com>, … [View More]

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit e6818728e82ffa46641460344bf0f8332757ca38 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 04:47:34 2016 +0000 Update translations for tor-messenger-conversationsproperties_completed --- vi/conversations.properties | 80 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/vi/conversations.properties b/vi/conversations.properties new file mode 100644 index 0000000..106f244 --- /dev/null +++ b/vi/… [View More]conversations.properties @@ -0,0 +1,80 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (targetChanged): +# %1$S is the new conversation title (display name of the new target), +# %2$S is the protocol name used for the new target. +targetChanged=Đoạn hội thoại sẽ tiếp tục với %1$S, sử dụng %2$S. + +# LOCALIZATION NOTE (statusChanged): +# %1$S is the display name of the contact. +# %2$S is the new status type (a value from status.properties). +statusChanged=%1$S bây giờ là %2$S. +# LOCALIZATION NOTE (statusChangedWithStatusText): +# %1$S is the display name of the contact. +# %2$S is the new status type (a value from status.properties). +# %3$S is the status text (eg. "I'm currently away from the computer"). +statusChangedWithStatusText=%1$S bây giờ là %2$S: %3$S. +# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]): +# special case of the previous 2 strings for when the status was +# previously unknown. These 2 strings should not mislead the user +# into thinking the person's status has just changed. +statusChangedFromUnknown=%1$S là %2$S. +statusChangedFromUnknownWithStatusText=%1$S là %2$S: %3$S. +# LOCALIZATION NOTE (statusKnown[WithStatusText]): +# special case of the previous 2 strings for when an account has just +# been reconnected, so the status is now known. These 2 strings should not +# mislead the user into thinking the person's status has just changed. +statusKnown=Tài khoản của bạn đã được kết nối lại (%1$S là %2$S). +statusKnownWithStatusText=Tài khoản của bạn đã được kết nối lại (%1$S là %2$S: %3$S). +# LOCALIZATION NOTE (statusUnknown): +# %S is the display name of the contact. +statusUnknown=Tài khoản của bạn bị ngắt kết nối (tình trạng của %S không còn được biết đến). + +accountDisconnected=Tài khoản của bạn bị ngắt kết nối. +accountReconnected=Tài khoản của bạn đã bị ngắt kết nối. + +# LOCALIZATION NOTE (autoReply): +# %S is replaced by the text of a message that was sent as an automatic reply. +autoReply=Tự động trả lời - %S + +# LOCALIZATION NOTE (noTopic): +# Displayed instead of the topic when no topic is set. +noTopic=Không có thông điệp chủ đề của phòng này. + +# LOCALIZATION NOTE (topicSet): +# %1$S is the conversation name, %2$S is the topic. +topicSet=Chủ đề cho %1$S là: %2$S. +# LOCALIZATION NOTE (topicNotSet): +# %S is the conversation name. +topicNotSet=Không có chủ đề cho %S. +# LOCALIZATION NOTE (topicChanged): +# %1$S is the user who changed the topic, %2$S is the new topic. +topicChanged=%1$S đã đổi chủ đề thành: %2$S. +# LOCALIZATION NOTE (topicCleared): +# %1$S is the user who cleared the topic. +topicCleared=%1$S đã xóa chủ đề %2$S. + +# LOCALIZATION NOTE (nickSet): +# This is displayed as a system message when a participant changes his/her +# nickname in a conversation. +# %1$S is the old nick. +# %2$S is the new nick. +nickSet=%1$S giờ được biết đến như là %2$S. +# LOCALIZATION NOTE (nickSet.you): +# This is displayed as a system message when your nickname is changed. +# %S is your new nick. +nickSet.you=Giờ bạn được biết đến như là %S. + +# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): +# ellipsis is used when copying a part of a message to show that the message was cut +messenger.conversations.selections.ellipsis=[...] + +# LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate): +# These 3 templates are used to format selected messages before copying them. +# Do not translate the texts between % characters, but feel free to adjust +# whitespace and separators to make them fit your locale. +messenger.conversations.selections.systemMessagesTemplate=%time% - %message% +messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: %message% +messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% %message% [View Less]

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit c25316476b12ef9eefb9ccd0d676f00f6004e414 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 04:47:31 2016 +0000 Update translations for tor-messenger-conversationsproperties --- vi/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vi/conversations.properties b/vi/conversations.properties index ceae6b1..106f244 100644 --- a/vi/conversations.properties +++ b/vi/conversations.properties @@ -61,11 +61,11 @… [View More]

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit 54ebbf35ff6ab25c65f9e7b7a3ec54819a14011c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 04:47:03 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- vi/abouttor.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/vi/abouttor.properties b/vi/abouttor.properties new file mode 100644 index 0000000..b8a93ad --- /dev/null +++ b/vi/abouttor.properties @@ -0,0 +1,21 @@ +# Copyright (c) 2014, … [View More]

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit a80383d22b36cf4074f05d4f69eaad45c9444d94 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 04:46:59 2016 +0000 Update translations for torbutton-abouttorproperties --- vi/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vi/abouttor.properties b/vi/abouttor.properties index d607324..b8a93ad 100644 --- a/vi/abouttor.properties +++ b/vi/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing … [View More]

1 0

[tor-commits] [translation/tor-messenger-loggerproperties_completed] Update translations for tor-messenger-loggerproperties_completed
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit d7871c1d49cc5a73654be23e1a21691b708042b1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 04:18:43 2016 +0000 Update translations for tor-messenger-loggerproperties_completed --- vi/logger.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vi/logger.properties b/vi/logger.properties new file mode 100644 index 0000000..7b4c59d --- /dev/null +++ b/vi/logger.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the … [View More]

1 0

[translation/tor-messenger-loggerproperties] Update translations for tor-messenger-loggerproperties
by translation＠torproject.org 01 Oct '16

01 Oct '16

commit cb76253ef30c60f268a91c0dae236f7fe900e77b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 1 04:18:39 2016 +0000 Update translations for tor-messenger-loggerproperties --- vi/logger.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/logger.properties b/vi/logger.properties index 2228c50..7b4c59d 100644 --- a/vi/logger.properties +++ b/vi/logger.properties @@ -4,4 +4,4 @@ # LOCALIZATION NOTE (badLogfile): # %S is … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2016