Wes Kocher
5045f11b6e
Merge b2ginbound to central, a=merge
2015-09-03 13:41:06 -07:00
Wes Kocher
1c4563772f
Merge inbound to central, a=merge
2015-09-03 12:20:40 -07:00
Wes Kocher
45f5ae8270
Backed out 2 changesets (bug 1035091)
...
a=backout
Backed out changeset 1fc07bdd9aa8 (bug 1035091)
Backed out changeset f6e98029d1cb (bug 1035091)
2015-09-03 11:41:39 -07:00
Kartikaya Gupta
0844247247
Bug 1197824 - Remove the mAllowDoubleTapZoom field from nsViewportInfo as it is not needed. r=botond
2015-09-03 10:30:41 -04:00
Kartikaya Gupta
e5382cb5a1
Bug 1197824 - Support the browser.ui.zoom.force-user-scalable pref in the gecko zoom-constraints codepath. r=botond
...
The browser.ui.zoom.force-user-scalable pref can be modified by the user from
the Fennec settings screen, and allows them zoom pages despite the meta-viewport
tag that might otherwise restrict zooming. This effectively ignores the effect
of the user-scalable, minimum-scale, and maximum-scale meta-viewport tokens.
2015-09-03 10:30:41 -04:00
Kartikaya Gupta
0a73904dd8
Bug 1197824 - Allow zooming in desktop mode. r=botond
...
This is a long-standing issue that has thus far never been exposed because
the values modified in this patch have not been used (desktop mode only exists
on Fennec, and Fennec does it's own computation for these values in browser.js).
However upcoming patches will change Fennec to use this, and so this issue needs
to be corrected.
2015-09-03 10:30:40 -04:00
Kartikaya Gupta
ab26d27635
Bug 1197824 - Remove unused state and normalize others. r=botond
...
In the case of DisplayWidthHeight viewports, setting the allowDoubleTapToZoom
flag to true is fine because the ZoomConstraintsClient code will flip it back
to false based on the width of the CSS viewport. Setting it to true in the
GetViewportInfo code allows us to maintain the invariant that the default value
of allowDoubleTapToZoom is the same as the initial value of allowZoom.
2015-09-03 10:30:40 -04:00
Carsten "Tomcat" Book
63e87a0c89
Merge mozilla-central to b2g-inbound
2015-09-03 14:19:00 +02:00
Kan-Ru Chen
8a19a6b884
Bug 1170894 - Implement nsIFrameLoader::SwitchProcessAndLoadURI. r=smaug
2015-09-03 13:21:21 +08:00
Karl Tomlinson
c53cf6f454
back out 0b4230b29db5,c8d987aeaece from bug 1197028
2015-09-02 23:44:37 +12:00
Karl Tomlinson
1927dc5ad7
bug 1193922 skip SetIsOnlyNodeForContext after shutdown r=padenot
...
This works around bug 1200514 but also avoids some unnecessary work.
2015-09-01 18:20:24 +12:00
Phil Ringnalda
b6b1f1cc7f
Back out 71886d218c12 (bug 1200864) for Win8 mochitest-gl failures
...
CLOSED TREE
2015-09-02 20:35:45 -07:00
Ehsan Akhgari
bb2a119395
Bug 1200869 - Empty the header value for code hygiene; r=sicking
2015-09-02 19:53:35 -04:00
Ehsan Akhgari
fef46400c2
Bug 1200856 - Avoid the extra variable to make the string manipulation faster; r=sicking
2015-09-02 19:52:46 -04:00
Jeff Gilbert
433dc416ec
Bug 1200864 - Skip DrawElements buffer validation when we have robust_buffer_access. - r=kamidphish
2015-09-02 14:06:58 -07:00
Geoff Brown
c0638aeb81
Bug 1201075 - Increase timeout for webgl-color-test; r=jgilbert
2015-09-02 14:20:02 -06:00
Zack Weinberg
858895bdd4
Bug 1035091 part 2: disable @-moz-document in author sheets. r=heycam
2015-09-02 13:54:30 -04:00
Zack Weinberg
d89a3bcc67
Bug 1035091 part 1: change CSS parser and loader APIs to distinguish UA, user, and author sheets instead of just UA vs everyone else. r=heycam
2015-09-02 13:52:49 -04:00
Ryan VanderMeulen
4e72d9e276
Merge m-c to inbound. a=merge
2015-09-02 14:55:29 -04:00
Ryan VanderMeulen
c502739d20
Merge inbound to m-c. a=merge
2015-09-02 14:53:48 -04:00
Gian-Carlo Pascutto
95f412e884
Bug 1200614 - Protect the capture engines array from concurrent access (during shutdown). r=jesup
2015-09-02 18:41:06 +02:00
Carsten "Tomcat" Book
fd700feece
Merge mozilla-central to b2g-inbound
2015-09-02 14:57:45 +02:00
Carsten "Tomcat" Book
81935f3431
merge mozilla-inbound to mozilla-central a=merge
2015-09-02 13:53:06 +02:00
Nils Ohlmeier [:drno]
e4ebc26da2
Bug 1200823 - s/test.steeplechase/test.testOptions.steeplechase/. r=bwc
2015-09-01 13:59:03 -07:00
Masayuki Nakano
775fe149e7
Bug 895274 part.85 Rename NS_DRAGDROP_GESTURE to eLegacyDragGesture r=smaug
2015-09-02 15:08:03 +09:00
Masayuki Nakano
d2e962e590
Bug 895274 part.84 Rename NS_DRAGDROP_DRAGDROP to eLegacyDragDrop r=smaug
2015-09-02 15:08:03 +09:00
Masayuki Nakano
cb4d528a54
Bug 895274 part.83 Rename NS_DRAGDROP_EXIT to eDragExit r=smaug
2015-09-02 15:08:02 +09:00
Masayuki Nakano
5761c87ab2
Bug 895274 part.82 Rename NS_DRAGDROP_ENTER to eDragEnter r=smaug
2015-09-02 15:08:02 +09:00
Masayuki Nakano
d443240a54
Bug 895274 part.81 Rename NS_DRAGDROP_OVER to eDragOver r=smaug
2015-09-02 15:08:02 +09:00
Masayuki Nakano
9953677905
Bug 895274 part.80 Rename NS_DRAGDROP_DRAG to eDrag r=smaug
2015-09-02 15:08:02 +09:00
Masayuki Nakano
9962de8d0d
Bug 895274 part.79 Rename NS_DRAGDROP_END to eDragEnd r=smaug
2015-09-02 15:08:02 +09:00
Masayuki Nakano
b0276f5a3b
Bug 895274 part.78 Rename NS_DRAGDROP_START to eDragStart r=smaug
2015-09-02 15:08:01 +09:00
Masayuki Nakano
05598ebcf2
Bug 895274 part.77 Rename NS_DRAGDROP_DROP to eDrop r=smaug
2015-09-02 15:08:01 +09:00
Masayuki Nakano
624f4f4f21
Bug 895274 part.76 Rename NS_DRAGDROP_LEAVE to eDragLeave r=smaug
2015-09-02 15:08:01 +09:00
Masayuki Nakano
bb12ca8bc7
Bug 895274 part.75 Rename NS_DRAGDROP_EVENT_START to eDragDropEventFirst, define eDragDropEventLast and correct the type and name of event message in DataTransfer r=smaug
2015-09-02 15:08:01 +09:00
Masayuki Nakano
258230964d
Bug 895274 part.74 Rename NS_UI_FOCUSOUT to eLegacyDOMFocusOut r=smaug
2015-09-02 15:08:01 +09:00
Masayuki Nakano
a0ac5d9960
Bug 895274 part.73 Rename NS_UI_FOCUSIN to eLegacyDOMFocusIn r=smaug
2015-09-02 15:08:01 +09:00
Masayuki Nakano
3cffa7a198
Bug 895274 part.72 Rename NS_UI_ACTIVATE to eLegacyDOMActivate r=smaug
2015-09-02 15:08:01 +09:00
Masayuki Nakano
d4d6d9f1a2
Bug 895274 part.70 Rename NS_BLUR_CONTENT to eBlur r=smaug
2015-09-02 15:08:00 +09:00
Masayuki Nakano
e2ac3a5b13
Bug 895274 part.69 Rename NS_FOCUS_CONTENT to eFocus r=smaug
2015-09-02 15:08:00 +09:00
Masayuki Nakano
636cf3a8f3
Bug 895274 part.67 Rename NS_FORM_INVALID to eFormInvalid r=smaug
2015-09-02 15:08:00 +09:00
Masayuki Nakano
70465bdd05
Bug 895274 part.66 Rename NS_FORM_SELECTED to eFormSelect r=smaug
2015-09-02 15:08:00 +09:00
Masayuki Nakano
b4c9424c6a
Bug 895274 part.65 Rename NS_FORM_CHANGE to eFormChange r=smaug
2015-09-02 15:08:00 +09:00
Masayuki Nakano
5cfc519d5f
Bug 895274 part.64 Rename NS_FORM_RESET to eFormReset r=smaug
2015-09-02 15:08:00 +09:00
Masayuki Nakano
51a01db12d
Bug 895274 part.63 Rename NS_FORM_SUBMIT to eFormSubmit r=smaug
2015-09-02 15:08:00 +09:00
Masayuki Nakano
17f273c93e
Bug 895274 part.61 Rename NS_LOAD to eLoad r=smaug
2015-09-02 15:07:59 +09:00
Masayuki Nakano
fe9005bf09
Bug 895274 part.60 Rename NS_PAGE_UNLOAD to eUnload r=smaug
2015-09-02 15:07:59 +09:00
Masayuki Nakano
596d9b3fc4
Bug 895274 part.59 Rename NS_HASHCHANGE to eHashChange r=smaug
2015-09-02 15:07:59 +09:00
Masayuki Nakano
2c5fbc3bc8
Bug 895274 part.58 Rename NS_IMAGE_ABORT to eImageAbort r=smaug
2015-09-02 15:07:59 +09:00
Masayuki Nakano
2e46149552
Bug 895274 part.57 Rename NS_LOAD_ERROR to eLoadError r=smaug
2015-09-02 15:07:59 +09:00