Vladimir Vukicevic
2862b29b17
b=951799, cache uniforms in OGLShaderProgram, part 2 - fix LayerProgramProjectionMatrix; r=bjacob
2014-01-29 17:53:38 -05:00
Vladimir Vukicevic
60cf58f1f2
b=951799, cache uniforms in OGLShaderProgram, part 1; r=bjacob
2014-01-29 17:53:37 -05:00
Nicolas Silva
cef0bf3210
Bug 965250 - Fix TextureHostD3D9. r=Bas
2014-01-29 17:27:01 +01:00
Nicolas Silva
298c0624fc
Bug 964794 - Remove extra Lock and minimize DT creation/destruction in D3D11 TextureClient. r=Bas
2014-01-29 17:26:42 +01:00
Doug Sherk
448c66aeb3
Bug 937343: Remove pan start logic on pinch end from APZC r=botond
2014-01-24 22:13:12 +00:00
Doug Sherk
01131fb434
Bug 937343: Spoof a touch start event on pinch end in GestureEventListener r=botond
2014-01-24 22:13:10 +00:00
Ali Akhtarzada
95480d503e
Bug 964745 - GetAsSourceSurface in SharedTextureImage and DeprecatedSharedRGBImage. r=nical
2014-01-28 10:27:36 -05:00
Ali Akhtarzada
d571d6ea36
Bug 961715 - Implement D3D9SurfaceImage::GetAsSourceSurface. r=nical
2014-01-28 09:14:10 -05:00
Ali Akhtarzada
638ef75fa6
Bug 961713 - Implement GrallocImage::GetAsSourceSurface. r=nical
2014-01-28 09:13:58 -05:00
Ali Akhtarzada
c34462e5f5
Bug 961714 - Implement RemoteDXGITextureImage::GetAsSourceSurface. r=nical
2014-01-28 09:00:10 -05:00
Nicholas Cameron
10f1fdf1a0
Bug 944087. Missing comment change addressing reviewer comment. r=Bas DONTBUILD (comment only)
2014-01-28 21:44:15 +13:00
Kartikaya Gupta
d2967684eb
Bug 950301 - Add another assertion to detect scenarios where we botch the layer tree. r=BenWa
2014-01-27 23:36:57 -05:00
David Zbarsky
05bdc40a75
Bug 952977: Convert AsyncCompositionManager to gfx::Matrix4x4 r=nical
2014-01-27 15:25:21 -05:00
David Zbarsky
20476fcd10
Bug 952977: Convert AutoMaskData to gfx::Matrix4x4 r=nical
2014-01-27 15:25:21 -05:00
David Zbarsky
b03cdd7b39
Bug 952977: Convert CompositingRenderTargetOGL to gfx::Matrix4x4 r=nical
2014-01-27 15:25:21 -05:00
David Zbarsky
8c0287eca2
Bug 952977: Convert DrawTo to gfx::Matrix4x4 r=nical
2014-01-27 15:25:20 -05:00
David Zbarsky
0bbd7b8bd8
Bug 952977: Convert PrepareViewport to gfx::Matrix4x4 r=nical
2014-01-27 15:25:20 -05:00
David Zbarsky
c2e7c2cd0a
Bug 952977: Convert OGLShaderProgram to gfx::Matrix r=nical
2014-01-27 15:25:20 -05:00
David Zbarsky
8a0b149ece
Bug 952977: Perform some cleanup r=nical
2014-01-27 15:25:19 -05:00
David Zbarsky
287bef7020
Bug 952977: Convert shadow transforms to gfx::Matrix4x4 r=nical
2014-01-27 10:29:27 -05:00
David Zbarsky
bed5a418db
Bug 952977: Convert Layer's mTransform to gfx::Matrix4x4 r=nical
2014-01-27 10:29:06 -05:00
David Zbarsky
44eeb608e1
Bug 952977: Convert GetTransform to gfx::Matrix4x4 r=nical
2014-01-27 10:28:47 -05:00
David Zbarsky
1e61d187aa
Bug 952977: Convert SetBaseTransform to gfx::Matrix4x4 r=nical
2014-01-27 10:28:33 -05:00
David Zbarsky
2cef9a18e8
Bug 952977: Convert GetLocalTransform to gfx::Matrix4x4 r=nical
2014-01-27 10:28:18 -05:00
David Zbarsky
4e68a5f47e
Bug 952977: Convert ComputeEffectiveTransforms to gfx::Matrix4x4 r=nical
2014-01-27 10:28:04 -05:00
David Zbarsky
cbdd71e0f8
Bug 952977: Convert SnapTransforms to gfx::Matrix r=nical
2014-01-27 10:27:20 -05:00
Ali Akhtarzada
6bbf31de9b
Bug 963491 - Implement MacIOSurface::GetAsSourceSurface. r=nical
2014-01-27 08:25:50 -05:00
Kartikaya Gupta
5fde241c65
Bug 963278 - Better fix to deal with concurrent scroll updates from APZ and other places. r=tn,botond,jimm
2014-02-05 17:43:20 -05:00
David Anderson
2617e179a9
Bug 947045 - Use Xlib surfaces in basic compositor (r=mattwoodrow)
2014-02-05 08:39:02 -08:00
Nicolas Silva
dbc2384b5d
Bug 950235 - Pick the TextureHost backend in function of the surface descriptor type. r=mattwoodrow
2014-02-05 14:34:16 +01:00
Nicholas Cameron
613fcb3cd7
Bug 944087. Fix main thread unlocking and tidy up. r=Bas
2014-01-27 17:10:40 +13:00
David Zbarsky
0b4e10c2b0
Bug 952977: Convert GetEffectiveTransform to gfx::Matrix4x4 r=nical
2014-01-24 17:49:19 -08:00
David Zbarsky
39799d8dbd
Bug 952977: Convert GetTextureTransform to gfx::Matrix4x4 r=nical
2014-01-24 17:49:02 -08:00
Doug Sherk
2950586b18
Bug 963270: Use first and second touches for pinch gesture detection r=kats
2014-01-23 18:42:49 -05:00
Vivien Nicolas
b634d8d7b0
Bug 963555 - Remove unused mMemoryPressureObserver variable in CompositorChild.h. r=nical
2014-01-24 19:29:04 +01:00
Nicolas Silva
f9d19b4183
Bug 952507 - Fix locking in double buffered ContentClient. r=nrc
2014-01-24 15:25:04 +01:00
Ali Akhtarzada
1dda9df3be
Bug 962288 - Don't call DeprecatedGetAsSurface unless it's Cairo. r=mattwoodrow
...
Changeset from Bug 959123 caused a performance decrease because
DeprecatedGetAsSurface was being called on an image that may not
be a CAIRO_SURFACE.
Reverted CairoImage surface members to public access as they were
before the patch from bug 959123.
2014-01-24 08:42:12 -05:00
Sotaro Ikeda
b3cfeb5636
Bug 959171 - Fix how to bind EGLImage in GrallocTextureHostOGL. r=nical
2014-01-24 08:30:41 -05:00
Nicholas Cameron
02f536a1b9
Bug 959842. Rename ContentClient::ReturnDrawTarget. r=mattwoodrow
2014-01-24 19:58:33 +13:00
Nicholas Cameron
fa1c128e24
Bug 959842. Fix PGO only crash calling ReturnDrawTarget. r=mattwoodrow
2014-01-24 19:58:29 +13:00
Doug Sherk
11807931df
Bug 962278 - Adjust default APZ DPI and settings that depend on it. r=kats
2014-01-23 16:34:31 -05:00
Ryan VanderMeulen
faf802a81e
Merge m-c to inbound.
2014-01-23 15:58:06 -05:00
Ryan VanderMeulen
a528d76af2
Merge b2g-inbound to m-c.
2014-01-23 15:39:44 -05:00
Benoit Girard
fc222ad8db
Bug 962881 - Fix regression to y scrolling with x overflow:hidden. r=botond
...
--HG--
extra : rebase_source : 32cc1c9f4abdb8d9f32319d4b718637e93691155
2014-01-23 11:57:40 -05:00
Oleg Romashin
d5c99bc60c
Bug 962978 - TextureHost leaking mBuffer with OMTC on Linux. r=nical
2014-01-23 07:26:59 -08:00
Carsten "Tomcat" Book
9b33885e9c
Backed out changeset 24668220c9a4 (bug 952507) for OS X Build Bustage on a CLOSED TREE
2014-01-23 15:50:14 +01:00
Nicolas Silva
8ffc85202e
Bug 952507 - Fix locking in double buffered ContentClient. r=nrc
2014-01-23 15:27:06 +01:00
Nicolas Silva
c74f0ea24a
Bug 952507 - Fix locking in ContentClient. r=nrc
2014-01-23 15:26:59 +01:00
Nicolas Silva
e2d0872a60
Bug 962041 - Fix component apha with the new ContentClient/Host. r=mattwoodrow
2014-01-23 15:14:58 +01:00
Nicolas Silva
3db8b58478
Bug 947213 - Fix an e10s with basic layers crash. r=bjacob
2014-01-23 15:11:36 +01:00
Carsten "Tomcat" Book
f88e37b02e
merge fx-team to mozilla-central
2014-01-23 10:19:26 +01:00
Ryan VanderMeulen
bf58190bf3
Merge m-c to fx-team.
2014-01-22 15:57:40 -05:00
Jim Mathies
01d3a37821
Bug 960692 - Avoid crashing in CompositorD3D11::BeginFrame if the ID3D11RenderTargetView is null. r=Bas
2014-01-22 14:12:11 -06:00
Wes Kocher
f1db135ee7
Backed out changeset e0f69ad55edf (bug 962288) under suspicion of leaking on a CLOSED TREE
2014-01-22 14:18:13 -08:00
Ali Akhtarzada
cedb0ffb4b
Bug 962288 - Don't call DeprecatedGetAsSurface unless it's Cairo. r=mattwoodrow
...
Changeset from Bug 959123 caused a performance decrease because
DeprecatedGetAsSurface was being called on an image that may not
be a CAIRO_SURFACE.
2014-01-22 14:12:02 -05:00
Botond Ballo
96cff6c7d4
Bug 916813 - Fix a crash during a layer dump. r=nical
2014-01-21 16:27:01 -05:00
Kartikaya Gupta
56b0e4e0df
Bug 947337 - Ensure the transform of input to Gecko space accounts for inflight paint requests. r=botond
2014-01-21 16:27:20 -05:00
Kartikaya Gupta
942438d756
Bug 947337 - Track the last metrics actually sent to Gecko after coming out of the throttler. r=botond
2014-01-21 16:26:57 -05:00
Kartikaya Gupta
d1075d4513
Bug 947337 - Small refactoring to reduce an unnecessary codepath. r=botond
2014-01-21 16:24:18 -05:00
Sotaro Ikeda
f903a20e0d
Bug 951732 - Keep TextureClient until Transaction complete. r=nical
2014-01-23 09:31:12 -05:00
Botond Ballo
55cc299986
Bug 950488 - Disallow zooming for overflow:hidden frames. r=kats
...
--HG--
extra : rebase_source : eec649c7f5406d6781c4d703fb7bb1055c112d9e
2014-01-21 11:51:46 -05:00
Benoit Girard
49072be9c6
Bug 950488 - Overhaul APZ handling of overflow:hidden. r=botond
...
--HG--
extra : rebase_source : 6ba93899e5ac446b5c4a4cacb18574dd05c54c62
2014-01-21 12:33:52 -05:00
Wes Kocher
76a04cfa54
Backed out 3 changesets (bug 947337) for build test errors
...
Backed out changeset 6ade48b8b9d7 (bug 947337)
Backed out changeset f3095f92e1c3 (bug 947337)
Backed out changeset 5becc07d9dac (bug 947337)
2014-01-21 15:04:22 -08:00
Nicolas Silva
2302a77289
Bug 959615 - Initialize the TextureChild/Parent at creation time. r= bjacob
2014-01-21 23:06:18 +01:00
Kartikaya Gupta
5e1d2a2137
Bug 947337 - Ensure the transform of input to Gecko space accounts for inflight paint requests. r=botond
2014-01-21 16:27:20 -05:00
Kartikaya Gupta
1d05968005
Bug 947337 - Track the last metrics actually sent to Gecko after coming out of the throttler. r=botond
2014-01-21 16:26:57 -05:00
Kartikaya Gupta
bdffe911ee
Bug 947337 - Small refactoring to reduce an unnecessary codepath. r=botond
2014-01-21 16:24:18 -05:00
Ryan VanderMeulen
ad33ff9d95
Backed out changeset 60698fb6579b (bug 959171) for B2G mochitest-3 crashes.
2014-01-21 15:07:48 -05:00
Sotaro Ikeda
3393c67ef8
Bug 961405 - Change GraphicBufferLocked as to use AtomicRefCountedWithFinalize. r=nical, r=pchang, r=doublec, r=mikeh
2014-01-21 13:53:48 -05:00
Ali Akhtarzada
c8d408d444
Bug 959526 - Implement PlanarYCrCbImage and derived classes GetAsSourceSurface. r=nical
...
Implement GetAsSourceSurface in:
* PlanarYCrCbImage
* BasicPlanarYCrCbImage
* SharedPlanarYCrCbImage
2014-01-21 11:49:53 -05:00
Sotaro Ikeda
aea11e910c
Bug 959171 - Fix how to bind EGLImage in GrallocTextureHostOGL. r=nical
2014-01-21 11:49:38 -05:00
Dan Glastonbury
16a54e4041
Bug 879663 - Check for GL Context validity in Pause()/Resume(). r=bjacob
2014-01-22 08:45:35 +10:00
Dmitry Rozhkov
c0166194d3
Bug 960565 - Reset touch counter with every touch start event. r=kats
2014-01-22 16:06:35 +02:00
Chris Lord
381ed51e56
Bug 958549 - Don't move scroll indicators for empty container layers. r=kats
...
If we've applied an async transform to an empty container layer (e.g. a layer
that corresponds to an nsDisplayScrollInfo display item), don't use that
transform on the corresponding scrollbar.
2014-01-22 14:25:44 +00:00
Benoit Jacob
123083a93d
Bug 959380 - Fix a mismatched enum bug revealed by the conversion of gfxImageFormat into a typed enum - no review, trivial build fix
2014-01-23 15:02:23 -05:00
Kartikaya Gupta
a99d3870a7
Bug 961408 - Partial rollback of an incorrect change. No 'this' in static functions. r=me DONTBUILD
2014-01-23 13:50:17 -05:00
Benoit Jacob
67a17b1047
Bug 959448 - Convert most of LayersTypes.h to typed enums - r=nrc
...
find content/media dom/ipc widget/ gfx/tests gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)LAYERS_\(NONE\|BASIC\|OPENGL\|D3D9\|D3D10\|D3D11\|CLIENT\|LAST\)\($\|[^A-Za-z0-9_]\)/\1LayersBackend::LAYERS_\2\3/g'
find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::BUFFER_\2\3/g'
find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(BUFFERED\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::\2\3/g'
find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(DRAW\|DRAW_SNAPPED\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::\2\3/g'
find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::CLIP_\2\3/g'
find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SURFACE_\(NONE\|OPAQUE\|SINGLE_CHANNEL_ALPHA\|COMPONENT_ALPHA\)\($\|[^A-Za-z0-9_]\)/\1SurfaceMode::SURFACE_\2\3/g'
find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(STRETCH\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::\2\3/g'
find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::SCALE_\2\3/g'
2014-01-23 13:26:41 -05:00
Benoit Jacob
93826fc6b0
Bug 959380 - 4/5 - Make gfxContentType a typed enum - r=jrmuizel
...
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)GFX_CONTENT_\(COLOR\|ALPHA\|COLOR_ALPHA\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1gfxContentType::\2\3/g'
2014-01-23 13:26:40 -05:00
Benoit Jacob
3846defaec
Bug 959380 - 3/5 - Make gfxSurfaceType a typed enum - r=jrmuizel
...
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxSurfaceType\(Image\|PDF\|PS\|Xlib\|Xcb\|Glitz\|Quartz\|Win32\|BeOS\|DirectFB\|SVG\|OS2\|Win32Printing\|QuartzImage\|Script\|QPainter\|Recording\|VG\|GL\|DRM\|Tee\|XML\|Skia\|Subsurface\|D2D\|Max\)\($\|[^A-Za-z0-9_]\)/\1gfxSurfaceType::\2\3/g'
2014-01-23 13:26:40 -05:00
Benoit Jacob
3369ca8bb6
Bug 959380 - 2/5 - Make gfxImageFormat a typed enum - r=jrmuizel
...
find . -type f | grep -v \./obj | grep -v \.hg | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxImageFormat\(ARGB32\|RGB24\|A8\|A1\|RGB16_565\|Unknown\)\($\|[^A-Za-z0-9_]\)/\1gfxImageFormat::\2\3/g'
2014-01-23 13:26:40 -05:00
Nicolas Silva
776aff8935
Bug 957560 - Clear the newly allocated d3d TextureClient if the allocation flags says so. r=nrc
2014-01-20 14:52:12 +01:00
Kartikaya Gupta
b9dc7b3c75
Bug 961408 - Ensure all the APZC_LOG statements in APZC print the relevant instance. r=botond
2014-01-20 08:25:16 -05:00
Ryan VanderMeulen
0439f91b53
Merge b2g-inbound to m-c.
2014-01-19 15:40:48 -05:00
Sushil Chauhan
dcb369e13a
Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron
2014-01-17 18:55:30 -08:00
Kartikaya Gupta
8fe7775e67
Bug 941138 - Make the duplicated code paths consistent. r=botond
2014-01-17 09:53:08 -05:00
Kartikaya Gupta
c7ca9bac2b
Bug 941138 - Remove a redundant ScreenPoint argument. r=botond
2014-01-17 09:53:08 -05:00
Kartikaya Gupta
abb983b7c2
Bug 941138 - Move the code to update the cached transform. r=botond
2014-01-17 09:52:49 -05:00
Nick Lebedev
940cdd21fd
Bug 958984. Move SurfaceMode enum out of Layer class so we could forward declare it instead of including header. r=nical
2014-01-17 15:00:00 +01:00
Nicholas Cameron
12d321e66b
Bug 959842. Add null checks whenever we borrow a draw target from RotatedBuffer. r=kats
2014-01-17 09:52:52 +13:00
Bas Schouten
369a4507bb
Bug 960254 - Part 2: Update some callers that write to DataSourceSurface. r=jrmuizel
2014-01-16 13:17:23 +01:00
Bas Schouten
370e329706
Backed out 5 changesets (bug 960254, bug 960354)
...
Backed out changeset 4441c32c724c (bug 960254)
Backed out changeset 4aecc5ca2a19 (bug 960254)
Backed out changeset 9f499e5f7954 (bug 960354)
Backed out changeset fd9b6b044a5a (bug 960354)
Backed out changeset c1f6fbc397bd (bug 960354)
2014-01-16 14:36:53 +01:00
Bas Schouten
e40ceb7ddd
Bug 960354 - Part 2: Update some callers that write to DataSourceSurfaces. r=jrmuizel
2014-01-16 13:17:23 +01:00
David Zbarsky
3e6531d3e8
Bug 952977: Switch GL world transform to gfx::Matrix r=nical
2014-01-16 02:22:19 -05:00
Botond Ballo
b055f83375
Bug 961171 - Have APZ pick up on dynamic changes to 'scrollgrab' property. r=BenWa
2014-01-17 14:51:00 -05:00
Josh Aas
81a268a5e4
Bug 960648: Consistently mark IPDL methods as MOZ_OVERRIDE. Part 2. r=bent
2014-01-17 13:49:39 -06:00
Botond Ballo
c8e7a984df
Bug 959198 - Have APZ hit testing respect mozpasspointerevents. r=kats
...
--HG--
extra : rebase_source : aafa0b5bf9839f583b84151afc4a3c805fabee0a
2014-01-16 15:19:59 -05:00
Ali Akhtarzada
5bf61ed7e6
Bug 959527 - Implement SharedRGBImage::GetAsSourceSurface. r=nical
2014-01-17 11:22:56 -05:00
Ali Akhtarzada
b9fa4ce207
Bug 959124 - Implement RemoteBitmapImage::GetAsSourceSurface. r=nical
...
Just added a subclass specific implementation of GetAsSourceSurface.
2014-01-17 11:22:44 -05:00
Ali Akhtarzada
2b8742c537
Bug 959123 - Implement CairoImage::GetAsSourceSurface. r=nical
...
Deprecate CairoImage::Data::mSurface and add an mSourceSurface.
Also change all the callers of CairoImage::SetData to set the
SourceSurface as well.
Also change scope of CairoImage::mSource to private
2014-01-17 11:22:09 -05:00
Ryan VanderMeulen
4d272a44a3
Merge inbound to m-c.
2014-01-15 14:34:05 -05:00
Ed Morley
5de6cbb3a7
Merge latest green b2g-inbound changeset and mozilla-central
2014-01-15 15:57:30 +00:00
Solomon Chiu
66b3bfc35f
Bug 958420 - The follow up bug for removing one additional PIXEL_FORMAT_A_8. r=mwu.
2014-01-15 18:06:53 +08:00
Robert O'Callahan
6a0b04292d
Bug 946065. Part 5: Move content/events to dom/ and flatten away 'src' directory. r=Ms2ger
...
--HG--
rename : content/events/src/DOMWheelEvent.cpp => dom/events/DOMWheelEvent.cpp
rename : content/events/src/DOMWheelEvent.h => dom/events/DOMWheelEvent.h
rename : content/events/src/EventTarget.cpp => dom/events/EventTarget.cpp
rename : content/events/public/EventTarget.h => dom/events/EventTarget.h
rename : content/events/public/MutationEvent.h => dom/events/MutationEvent.h
rename : content/events/src/PointerEvent.cpp => dom/events/PointerEvent.cpp
rename : content/events/src/PointerEvent.h => dom/events/PointerEvent.h
rename : content/events/src/SpeechRecognitionError.cpp => dom/events/SpeechRecognitionError.cpp
rename : content/events/src/SpeechRecognitionError.h => dom/events/SpeechRecognitionError.h
rename : content/events/src/TextComposition.cpp => dom/events/TextComposition.cpp
rename : content/events/src/TextComposition.h => dom/events/TextComposition.h
rename : content/events/src/Touch.cpp => dom/events/Touch.cpp
rename : content/events/src/Touch.h => dom/events/Touch.h
rename : content/events/crashtests/104310-1.html => dom/events/crashtests/104310-1.html
rename : content/events/crashtests/116206-1.html => dom/events/crashtests/116206-1.html
rename : content/events/crashtests/135345-1.html => dom/events/crashtests/135345-1.html
rename : content/events/crashtests/422009-1.xhtml => dom/events/crashtests/422009-1.xhtml
rename : content/events/crashtests/457776-1.html => dom/events/crashtests/457776-1.html
rename : content/events/crashtests/496308-1.html => dom/events/crashtests/496308-1.html
rename : content/events/crashtests/682637-1.html => dom/events/crashtests/682637-1.html
rename : content/events/crashtests/crashtests.list => dom/events/crashtests/crashtests.list
rename : content/events/crashtests/eventctor-nulldictionary.html => dom/events/crashtests/eventctor-nulldictionary.html
rename : content/events/crashtests/eventctor-nullstorage.html => dom/events/crashtests/eventctor-nullstorage.html
rename : content/events/crashtests/recursive-DOMNodeInserted.html => dom/events/crashtests/recursive-DOMNodeInserted.html
rename : content/events/crashtests/recursive-onload.html => dom/events/crashtests/recursive-onload.html
rename : content/events/src/moz.build => dom/events/moz.build
rename : content/events/src/nsAsyncDOMEvent.cpp => dom/events/nsAsyncDOMEvent.cpp
rename : content/events/public/nsAsyncDOMEvent.h => dom/events/nsAsyncDOMEvent.h
rename : content/events/src/nsContentEventHandler.cpp => dom/events/nsContentEventHandler.cpp
rename : content/events/src/nsContentEventHandler.h => dom/events/nsContentEventHandler.h
rename : content/events/src/nsDOMAnimationEvent.cpp => dom/events/nsDOMAnimationEvent.cpp
rename : content/events/src/nsDOMAnimationEvent.h => dom/events/nsDOMAnimationEvent.h
rename : content/events/src/nsDOMBeforeUnloadEvent.cpp => dom/events/nsDOMBeforeUnloadEvent.cpp
rename : content/events/src/nsDOMBeforeUnloadEvent.h => dom/events/nsDOMBeforeUnloadEvent.h
rename : content/events/src/nsDOMClipboardEvent.cpp => dom/events/nsDOMClipboardEvent.cpp
rename : content/events/src/nsDOMClipboardEvent.h => dom/events/nsDOMClipboardEvent.h
rename : content/events/src/nsDOMCommandEvent.cpp => dom/events/nsDOMCommandEvent.cpp
rename : content/events/src/nsDOMCommandEvent.h => dom/events/nsDOMCommandEvent.h
rename : content/events/src/nsDOMCompositionEvent.cpp => dom/events/nsDOMCompositionEvent.cpp
rename : content/events/src/nsDOMCompositionEvent.h => dom/events/nsDOMCompositionEvent.h
rename : content/events/src/nsDOMDataContainerEvent.cpp => dom/events/nsDOMDataContainerEvent.cpp
rename : content/events/src/nsDOMDataContainerEvent.h => dom/events/nsDOMDataContainerEvent.h
rename : content/events/src/nsDOMDataTransfer.cpp => dom/events/nsDOMDataTransfer.cpp
rename : content/events/src/nsDOMDataTransfer.h => dom/events/nsDOMDataTransfer.h
rename : content/events/src/nsDOMDeviceMotionEvent.cpp => dom/events/nsDOMDeviceMotionEvent.cpp
rename : content/events/src/nsDOMDeviceMotionEvent.h => dom/events/nsDOMDeviceMotionEvent.h
rename : content/events/src/nsDOMDragEvent.cpp => dom/events/nsDOMDragEvent.cpp
rename : content/events/src/nsDOMDragEvent.h => dom/events/nsDOMDragEvent.h
rename : content/events/src/nsDOMEvent.cpp => dom/events/nsDOMEvent.cpp
rename : content/events/src/nsDOMEvent.h => dom/events/nsDOMEvent.h
rename : content/events/src/nsDOMEventTargetHelper.cpp => dom/events/nsDOMEventTargetHelper.cpp
rename : content/events/src/nsDOMEventTargetHelper.h => dom/events/nsDOMEventTargetHelper.h
rename : content/events/src/nsDOMFocusEvent.cpp => dom/events/nsDOMFocusEvent.cpp
rename : content/events/src/nsDOMFocusEvent.h => dom/events/nsDOMFocusEvent.h
rename : content/events/public/nsDOMKeyNameList.h => dom/events/nsDOMKeyNameList.h
rename : content/events/src/nsDOMKeyboardEvent.cpp => dom/events/nsDOMKeyboardEvent.cpp
rename : content/events/src/nsDOMKeyboardEvent.h => dom/events/nsDOMKeyboardEvent.h
rename : content/events/src/nsDOMMessageEvent.cpp => dom/events/nsDOMMessageEvent.cpp
rename : content/events/src/nsDOMMessageEvent.h => dom/events/nsDOMMessageEvent.h
rename : content/events/src/nsDOMMouseEvent.cpp => dom/events/nsDOMMouseEvent.cpp
rename : content/events/src/nsDOMMouseEvent.h => dom/events/nsDOMMouseEvent.h
rename : content/events/src/nsDOMMouseScrollEvent.cpp => dom/events/nsDOMMouseScrollEvent.cpp
rename : content/events/src/nsDOMMouseScrollEvent.h => dom/events/nsDOMMouseScrollEvent.h
rename : content/events/src/nsDOMMutationEvent.cpp => dom/events/nsDOMMutationEvent.cpp
rename : content/events/src/nsDOMMutationEvent.h => dom/events/nsDOMMutationEvent.h
rename : content/events/src/nsDOMNotifyAudioAvailableEvent.cpp => dom/events/nsDOMNotifyAudioAvailableEvent.cpp
rename : content/events/src/nsDOMNotifyAudioAvailableEvent.h => dom/events/nsDOMNotifyAudioAvailableEvent.h
rename : content/events/src/nsDOMNotifyPaintEvent.cpp => dom/events/nsDOMNotifyPaintEvent.cpp
rename : content/events/src/nsDOMNotifyPaintEvent.h => dom/events/nsDOMNotifyPaintEvent.h
rename : content/events/src/nsDOMScrollAreaEvent.cpp => dom/events/nsDOMScrollAreaEvent.cpp
rename : content/events/src/nsDOMScrollAreaEvent.h => dom/events/nsDOMScrollAreaEvent.h
rename : content/events/src/nsDOMSimpleGestureEvent.cpp => dom/events/nsDOMSimpleGestureEvent.cpp
rename : content/events/src/nsDOMSimpleGestureEvent.h => dom/events/nsDOMSimpleGestureEvent.h
rename : content/events/src/nsDOMTextEvent.cpp => dom/events/nsDOMTextEvent.cpp
rename : content/events/src/nsDOMTextEvent.h => dom/events/nsDOMTextEvent.h
rename : content/events/src/nsDOMTouchEvent.cpp => dom/events/nsDOMTouchEvent.cpp
rename : content/events/src/nsDOMTouchEvent.h => dom/events/nsDOMTouchEvent.h
rename : content/events/src/nsDOMTransitionEvent.cpp => dom/events/nsDOMTransitionEvent.cpp
rename : content/events/src/nsDOMTransitionEvent.h => dom/events/nsDOMTransitionEvent.h
rename : content/events/src/nsDOMUIEvent.cpp => dom/events/nsDOMUIEvent.cpp
rename : content/events/src/nsDOMUIEvent.h => dom/events/nsDOMUIEvent.h
rename : content/events/src/nsDOMXULCommandEvent.cpp => dom/events/nsDOMXULCommandEvent.cpp
rename : content/events/src/nsDOMXULCommandEvent.h => dom/events/nsDOMXULCommandEvent.h
rename : content/events/src/nsEventDispatcher.cpp => dom/events/nsEventDispatcher.cpp
rename : content/events/public/nsEventDispatcher.h => dom/events/nsEventDispatcher.h
rename : content/events/src/nsEventListenerManager.cpp => dom/events/nsEventListenerManager.cpp
rename : content/events/src/nsEventListenerManager.h => dom/events/nsEventListenerManager.h
rename : content/events/src/nsEventListenerService.cpp => dom/events/nsEventListenerService.cpp
rename : content/events/src/nsEventListenerService.h => dom/events/nsEventListenerService.h
rename : content/events/public/nsEventNameList.h => dom/events/nsEventNameList.h
rename : content/events/src/nsEventStateManager.cpp => dom/events/nsEventStateManager.cpp
rename : content/events/src/nsEventStateManager.h => dom/events/nsEventStateManager.h
rename : content/events/public/nsEventStates.h => dom/events/nsEventStates.h
rename : content/events/public/nsIEventListenerService.idl => dom/events/nsIEventListenerService.idl
rename : dom/base/nsIJSEventListener.h => dom/events/nsIJSEventListener.h
rename : content/events/src/nsIMEStateManager.cpp => dom/events/nsIMEStateManager.cpp
rename : content/events/src/nsIMEStateManager.h => dom/events/nsIMEStateManager.h
rename : content/events/public/nsIPrivateTextEvent.h => dom/events/nsIPrivateTextEvent.h
rename : content/events/public/nsIPrivateTextRange.h => dom/events/nsIPrivateTextRange.h
rename : dom/src/events/nsJSEventListener.cpp => dom/events/nsJSEventListener.cpp
rename : dom/src/events/nsJSEventListener.h => dom/events/nsJSEventListener.h
rename : content/events/src/nsPaintRequest.cpp => dom/events/nsPaintRequest.cpp
rename : content/events/src/nsPaintRequest.h => dom/events/nsPaintRequest.h
rename : content/events/src/nsPrivateTextRange.cpp => dom/events/nsPrivateTextRange.cpp
rename : content/events/src/nsPrivateTextRange.h => dom/events/nsPrivateTextRange.h
rename : content/events/public/nsVKList.h => dom/events/nsVKList.h
rename : content/events/test/bug226361_iframe.xhtml => dom/events/test/bug226361_iframe.xhtml
rename : content/events/test/bug299673.js => dom/events/test/bug299673.js
rename : content/events/test/bug322588-popup.html => dom/events/test/bug322588-popup.html
rename : content/events/test/bug415498-doc1.html => dom/events/test/bug415498-doc1.html
rename : content/events/test/bug415498-doc2.html => dom/events/test/bug415498-doc2.html
rename : content/events/test/bug426082.html => dom/events/test/bug426082.html
rename : content/events/test/bug457672.html => dom/events/test/bug457672.html
rename : content/events/test/bug591249_iframe.xul => dom/events/test/bug591249_iframe.xul
rename : content/events/test/bug602962.xul => dom/events/test/bug602962.xul
rename : content/events/test/bug656379-1.html => dom/events/test/bug656379-1.html
rename : content/events/test/chrome.ini => dom/events/test/chrome.ini
rename : content/events/test/empty.js => dom/events/test/empty.js
rename : content/events/test/file_bug679494.html => dom/events/test/file_bug679494.html
rename : content/events/test/mochitest.ini => dom/events/test/mochitest.ini
rename : content/events/test/test_addEventListenerExtraArg.html => dom/events/test/test_addEventListenerExtraArg.html
rename : content/events/test/test_all_synthetic_events.html => dom/events/test/test_all_synthetic_events.html
rename : content/events/test/test_bug226361.xhtml => dom/events/test/test_bug226361.xhtml
rename : content/events/test/test_bug238987.html => dom/events/test/test_bug238987.html
rename : content/events/test/test_bug288392.html => dom/events/test/test_bug288392.html
rename : content/events/test/test_bug299673-1.html => dom/events/test/test_bug299673-1.html
rename : content/events/test/test_bug299673-2.html => dom/events/test/test_bug299673-2.html
rename : content/events/test/test_bug322588.html => dom/events/test/test_bug322588.html
rename : content/events/test/test_bug328885.html => dom/events/test/test_bug328885.html
rename : content/events/test/test_bug336682.js => dom/events/test/test_bug336682.js
rename : content/events/test/test_bug336682_1.html => dom/events/test/test_bug336682_1.html
rename : content/events/test/test_bug336682_2.xul => dom/events/test/test_bug336682_2.xul
rename : content/events/test/test_bug367781.html => dom/events/test/test_bug367781.html
rename : content/events/test/test_bug368835.html => dom/events/test/test_bug368835.html
rename : content/events/test/test_bug379120.html => dom/events/test/test_bug379120.html
rename : content/events/test/test_bug391568.xhtml => dom/events/test/test_bug391568.xhtml
rename : content/events/test/test_bug402089.html => dom/events/test/test_bug402089.html
rename : content/events/test/test_bug405632.html => dom/events/test/test_bug405632.html
rename : content/events/test/test_bug409604.html => dom/events/test/test_bug409604.html
rename : content/events/test/test_bug412567.html => dom/events/test/test_bug412567.html
rename : content/events/test/test_bug415498.xul => dom/events/test/test_bug415498.xul
rename : content/events/test/test_bug422132.html => dom/events/test/test_bug422132.html
rename : content/events/test/test_bug426082.html => dom/events/test/test_bug426082.html
rename : content/events/test/test_bug427537.html => dom/events/test/test_bug427537.html
rename : content/events/test/test_bug428988.html => dom/events/test/test_bug428988.html
rename : content/events/test/test_bug432698.html => dom/events/test/test_bug432698.html
rename : content/events/test/test_bug443985.html => dom/events/test/test_bug443985.html
rename : content/events/test/test_bug447736.html => dom/events/test/test_bug447736.html
rename : content/events/test/test_bug448602.html => dom/events/test/test_bug448602.html
rename : content/events/test/test_bug450876.html => dom/events/test/test_bug450876.html
rename : content/events/test/test_bug456273.html => dom/events/test/test_bug456273.html
rename : content/events/test/test_bug457672.html => dom/events/test/test_bug457672.html
rename : content/events/test/test_bug489671.html => dom/events/test/test_bug489671.html
rename : content/events/test/test_bug493251.html => dom/events/test/test_bug493251.html
rename : content/events/test/test_bug502818.html => dom/events/test/test_bug502818.html
rename : content/events/test/test_bug508479.html => dom/events/test/test_bug508479.html
rename : content/events/test/test_bug517851.html => dom/events/test/test_bug517851.html
rename : content/events/test/test_bug534833.html => dom/events/test/test_bug534833.html
rename : content/events/test/test_bug545268.html => dom/events/test/test_bug545268.html
rename : content/events/test/test_bug547996-1.html => dom/events/test/test_bug547996-1.html
rename : content/events/test/test_bug547996-2.xhtml => dom/events/test/test_bug547996-2.xhtml
rename : content/events/test/test_bug556493.html => dom/events/test/test_bug556493.html
rename : content/events/test/test_bug563329.html => dom/events/test/test_bug563329.html
rename : content/events/test/test_bug574663.html => dom/events/test/test_bug574663.html
rename : content/events/test/test_bug586961.xul => dom/events/test/test_bug586961.xul
rename : content/events/test/test_bug591249.xul => dom/events/test/test_bug591249.xul
rename : content/events/test/test_bug591815.html => dom/events/test/test_bug591815.html
rename : content/events/test/test_bug593959.html => dom/events/test/test_bug593959.html
rename : content/events/test/test_bug602962.xul => dom/events/test/test_bug602962.xul
rename : content/events/test/test_bug603008.html => dom/events/test/test_bug603008.html
rename : content/events/test/test_bug605242.html => dom/events/test/test_bug605242.html
rename : content/events/test/test_bug607464.html => dom/events/test/test_bug607464.html
rename : content/events/test/test_bug613634.html => dom/events/test/test_bug613634.html
rename : content/events/test/test_bug615597.html => dom/events/test/test_bug615597.html
rename : content/events/test/test_bug617528.xul => dom/events/test/test_bug617528.xul
rename : content/events/test/test_bug624127.html => dom/events/test/test_bug624127.html
rename : content/events/test/test_bug635465.html => dom/events/test/test_bug635465.html
rename : content/events/test/test_bug641477.html => dom/events/test/test_bug641477.html
rename : content/events/test/test_bug648573.html => dom/events/test/test_bug648573.html
rename : content/events/test/test_bug650493.html => dom/events/test/test_bug650493.html
rename : content/events/test/test_bug656379-1.html => dom/events/test/test_bug656379-1.html
rename : content/events/test/test_bug656379-2.html => dom/events/test/test_bug656379-2.html
rename : content/events/test/test_bug656954.html => dom/events/test/test_bug656954.html
rename : content/events/test/test_bug659071.html => dom/events/test/test_bug659071.html
rename : content/events/test/test_bug659350.html => dom/events/test/test_bug659350.html
rename : content/events/test/test_bug662678.html => dom/events/test/test_bug662678.html
rename : content/events/test/test_bug667612.html => dom/events/test/test_bug667612.html
rename : content/events/test/test_bug667919-1.html => dom/events/test/test_bug667919-1.html
rename : content/events/test/test_bug679494.xul => dom/events/test/test_bug679494.xul
rename : content/events/test/test_bug689564.html => dom/events/test/test_bug689564.html
rename : content/events/test/test_bug698929.html => dom/events/test/test_bug698929.html
rename : content/events/test/test_bug741666.html => dom/events/test/test_bug741666.html
rename : content/events/test/test_bug742376.html => dom/events/test/test_bug742376.html
rename : content/events/test/test_bug812744.html => dom/events/test/test_bug812744.html
rename : content/events/test/test_bug822898.html => dom/events/test/test_bug822898.html
rename : content/events/test/test_bug847597.html => dom/events/test/test_bug847597.html
rename : content/events/test/test_bug855741.html => dom/events/test/test_bug855741.html
rename : content/events/test/test_bug864040.html => dom/events/test/test_bug864040.html
rename : content/events/test/test_bug930374-chrome.html => dom/events/test/test_bug930374-chrome.html
rename : content/events/test/test_bug930374-content.html => dom/events/test/test_bug930374-content.html
rename : content/events/test/test_bug944011.html => dom/events/test/test_bug944011.html
rename : content/events/test/test_bug944847.html => dom/events/test/test_bug944847.html
rename : content/events/test/test_bug946632.html => dom/events/test/test_bug946632.html
rename : content/events/test/test_clickevent_on_input.html => dom/events/test/test_clickevent_on_input.html
rename : content/events/test/test_continuous_wheel_events.html => dom/events/test/test_continuous_wheel_events.html
rename : content/events/test/test_dblclick_explicit_original_target.html => dom/events/test/test_dblclick_explicit_original_target.html
rename : content/events/test/test_dom_keyboard_event.html => dom/events/test/test_dom_keyboard_event.html
rename : content/events/test/test_dom_mouse_event.html => dom/events/test/test_dom_mouse_event.html
rename : content/events/test/test_dom_wheel_event.html => dom/events/test/test_dom_wheel_event.html
rename : content/events/test/test_draggableprop.html => dom/events/test/test_draggableprop.html
rename : content/events/test/test_dragstart.html => dom/events/test/test_dragstart.html
rename : content/events/test/test_eventctors.html => dom/events/test/test_eventctors.html
rename : content/events/test/test_eventctors.xul => dom/events/test/test_eventctors.xul
rename : content/events/test/test_focus_disabled.html => dom/events/test/test_focus_disabled.html
rename : content/events/test/test_messageEvent.html => dom/events/test/test_messageEvent.html
rename : content/events/test/test_moz_mouse_pixel_scroll_event.html => dom/events/test/test_moz_mouse_pixel_scroll_event.html
rename : content/events/test/test_wheel_default_action.html => dom/events/test/test_wheel_default_action.html
rename : content/events/test/window_bug493251.html => dom/events/test/window_bug493251.html
rename : content/events/test/window_bug617528.xul => dom/events/test/window_bug617528.xul
rename : content/events/test/window_bug659071.html => dom/events/test/window_bug659071.html
rename : content/events/test/window_wheel_default_action.html => dom/events/test/window_wheel_default_action.html
extra : rebase_source : 5eb1db8f1791b8842ddc683e3c0ea13e4e3a933b
2014-01-10 16:03:25 +13:00
Wes Kocher
d2dc815e95
Merge m-c to b2g-inbound
2014-01-14 16:14:39 -08:00
Kartikaya Gupta
b75faf0673
Bug 951113 - Trigger a repaint request when getting a scroll offset update to cover a race condition allowed by async IPC. r=botond
2014-01-14 16:43:43 -05:00
Ryan VanderMeulen
4d0972315d
Merge inbound to m-c.
2014-01-13 17:44:24 -05:00
Benoit Girard
abbfebc465
Bug 959287 - Add mScrollableRect to layers dump. r=botond
2014-01-14 10:05:20 -05:00
Andreas Pehrson
2f6087aff6
Bug 877115 - Moz2Dify CanvasLayerD3D10 drawing shared surface into D3D10_MAPPED_TEXTURE2D. r=nical
2014-01-13 20:06:22 +01:00
Andreas Pehrson
04f0b314a9
Bug 877115 - Moz2Dify CanvasLayerD3D9 drawing shared surface into D3DLOCKED_RECT. r=nical
2014-01-13 20:05:24 +01:00
Solomon Chiu
374ffb7755
Bug 958420 - Remove obsolete code trying to use PIXEL_FORMAT_A_8 with gralloc. r=gal, r=pchang
2014-01-13 10:00:34 +08:00
Carsten "Tomcat" Book
9b514818ca
Merge mozilla-central to b2g-inbound
2014-01-13 14:44:08 +01:00
Carsten "Tomcat" Book
482a1c8977
Backed out changeset e9a7aaad1771 (bug 958420) for causing merge conflicts from m-c
2014-01-13 14:41:31 +01:00
Solomon Chiu
10551087fa
Bug 946245 - Port GonkDisplay to KK, r=mwu,sotaro,pchang
2014-01-09 18:42:54 +08:00
Solomon Chiu
007c15898f
Bug 958420 - remove obsolete code trying to use PIXEL_FORMAT_A_8 with gralloc, r=gal,pchang
2014-01-13 10:00:34 +08:00
Kartikaya Gupta
df5655f5e4
Bug 957790 - Initialize the APZC with zooming disabled until we know for sure if it is allowed. r=botond,jimm
...
On Metro we don't support the meta-viewport tag yet, so we need to re-enable
zooming there.
2014-01-13 12:35:00 -05:00
Kartikaya Gupta
997647943c
Bug 957790 - Remove a no-longer-used pref to disable async zooming in the APZ. r=jimm
2014-01-13 12:35:00 -05:00
Nicolas Silva
fa3fcc3b50
Bug 958040 - Temporarily turn an assertion into a warning to fix OMTC Linux. r=bjacob
2014-01-10 14:43:40 +01:00
Morris Tseng
b631d4766c
Bug 893304 - Convert CanvasClient to new TextureClint/Host and replace SurfaceDescriptors with TextureClients inside SharedSurfaces. r=nical, r=snorp, r=jgilbert, r=bjacob
2014-01-10 08:06:06 -05:00
Andreas Pehrson
f85279f2d1
Bug 877115 - Moz2Dify layer snapshot dumping further. r=nical
2014-01-08 09:43:46 +01:00
Andreas Pehrson
797774eebe
Bug 877115 - Remove GetTexImage from GLContext helper. r=nical
2014-01-08 09:37:58 +01:00
Kartikaya Gupta
934bb54c56
Bug 957188 - Increase touch start tolerance to more easily detect taps. r=botond
2014-01-09 15:45:41 -05:00
Nicholas Cameron
7548c8ea75
Bug 951554. Change the high level painting functions. r=nical
...
--HG--
extra : rebase_source : bcbed6d9d4e46d4b21854954789fe6ba28cdf3cc
2014-01-13 09:07:42 +13:00
Nicholas Cameron
2c1a79cfa5
Bug 951554. Changes to ContentClient. r=nical
...
--HG--
extra : rebase_source : 1d64aaf91b3cbea0e4dff9066dd609a5edd06f5c
2014-01-13 09:06:45 +13:00
Nicholas Cameron
03ad641ce1
Bug 951554. Changes to RotatedBuffer. r=nical
...
--HG--
extra : rebase_source : b4b0d9eb02e377aff66f9eba582f4cc4ab3a4d77
2014-01-13 08:57:17 +13:00
Nicholas Cameron
77ca3ce7b0
Bug 951554. Replace SyncFrontBufferToBackBuffer with PrepareFrame and FinalizeFrame. r=nical
...
--HG--
extra : rebase_source : 129796a77c5777dac89930907d1f257657115ae3
2014-01-13 08:54:40 +13:00
Nicholas Cameron
ce6e97a312
Bug 951554. Add SurfaceMode::SURFACE_NONE. r=nical
...
--HG--
extra : rebase_source : 5854c7994dd861f36860756d10ef5b7ea35d863c
2014-01-13 08:54:36 +13:00
Ryan VanderMeulen
246f76ef57
Backed out changesets f0811650f2f7 and a67882c52c98 (bug 957790) for gtest failures.
...
CLOSED TREE
2014-01-13 11:22:47 -05:00
Ryan VanderMeulen
d8e43ac26b
Backed out changesets bfd0864f189d and dba042cbc381 (bug 877115) for Windows bustage.
...
CLOSED TREE
2014-01-13 10:46:09 -05:00
Kartikaya Gupta
66b3332e07
Bug 957790 - Initialize the APZC with zooming disabled until we know for sure if it is allowed. r=botond,jimm
...
On Metro we don't support the meta-viewport tag yet, so we need to re-enable
zooming there.
2014-01-13 09:55:19 -05:00
Kartikaya Gupta
b2d543135a
Bug 957790 - Remove a no-longer-used pref to disable async zooming in the APZ. r=jimm
2014-01-13 09:55:19 -05:00
Andreas Pehrson
29bb520f51
Bug 877115 - Moz2Dify CanvasLayerD3D10 drawing shared surface into D3D10_MAPPED_TEXTURE2D. r=nical
2014-01-13 15:27:02 +01:00
Andreas Pehrson
ad8030b08f
Bug 877115 - Moz2Dify CanvasLayerD3D9 drawing shared surface into D3DLOCKED_RECT. r=nical
2014-01-13 13:59:02 +01:00
Ali Akhtarzada
22923ea39e
Bug 958490 - Implement ImageContainer::Lock/GetAsCurrentSurface. r=nical
...
Added member functions GetCurrentAsSourceSurface and
LockCurrentAsSourceSurface to return a gfx::SourceSurface instead
of a gfxASurface.
Deprecated LockCurrentAsSurface and GetCurrentAsSurface
2014-01-15 10:06:43 -05:00
Ali Akhtarzada
2317024a4c
Bug 958489 - Implement base Image::GetAsSourceSurface. r=nical
...
Added an Image::GetAsSourceSurface to return a gfx::SourceSurface
and implemented in terms of gfxPlatform::GetSourceSurfaceForSurface.
Deprecated GetAsSurface.
2014-01-15 10:06:43 -05:00
Nick Lebedev
fdd089b63d
Bug 795567 - Part 5: Add zoom prevention based on the touch-action value. r=kats
2014-01-15 10:03:16 -05:00
Nick Lebedev
d4749b9941
Bug 795567 - Part 4: Rework apzc to wait for touch-action value from content as it waits for preventDefault value from listeners. r=kats
2014-01-15 10:03:15 -05:00
Nick Lebedev
3ca0140584
Bug 795567 - Part 3: Add panning restriction and retrieving of touch-action value to apzc. r=kats
2014-01-15 10:03:15 -05:00
Benoit Jacob
d7ea8e300c
Bug 950113 - Avoid destroying our texture everytime we composite a ImageHost - r=nical
2014-01-15 07:45:28 -05:00
Chris Lord
173f125b57
Bug 950993 - Fix async scrolling of fixed layers within scrollable sub-layers. r=roc
...
Fixed layers are relative to their nearest scrollable ancestor, so when we
encounter a scrollable layer in AlignFixedAndStickyLayers, reset the transform
and sub-tree root to start from that scrollable layer.
This fixes async scrolling of the fixed header in the Firefox marketplace on
B2G.
2014-01-15 12:15:50 +00:00
Benoit Jacob
06f7a9c4a2
Bug 958375 - 8/9 - Make remaining Moz2D enums typed - r=Bas
...
Specifically:
r=Bas for manual changes
f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:17 -05:00
Benoit Jacob
2d5774ca0a
Bug 958375 - 6/9 - Make BackendType and NativeSurfaceType typed enums - r=Bas
...
Specifically:
r=Bas for manual changes
f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:16 -05:00
Benoit Jacob
55e7c24065
Bug 958375 - 4/9 - Make SurfaceFormat a typed enum - r=Bas
...
Specifically:
r=Bas for manual changes
f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:16 -05:00
Benoit Jacob
14d864afaf
Bug 958369 - 5/5 - Make ContextType a typed enum - r=jgilbert
2014-01-10 13:55:24 -05:00
Benoit Jacob
6747f7385e
Bug 958369 - 3/5 - Make SharedTextureShareType and SharedTextureBufferType typed enums - r=jgilbert
2014-01-10 13:55:23 -05:00
Markus Stange
7231bd727d
Bug 958025 - Only enable GL_SCISSOR_TEST when we know that we have a useful scissor rect. r=bjacob
2014-01-09 17:59:32 +01:00
Mike Shal
5a313588a2
Bug 875013 - Remove VPATH in gfx/; r=joey
2014-01-07 17:50:44 -05:00
Daniel Holbert
88715a700a
Bug 957784: Mark gfx/layers as FAIL_ON_WARNINGS. r=nical
2014-01-09 06:26:28 -08:00
Daniel Holbert
09a24c070b
Bug 957904: Fix signed/unsigned comparison build warnings in CompositorD3D11.cpp. r=nrc
2014-01-09 06:26:20 -08:00
Daniel Holbert
534f8825cb
Bug 957858: Drop unnecessary 'switch' in CreateTextureHostBasic, to fix MSVC C4065 warning. r=nical
2014-01-09 06:26:20 -08:00
Daniel Holbert
0cb651be15
Bug 957884: Add return statement to default case in SurfaceFormatToDXGIFormat(), to address build warning. r=nical
2014-01-09 06:26:20 -08:00
Daniel Holbert
86745c02c5
Bug 957859: Add "f" suffix to some numeric literals in Compositor.cpp and ContainerLayerComposite.cpp, to fix MSVC C4305 warnings. r=nical
2014-01-09 06:26:19 -08:00
Daniel Holbert
e3bd2c412f
Bug 957783: Drop unused variable 'compositable' from CompositableParentManager::ReceiveCompositableUpdate. r=nical
2014-01-09 06:26:19 -08:00
Daniel Holbert
fc4254eb78
Bug 957499: Fix SetCompositor() signature in subclasses of NewTextureSource, to actually override the parent's impl (and to fix -Woverloaded-virtual build warnings). r=nical
2014-01-08 11:25:52 -08:00
Nicholas Cameron
9aca7bac0f
Bug 951556. Don't do multiple flushes due to DrawBufferWithRotation. r=mattwoodrow
2014-01-09 13:57:52 +13:00
Kartikaya Gupta
18d22a9961
Bug 907179 - Rewrite the displayport calculation to be simpler and more effective. r=botond
2014-01-08 17:55:33 -05:00
Kartikaya Gupta
d37ce54339
Bug 907179 - Label the velocity vector as being in screen units. r=botond
2014-01-08 17:53:58 -05:00
Markus Stange
6bacda007f
Bug 956266 - Don't rebuffer quad vertex + texture coordinates when drawing simple quads in CompositorOGL. r=nrc
2014-01-08 13:00:04 +01:00
Markus Stange
5085d2822a
Backing out changeset 1ff04cca465b (bug 956266) due to compilation failures on Android.
2014-01-08 11:36:13 +01:00
Markus Stange
d7c5f41aa5
Bug 956266 - Don't rebuffer quad vertex + texture coordinates when drawing simple quads in CompositorOGL. r=nrc
2014-01-08 10:31:07 +01:00
Nicholas Cameron
8afa9f73d5
Fix bustage from bug 933549 because I am an idiot who forgot to qref, on a CLOSED TREE
2014-01-08 14:21:56 +13:00
Nicholas Cameron
0c8a244237
Bug 933549. Change PaintState to use a DrawTarget instead of a gfxContext. r=mattwoodrow
2014-01-08 10:09:34 +13:00
Nicholas Cameron
fc1b2446d5
Bug 933549. Preqrequisites - Matrix::HasNonIntegerTranslation and SetAntialiasingFlags. r=mattwoodrow
2014-01-08 10:06:08 +13:00
Nicholas Cameron
2b06b385d4
backed out bug 933549 on a CLOSED TREE
2014-01-08 10:27:14 +13:00
Nicholas Cameron
b88a44ffc8
Bug 933549. Change PaintState to use a DrawTarget instead of a gfxContext. r=mattwoodrow
2014-01-08 10:09:34 +13:00
Nicholas Cameron
07fa557b71
Bug 933549. Preqrequisites - Matrix::HasNonIntegerTranslation and SetAntialiasingFlags. r=mattwoodrow
2014-01-08 10:06:08 +13:00
Benoit Jacob
8bd36836f4
Bug 956401 - 7/9 - CompositorOGL::{Begin,End}Frame do not need to touch the scissor rect - r=nrc
2014-01-07 15:02:19 -05:00
Benoit Jacob
e1001f9bd1
Bug 956401 - 6/9 - Remove Compositor::SaveState and Compositor::RestoreState - r=nrc
2014-01-07 15:02:19 -05:00
Benoit Jacob
e61b5e8193
Bug 956401 - 5/9 - Let DrawWindow{Under,Over}lay take care of saving and restoring GL state - r=nrc
2014-01-07 15:02:18 -05:00
Benoit Jacob
b94f17373c
Bug 956401 - 3/9 - Let DrawQuadInternal use ScopedScissorRect - r=nrc
2014-01-07 15:02:18 -05:00
Benoit Jacob
8a1c3fc36c
Bug 956401 - 1/9 - SetRenderTarget doesn't need to touch the scissor rect - r=nrc
2014-01-07 15:02:18 -05:00
Benoit Jacob
e9a9d5ea27
Bug 956141 - Move y-flipping feature out of GLContext, into CompositorOGL - r=jgilbert,nrc
2014-01-07 15:02:18 -05:00
Benoit Jacob
5867954198
Bug 950903 - 8/8 - Make CanvasLayerD3D10 not try to use ANGLE shared handles with WGL - r=jgilbert
2014-01-07 15:02:18 -05:00
Benoit Jacob
f820c67cd0
Bug 950903 - 6/8 - Remove GLContext::GetNativeData - r=jgilbert
2014-01-07 15:02:18 -05:00
Nicolas Silva
34dd5fed54
Bug 938591 - Fix a test on a CLOSED TREE. r=me
2014-01-07 19:00:26 +01:00
Nicolas Silva
844f4228e2
Bug 900244 - Implement the D3D9 specific TextureClients. r=nrc
2014-01-07 17:20:40 +01:00
Matt Woodrow
358d2369f8
Bug 900244 - Implement a shared D3D9 TextureClient. r=nical
2014-01-07 17:20:22 +01:00
Nicolas Silva
89a1de2117
Bug 938591 - Use texture flags in DataTextureSource + D3D9/11 fixes. r=nrc
2014-01-07 17:20:11 +01:00
Nicolas Silva
c13ae1926c
Bug 900244 - New D3D9 Textures for BufferTextures. r=nrc
2014-01-07 17:20:03 +01:00
Nicolas Silva
67f7bdeb1e
Bug 938591 - New D3D11 TextureClient/Host. r=nrc
2014-01-07 17:19:52 +01:00
Ryan VanderMeulen
62b4fec0e9
Backed out changeset 403ab3213879 (bug 893304) for bustage.
2014-01-07 10:07:32 -05:00
Morris Tseng
69820ceefc
Bug 893304 - Convert CanvasClient to new TextureClint/Host and replace SurfaceDescriptors with TextureClients inside SharedSurfaces. r=nical, r=snorp, r=jgilbert, r=bjacob
2014-01-07 09:58:03 -05:00
Kartikaya Gupta
9ae1485883
Bug 915985 - Refactoring to introduce a ZoomConstraints class. r=botond
2014-01-06 13:26:44 -05:00
Birunthan Mohanathas
c293ca84b8
Bug 784739 - Switch from NULL to nullptr in remaining directories; r=ehsan
...
--HG--
extra : rebase_source : 1ff19b2c8fd0e77fa8e822f5007a9fa3a6b6d474
2014-01-06 10:06:04 -05:00
Anthony Jones
3b3605ff77
Bug 951463 - Rename ClampRect to ForceInside; r=botond
2014-01-06 10:05:07 -05:00
Nicholas Nethercote
82b05b710d
Bug 955942 (part 2) - Remove MemoryUniReporter. r=mccr8.
...
--HG--
extra : rebase_source : 9d70016cb19637ffece6409a184bf41d574cc6b4
2013-12-07 22:09:10 -08:00
Benoit Jacob
8135029813
Bug 949347 - Temporary strong reference to the actor in case mActor might be nulled concurrently - r=nical
2014-01-02 17:54:13 -05:00
Alessandro Decina
b59ddbf399
Bug 952769 - Add explicit strides to YCbCrImageDataSerializer. r=nical
2014-01-02 10:50:14 -05:00
Benoit Jacob
4bf0659d81
Bug 949819 - Move remaining ReadPixels and GetTexImage helpers out of GLContext - r=jgilbert
2014-01-02 10:17:29 -05:00
Benoit Jacob
457cb85bb0
Bug 949814 - Remove GetEGLContext and GetLibraryEGL from GLContext - r=jgilbert
2014-01-02 10:17:25 -05:00
Benoit Jacob
77e2828333
Bug 945586 - Move GLReadTexImageHelper out of GLContext - r=jgilbert
2014-01-02 10:17:22 -05:00
Andreas Pehrson
2c6b1f5c4f
Bug 877115 - [Moz2Dify] Part 6. Moz2Dify SharedSurface_EGLImage::GetPixels. r=nical
2013-12-16 15:50:53 -05:00
Andreas Pehrson
3c4223ff5d
Bug 877115 - [Moz2Dify] Part 3. Change gfxIntSize to gfx::IntSize in GLContext::OffscreenSize and dependendent classes. r=nical
2013-12-10 17:11:58 +01:00
Ms2ger
9b8e245bf9
Bug 950143 - Remove the implicit conversion operator from nsIntSize to IntSize; r=roc
2013-12-31 10:06:12 +01:00
Robert O'Callahan
7df40b24c3
Bug 945203. Part 2: Fix bogus comment. r=mattwoodrow
...
--HG--
extra : rebase_source : a7ef13ff14808109b003a72a6e55b21014801bc0
2013-12-17 00:01:02 +13:00
Robert O'Callahan
0b88239e0f
Bug 945203. Part 1: Add Layers API to annotate layers with hit-test regions. r=kats
...
--HG--
extra : rebase_source : baa695c0d6104f620a5b45a83e5b230ef584abd9
2013-12-16 23:47:06 +13:00
Wes Kocher
6bc4f795b0
Merge inbound to m-c
2013-12-20 18:42:04 -08:00
Diego Wilson
c2ae3452cf
Bug 950800 - Honor Composer2D toggling on the fly. r=nrc
...
Now you can toggle the hardware composer on/off at any point without restarting B2G.
2013-12-17 09:01:39 -08:00
Nicolas Silva
c0a386612c
Bug 951218 - Fix a bug in AutoLockTextureHost. r=bjacob
2013-12-20 23:30:52 +01:00
Benoit Jacob
5790c973fd
Bug 949347 - reference-count TextureChild and have TextureClient hold on to it - r=nical,sotaro
2013-12-20 16:44:30 -05:00
Tor Arvid Lund
018c04cd13
Bug 950677 - Fix compile errors on Windows/FFOS builds. r=nical
...
The errors were discovered when running on the try server. Chose #include
in GrallocImages because there were problems with fwd declarations again.
2013-12-20 11:46:31 -05:00
Tor Arvid Lund
4476fdeea4
Bug 950677 - Change all remaining gfxIntSize -> IntSize refs. r=nical
2013-12-20 11:46:30 -05:00
Tor Arvid Lund
3263cb3c82
Bug 950677 - gfxIntSize -> IntSize in ThebesLayer* classes. r=nical
2013-12-20 11:46:30 -05:00
Tor Arvid Lund
9730e53aed
Bug 950677 - gfxIntSize -> IntSize for Texture* classes. r=nical
2013-12-20 11:46:30 -05:00
Tor Arvid Lund
7ca62e387f
Bug 950677 - gfxIntSize -> IntSize in ipc/Shadow* files. r=nical
2013-12-20 11:46:30 -05:00
Tor Arvid Lund
ad062d0b9d
Bug 950677 - gfxIntSize -> IntSize in ipc/ directory. r=nical
...
(Detail: Chose to put an #include for Point.h in a header instead of a
forward declaration because a fwd decl caused an "Already defined" error
and having neither fwd decl or #include caused another compile failure
saying IntSize was undefined)
2013-12-20 11:46:29 -05:00
Tor Arvid Lund
512fabebbf
Bug 950677 - More gfxIntSize -> IntSize changes in Layer* classes. r=nical
2013-12-20 11:46:29 -05:00
Tor Arvid Lund
0f9fdd2d39
Bug 950677 - Change gfxIntSize to gfx::IntSize in ImageContainer.h. r=nical
2013-12-20 11:46:29 -05:00
Tor Arvid Lund
88f20c01ba
Bug 950677 - Change gfxIntSize to gfx::IntSize in DirectX files. r=nical
2013-12-20 11:46:29 -05:00
Tor Arvid Lund
63ea87829c
Bug 950677 - Change gfxIntSize -> gfx::IntSize some places in layers/ipc. r=nical
2013-12-20 11:46:28 -05:00
Anthony Jones
68093fc158
Bug 952116 - Add mutex around APZC::CancelAnimation; r=kats
2013-12-20 09:58:24 +13:00
Randall Barker
155a01ed55
Bug 895358 - Part 2, Enable progressive tile rendering in B2G; r=BenWa,kats,Cwiiis
2013-12-19 12:19:25 -08:00
Nicolas Silva
1ff99ae9e0
Bug 951218 - Use RAII to unlock TextureHost. r=bjacob
2013-12-19 17:20:51 +01:00
Ryan VanderMeulen
b2d26bcc16
Merge m-c to inbound.
2013-12-18 21:28:22 -05:00
Ryan VanderMeulen
5abbd7ae72
Merge b2g-inbound to m-c.
2013-12-18 21:27:05 -05:00
Vivien Nicolas
689da9f8e1
Bug 951321 - [B2G][Messages] Create New Message button gets selected but does not open New Message page. r=kats
2013-12-19 01:12:47 +01:00
Vivien Nicolas
98328f91d5
Bug 951290 - [B2G] [Browser] The first swipe after zooming has no effect. r=kats
2013-12-19 01:12:47 +01:00
Benoit Jacob
40cfd97476
Bug 950203 - Let GfxInfo on Android create its own GL context to get GL strings, instead of waiting on the compositor's - r=jrmuizel
2013-12-18 15:49:13 -05:00
Markus Stange
4ce81395a5
Bug 951302 - Fix BasicCompositor handling of mask layers. r=mattwoodrow
2013-12-18 12:19:47 +01:00
Phil Ringnalda
315bb1c7fb
Back out 024623d015e9:fa1dd7e7aa22 (bug 895358) for Windows build bustage
...
CLOSED TREE
2013-12-17 23:36:05 -08:00
Randall Barker
e3b106bec9
Bug 895358 - Part 2, Enable progressive tile rendering in B2G; r=BenWa,kats,Cwiiis
2013-12-17 13:41:00 -08:00
Ryan VanderMeulen
9a9778b79a
Merge m-c to b2g-inbound.
2013-12-17 16:22:49 -05:00
Ryan VanderMeulen
2184455416
Merge b2g-inbound to m-c.
2013-12-17 16:17:49 -05:00
Kartikaya Gupta
7911d4daea
Bug 951256 - Dump the APZC guid in rendertrace output. r=Cwiiis
2013-12-17 15:20:21 -05:00
Kartikaya Gupta
f9ff7e3429
Bug 951256 - Add a GetGuid function with return value to APZC. r=Cwiiis
2013-12-17 15:20:20 -05:00
Kartikaya Gupta
95529e3ebf
Bug 950487 - Remove unnecessary UpdateCompositionBounds function on APZC. r=Cwiiis
2013-12-17 14:25:57 -05:00
Markus Stange
8ef9116036
Bug 951186 - Propagate the current compositor in ContentHostBase::UseTextureHost. r=nical
2013-12-17 17:11:14 +01:00
Chris Lord
2fab05a2c9
Bug 950696 - Cache the 'enable tiles' layers pref. r=bgirard
...
Rename layers.force-tiles to layers.enable-tiles and cache it with the other
layers prefs in gfxPlatform.
2013-12-17 14:02:16 +00:00
Ryan VanderMeulen
c8efa29df1
Backed out changeset 96b0ddfc63f7 (bug 893304) for causing bug 950589.
2013-12-16 22:49:02 -05:00
Alessandro Decina
89c3e4ffb9
Bug 928806 - Allow SharedPlanarYCbCrImage images to optionally have padding
...
Overload YCbCrImageDataSerializer.InitializeBufferInfo to take explicit plane
offsets. Make SharedPlanarYCbCrImage::SetDataNoCopy set the offsets based on the
Y, Cb and Cr plane pointers passed by the caller. r=nical
2013-12-16 17:33:47 -05:00
Chris Lord
5ed0aa176f
Bug 943846 - Don't constrain generated display-ports to composition bounds. r=kats
2013-12-16 17:33:30 -05:00
Kartikaya Gupta
831e00fbf5
Bug 949132 - Use the FrameMetrics flag on the layers update to update APZC scroll offset instead of tracking it in widget code. r=Cwiiis
2013-12-16 12:04:46 -05:00
Kartikaya Gupta
8109167828
Bug 949132 - Add a flag to FrameMetrics indicating a non-APZ scroll (original patch by mstange). r=tn
2013-12-16 12:04:45 -05:00
Matt Woodrow
7e4d69c48b
Bug 913503 - Update windowed plugin positions before we schedule a composite with OMTC. r=roc
2013-12-16 18:38:42 +13:00
Nicholas Cameron
09d8e541fe
Bug 950504. Remove MatrixForThebesMatrix. r=mattwoodrow
...
--HG--
extra : rebase_source : 77103221abbb55d23f9d399d4973ef0b8f269079
2013-12-16 11:17:58 +13:00
Phil Ringnalda
b50ac273d3
Back out e9ca04f323d0 (bug 928806) on suspicion of causing ASan and Linux debug gtest crashes
...
CLOSED TREE
2013-12-15 13:58:28 -08:00
Alessandro Decina
44a6b4da32
Bug 928806 - Allow SharedPlanarYCbCrImage images to optionally have padding. r=nical
...
Overload YCbCrImageDataSerializer.InitializeBufferInfo to take explicit plane
offsets. Make SharedPlanarYCbCrImage::SetDataNoCopy set the offsets based on the
Y, Cb and Cr plane pointers passed by the caller.
2013-12-15 14:06:14 -05:00
Kartikaya Gupta
b1616aec68
Bug 951320 - Use the composition bounds in CSS pixels when expanding the scrollable rect. r=k17e
2013-12-18 09:13:52 -05:00
Ryan VanderMeulen
832ea94fdc
Merge m-c to inbound.
2013-12-13 16:16:46 -05:00
Ryan VanderMeulen
62591c8121
Merge inbound to m-c.
2013-12-13 16:15:52 -05:00
Vivien Nicolas
de215e0940
Bug 949404 - Applications are half repainted once the keyboard is closed. r=Cwiiis
2013-12-13 18:23:47 +01:00
Morris Tseng
d39f34dbbd
Bug 893304 - Convert CanvasClient to new TextureClient/Host. r=nical, r=snorp, r=jgilbert
2013-12-13 12:45:13 -05:00
Tor Arvid Lund
a8c09b0aa0
Bug 929513 - Fix compile errors on Windows/Android r=nical
...
Forgot an include in the ImageLayerD3D9.cpp file (though I am unable to
reproduce the issue on my own windows installation).
Also seems in my previous attempt to fix the build, I introduced a
breakage for Android. Hopefully this will fix things.
2013-12-13 18:32:10 +01:00
Tor Arvid Lund
1fb97ff74a
Bug 929513 - Replace gfxIntSize in layers/AutoOpenSurface.h r=nical
...
This rippled into other replacements in layers and in gfx/gl.
2013-12-13 18:32:06 +01:00
Tor Arvid Lund
af7e76f848
Bug 929513 - Replace some instances of gfxIntSize with gfx::IntSize r=nical
2013-12-13 18:32:02 +01:00
Tor Arvid Lund
b50cf641f1
Bug 929513 - Add YCbCrUtils class and change gfxIntSize in BasicCompositor r=nical
...
The purpose of this patch is to replace usages of gfxIntSize with
gfx::IntSize in BasicCompositor.
The new class YCbCrUtils has two methods ported from gfxUtils in thebes.
BasicCompositor now uses these methods instead of the ones in gfxUtils.
Also changed gfxIntSize to gfx::IntSize and gfxImageFormat to
gfx::SurfaceFormat.
2013-12-13 18:31:57 +01:00
Tor Arvid Lund
a98f5ad615
Bug 929513 - Change gfxSize references to gfx::Size r=nical
2013-12-13 18:31:53 +01:00
Tor Arvid Lund
0894e1269d
Bug 929513 - Remove unused #include statements r=nical
2013-12-13 18:31:35 +01:00
Chris Lord
55e846c259
Bug 936500 - Don't copy Axis when creating a FlingAnimation. r=kats
...
FlingAnimation was, likely accidentally, creating copies of the axes it was
animating and operating on those, which lead to problems when displayports
were calculated based on the original copies which housed old values.
2013-12-13 19:37:42 +00:00
Benoit Girard
ecabcc60cf
Bug 941095 - Part 2: Disable subpixelaa + component alpha. r=mattwoodrow
...
--HG--
extra : rebase_source : 7e3a0d3710fb29b47615cc0254135d3b44637ed8
2013-12-13 13:53:18 -05:00
Wes Kocher
aa49cfcd54
Merge inbound to m-c
2013-12-12 19:12:51 -08:00