Commit Graph

19464 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
6d5ed63674 merge mozilla-inbound to mozilla-central a=merge 2016-01-19 12:00:45 +01:00
Xidorn Quan
6c3888d288 Bug 844948 - Allow changing padding of themed button on OS X. r=mstange,heycam 2016-01-19 16:48:04 +11:00
Sotaro Ikeda
4f26117e33 Bug 1049296 - Handle Sideband stream compositing in HwcComposer2D r=mwu,nical 2016-01-18 20:52:32 -08:00
Carsten "Tomcat" Book
0886f9ef68 Merge mozilla-central to fx-team 2016-01-18 14:24:37 +01:00
Masayuki Nakano
8b05c85ea0 Bug 1237216 TSFTextStore should forget redundant pending composition events for Korean TIPs r=emk 2016-01-18 16:29:02 +09:00
Sebastian Kaspari
27711ce457 Bug 1227603 - Add support for sub-distributions based on MCC/MNC (SIM). r=margaret,mfinkle
We will now search for distributions in the following folders:

 * 1) Data distributions (APK or OTA):
   * 1.1) <dataDir>/distribution/<mcc>/<mnc> - For bundled distributions for specific network providers
   * 1.2) <dataDir>/distribution/<mcc>       - For bundled distributions for specific countries
   * 1.3) <dataDir>/distribution/default     - For bundled distributions with no matching mcc/mnc
   * 1.4) <dataDir>/distribution             - Default non-bundled distribution

 * 2) System distributions:
   * 2.1) /system/<package>/distribution/<mcc>/<mnc> - For bundled distributions for specific network providers
   * 2.2) /system/<package>/distribution/<mcc>       - For bundled distributions for specific countries
   * 2.3) /system/<package>/distribution/default     - For bundled distributions with no matching mcc/mnc
   * 2.4) /system/<package>/distribution             - Default non-bundled system distribution

--HG--
extra : commitid : BQteGpZX27n
extra : rebase_source : 34d4d468377a9b7487b734fdbb3a8a741828167f
extra : amend_source : b93804da7e3e97c46a3dd7a95da1c3b65e2a29d4
2016-01-15 10:11:34 +01:00
Xidorn Quan
5917f00a73 Backed out changeset e8ad04f3a65f (bug 844948) for reftest failure on OS X 2016-01-18 17:21:12 +11:00
Xidorn Quan
f120c8eeda Bug 844948 - Allow changing padding of themed button on OS X. r=mstange,heycam 2016-01-18 14:20:11 +11:00
Masayuki Nakano
f52b4c55e1 Bug 1237582 Don't retry to call TSFTextStore::NotifyTSFOfLayoutChangeAgain() when TSFTextStore::NotifyTSFOfLayoutChange() is called from it and newly TSFTextStore returns TS_E_NOLAYOUT error during the call r=m_kato 2016-01-17 12:02:01 +09:00
Jonathan Kew
e6a4fbc47c Bug 1239855 - Fix for widget positioning/sizing on hidpi displays under Gtk. r=emk 2016-01-18 12:24:06 +00:00
Jonathan Kew
7c5888a083 Bug 1240180 - Optimize native theme scaling for the single-monitor case. r=emk 2016-01-18 13:28:26 +00:00
Daniel Holbert
b5484bb7fc Bug 1240252: Add missing "mozilla::" namespace prefix before usage of type LayoutDeviceIntRegion, to fix local build bustage. r=njn 2016-01-15 22:54:20 -08:00
Jim Chen
11fce4fc7d Bug 1238761 - Autogenerate constants for MotionEvent; r=snorp
This patch autogenerates constants for MotionEvent to replace the manual
definitions in AndroidJavaWrappers.
2016-01-15 13:05:45 -05:00
Jim Chen
06c79783a7 Bug 1238761 - Remove obsolete APZ code; r=rbarker
With APZC supporting multiple nsWindows, this patch removes some
obsolete APZ code, including the previous implementation of
NativePanZoomController native methods in AndroidJNI.cpp, and the
various static members of nsWindow.
2016-01-15 13:05:45 -05:00
Jim Chen
fd05d10f32 Bug 1238761 - Rewrite AndroidContentController to work with multiple nsWindows; r=rbarker
This patch rewrites AndroidContentController to get rid of any
dependencies on a static nsWindow or APZC tree manager.
2016-01-15 13:05:45 -05:00
Jim Chen
4ae7f3043b Bug 1238761 - Attach NativePanZoomController through GLController; r=snorp
This patch adds a way to attach a particular NativePanZoomController
instance held by LayerView to a particular nsWindow instance. Because
LayerView already calls GLController.SetLayerClient during
initialization, this patch renames it to attachToJava and modifies it to
accept an additional NPZC parameter. In the new AttachToJava
implementation, we create or reuse a NPZCSupport object and associate it
with the NPZC instance.
2016-01-15 13:05:45 -05:00
Jim Chen
4f73924298 Bug 1238761 - Implement NativePanZoomController native methods; r=rbarker
This patch adds the NPZCSupport class to nsWindow and use it to
implement the NPZC native methods that were implemented in
AndroidJNI.cpp. For HandleMotionEvent, the code also includes a portion
from AndroidJavaWrapper::MakeMultitouchEvent.
2016-01-15 13:05:45 -05:00
Jim Chen
bd5c7ad120 Bug 1238761 - Add specializations of jni::Ref for primitive arrays; r=snorp
This patch adds specializations of jni::Ref for primitive arrays like
IntArray and FloatArray, so that the arrays can be accessed through the
GetElement, GetElements, and Length members.
2016-01-15 13:05:44 -05:00
Jim Chen
10166a711a Bug 1238761 - Switch NativePanZoomController to use native methods; r=rbarker
This patch turns NativePanZoomController's MotionEvent handler into a
native method, and it adds the WrapForJNI annotations to all native
methods so that bindings will be automatically generated for them.
2016-01-15 13:05:44 -05:00
Nicholas Nethercote
76dfc05b83 Bug 1239589 - Change nsBaseWidget::mBounds to a LayoutDeviceIntRect. r=kats.
This patch removes dozens of ToUnknown/FromUnknown conversions and doesn't add
any new ones, which is nice. It also removes UntypedDevPixelsToCocoaPoints(),
which is no longer needed.

--HG--
extra : rebase_source : 81288126b582402408518aecfc304bc128e05d15
2015-11-22 20:32:29 -08:00
Bas Schouten
cb06edf308 Bug 1239743: Do not allow windows to be resized to sizes above the maximum texture size. We don't know how to draw to these anyway. r=jimm
--HG--
extra : rebase_source : f1ad0237a72178fb1870bd23ae1aacd098ad995f
2016-01-14 21:17:13 +01:00
Carsten "Tomcat" Book
7e52b24fab merge mozilla-inbound to mozilla-central a=merge 2016-01-15 11:46:47 +01:00
Lee Salzman
466b5fb4c9 Bug 1239040 - Fix DrawTargetCairo/DrawTargetSkia LockBits and BorrowedXlibDrawable to work inside PushLayer. r=jrmuizel 2016-01-13 13:11:07 -05:00
Jim Chen
bd05e534d1 Bug 1238413 - Guard against drawing methods being called during compositor shutdown; r=snorp
When waiting for the compositor to shut down, it's possible for
nsWindow::DrawWindowunderlay and DrawWindowOverlay to be called. In that
case, the GL controller is already destroyed, and we should just bail.
2016-01-14 18:20:02 -05:00
Wes Kocher
136dd4b97a Backed out changeset 7bd651ae54dd (bug 1192945) to hopefully fix 1231429 a=ritu
--HG--
extra : commitid : 4yAGbFnOUrd
extra : source : 5c042dab34a257de85b7eaf2bc81aaad16b8a1b0
extra : intermediate-source : beff2f1d75224ad339a965e02f9193a9a4f43e79
2016-01-14 15:40:56 -08:00
Nicholas Nethercote
7892cfcede Bug 1239530 (part 2) - Use LayoutDevice coordinates in {Start,End}RemoteDrawingInRegion() and related functions. r=kats.
--HG--
extra : rebase_source : b5bd2d6822904a188242efa6e46aaed9f96a15b9
2015-12-02 22:29:54 -08:00
Nicholas Nethercote
868fc092d2 Bug 1239530 (part 1) - Remove PuppetWidget::Scroll(), which is dead. r=kats.
--HG--
extra : rebase_source : aaef0387855da0d7facdcbead16d51f3bdb2a47f
2016-01-13 00:28:36 -08:00
Jan de Mooij
a057dc3075 Bug 1237201 part 9 - Fix remaining issues. r=nfroyd
--HG--
extra : rebase_source : fcb2bebb2a30c813b577d6f0f753cd04c69db2c3
2016-01-14 22:12:13 +01:00
Ryan VanderMeulen
a152a34ff2 Bug 1239683 - Replace NS_UNCONSTRAINEDSIZE with NS_MAXSIZE in windows/nsWindow.cpp. r=mats 2016-01-14 14:46:29 -05:00
Ryan VanderMeulen
4d4279e120 Bug 1239683 - Add nsIFrame.h include to windows/nsWindow.cpp to fix --disable-accessibility bustage. r=jfkthame 2016-01-14 11:41:29 -05:00
Carsten "Tomcat" Book
2466aecfb9 merge mozilla-inbound to mozilla-central a=merge 2016-01-14 11:50:34 +01:00
Kit Cambridge
b88c662ff9 Bug 1219855, Part 3 - Fix variable shadowing in OSXNotificationCenter::ShowAlert. r=me
--HG--
extra : commitid : prNOLvJwOX
2016-01-13 23:26:41 -07:00
Sotaro Ikeda
e6486fd6be Bug 1237914 - Remove layers.screen-recording.enabled r=mwu 2016-01-13 20:45:57 -08:00
Sotaro Ikeda
41edebedd1 Bug 1238876 - Move StartRemoteDrawing() implementation from nsWindow to nsScreenGonk r=mwu 2016-01-13 20:37:56 -08:00
Wes Kocher
b69d9b88c5 Backed out changeset 15145a32cd19 (bug 1231042) for b2g reftest bustage. a=backout
--HG--
extra : source : f1ebaf0ca07195b30c8f6deec5e0131043fa17c2
2016-01-13 12:57:45 -08:00
Wes Kocher
e125261ad0 Backed out changeset 15145a32cd19 (bug 1231042) for b2g reftest bustage
--HG--
extra : commitid : Loy7lXlfDiR
2016-01-13 12:57:45 -08:00
Jim Chen
d07b0750ba Bug 1237932 - Fix crash when renewing EGL surface fails; r=snorp
We shouldn't crash when renewing an EGL surface fails, because the
compositor is able to handle it gracefully.
2016-01-13 14:35:27 -05:00
Jim Chen
85514b694a Bug 1237690 - Fix possible deadlock in nsAppShell::SyncRunEvent; r=snorp
In order to prevent the deadlock, we need to release sAppShellLock when
we start waiting in SyncRunEvent. However, we cannot simply unlock it
before the wait because that introduces an out-of-order unlocking wrt
mSyncRunMonitor, which can cause further deadlocks. So this patch
converts mSyncRunMoitor to a condvar and make it use sAppShellLock. That
then involves making aAppShellLock a Mutex instead of a StaticMutex. The
final result is having one lock (sAppShellLock), which supports any
other condvars that we have like mSyncRunFinished.
2016-01-13 14:35:27 -05:00
JerryShih
f691273efc Bug 1231042 - clean current composition task and related flag when screen off. r=hshih
--HG--
extra : rebase_source : c298845ec4d25b4398751b57d68ef653a93e3687
2016-01-12 23:15:00 +01:00
Carsten "Tomcat" Book
8bb4e16a15 Merge mozilla-central to mozilla-inbound 2016-01-13 11:58:27 +01:00
Carsten "Tomcat" Book
d833f9ba1a merge mozilla-inbound to mozilla-central a=merge 2016-01-13 11:57:15 +01:00
Masayuki Nakano
a8ff928f0d Bug 1238899 Create hidden native caret for ATOK at composing in windowless plugin r=m_kato 2016-01-13 12:44:39 +09:00
Jonathan Kew
2ff25b1f53 Bug 1239007 - Replace nsIntRect by strongly-typed rects in a couple of nsCocoaUtils functions. r=mstange 2016-01-13 07:32:55 +00:00
Kit Cambridge
7bf3de48ab Bug 1219855, Part 1 - Make nsXULAlerts implement nsIAlertsService. r=MattN,wchen
--HG--
extra : commitid : IXcGploxKLn
extra : rebase_source : b289323b92409c857a370e3a2fe44d772b0ebadb
2015-12-31 13:27:09 -07:00
Xidorn Quan
4bbc84cc04 Bug 1189622 part 3 - Return failure if fullscreen support is not available for the X11 desktop. r=karlt
--HG--
extra : source : 26b74750e3c4ff26bc8e467a7d2db6699864d319
extra : amend_source : beb5649f71ff14f68b2073a761159857242ce178
2016-01-12 15:18:47 +11:00
Xidorn Quan
42b9ed4bfc Bug 1189622 part 2 - Allow widget's MakeFullScreen to fail, and call FinishFullscreenChange directly if that happens. r=smaug
--HG--
extra : source : a851e10d72b71dbd7bab21e3e6ef80214f680b9b
2016-01-12 15:18:47 +11:00
Jonathan Kew
714e585ffa Bug 890156 - patch 9 - Adjustment to non-client margin at top of maximized window on secondary display. r=emk 2015-12-03 16:50:59 +00:00
Jonathan Kew
d178c6596d Bug 890156 - patch 5 - Make Windows native-theme code handle per-monitor DPI scaling when necessary. r=emk 2015-12-02 20:54:26 +00:00
Jonathan Kew
61bb2f1169 Bug 890156 - patch 4 - Update widget/windows code for per-monitor DPI support. r=emk 2015-12-04 16:59:14 +00:00
Jonathan Kew
925e9cfb7f Bug 890156 - patch 3 - Remove gfxWindowsPlatform::GetDPIScale and replace it with methods in WinUtils, ready for per-monitor DPI support. r=emk 2015-12-02 15:09:29 +00:00