Commit Graph

2372 Commits

Author SHA1 Message Date
Kartikaya Gupta
9b2fc07177 Bug 890932 - Make AsyncPanZoomController::mMonitor re-entrant to reduce code madness. r=BenWa 2013-07-31 08:53:16 -04:00
Ryan VanderMeulen
25d01011bd Backed out changeset 6846b610be41 (bug 897409) for suspicion of making Win8 mochitest-mc perma-orange. 2013-07-30 22:28:46 -04:00
Ryan VanderMeulen
2ebd22d781 Merge m-c to inbound. 2013-07-30 18:08:18 -04:00
Nicholas Cameron
841a60fca7 Bug 897839. Add some null checks for the compositor map. r=mattwoodrow 2013-07-31 09:45:42 +12:00
Nicholas Cameron
ddb4a0b4c4 Bug 897409. Use a temporary surface instead of forcing image surfaces. r=mattwoodrow 2013-07-31 09:45:31 +12:00
Timothy Nikkel
a6c655a9fe Bug 899730. Part 2. Use nsIntRegion::Area in layers and get rid of the unneeded GetRegionArea function that does the same. r=nrc 2013-07-30 16:10:32 -05:00
Kartikaya Gupta
b285a3bbc5 Bug 866232 - Fix build breakage introduced in f69d34718660. r=me 2013-07-30 14:55:57 -04:00
Kartikaya Gupta
8a21c3e5f3 Bug 866232 - Break assumption of a single global root layer tree. r=BenWa, mattwoodrow 2013-07-30 14:03:43 -04:00
Kartikaya Gupta
e0f930eb52 Bug 866232 - Only fire mozbrowserasyncscroll events on the top-level scrollable for backwards compatibility. r=BenWa 2013-07-30 14:03:42 -04:00
Kartikaya Gupta
6c95b81e60 Bug 866232 - Update and re-enable the test for hit detection in the APZC tree. r=BenWa 2013-07-30 14:03:41 -04:00
Kartikaya Gupta
01acbedef2 Bug 866232 - Add visible region tracking and hit-testing code for APZCTreeManager. r=BenWa, mattwoodrow 2013-07-30 14:03:41 -04:00
Kartikaya Gupta
2435f93954 Bug 866232 - Extract a GetCurrentAsyncTransform method in APZC. r=BenWa 2013-07-30 14:03:41 -04:00
Kartikaya Gupta
f079210b22 Bug 866232 - Some documentation/variable renaming cleanup. r=BenWa 2013-07-30 14:03:40 -04:00
Kartikaya Gupta
28585ff1be Bug 866232 - Add code to build the APZC tree on layer updates. r=BenWa, mattwoodrow 2013-07-30 14:03:40 -04:00
Kartikaya Gupta
5c723f09e5 Bug 866232 - Add an APZCTreeManager to encapsulate the multiple APZCs corresponding to a given layer tree. r=BenWa, mattwoodrow 2013-07-30 14:03:40 -04:00
Kartikaya Gupta
205f0b42a0 Bug 866232 - Add support for delaying APZC creation until the layer update. r=BenWa 2013-07-30 14:03:40 -04:00
Kartikaya Gupta
d054dd92d3 Bug 866232 - Guard some APZC fields by a lock so they can be nulled out from the compositor thread. r=BenWa 2013-07-30 14:03:39 -04:00
Kartikaya Gupta
1704ae2ddf Bug 866232 - Move around code in APZC to more easily allow creating it on the compositor thread. r=BenWa 2013-07-30 14:03:39 -04:00
Kartikaya Gupta
0655a3142d Bug 866232 - Reserve a layer tree id for the root layer tree. r=BenWa 2013-07-30 14:03:38 -04:00
Nicolas Silva
5ec3fda767 Bug 858914 - New texture classes + OGL backend (preffed off). r=bas, nrc 2013-07-30 11:59:51 +02:00
David Zbarsky
82250218e6 Backout 40683014a638 for causing mochitest orange 2013-07-29 21:11:01 -07:00
David Zbarsky
b2cb1b3e43 Bug 895116: Lock the mask texture before compositing with BasicCompositor r=bas 2013-07-29 16:04:09 -07:00
David Zbarsky
3b2bbf2c84 Bug 898105 - Remove nsIDOMTouch r=reuben 2013-07-29 16:04:09 -07:00
Ehsan Akhgari
5ee21d6d3f Bug 895322 - Part 1: Replace the usages of MOZ_STATIC_ASSERT with C++11 static_assert; r=Waldo
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:

# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.mm" \) | \
    xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
                   media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
                   modules/libmar/src/mar_private.h \
                   modules/libmar/src/mar.h


# assert_replacer.py
#!/usr/bin/python

import sys
import re

pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")

def replaceInPlace(fname):
  print fname
  f = open(fname, "rw+")
  lines = f.readlines()
  for i in range(0, len(lines)):
    while True:
      index = re.search(pattern, lines[i])
      if index != None:
        index = index.start()
        lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
        for j in range(i + 1, len(lines)):
          if lines[j].find("                 ", index) == index:
            lines[j] = lines[j][0:index] + lines[j][index+4:]
          else:
            break
      else:
        break
  f.seek(0, 0)
  f.truncate()
  f.write("".join(lines))
  f.close()

argc = len(sys.argv)
for i in range(1, argc):
  replaceInPlace(sys.argv[i])

--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
2013-07-18 13:59:53 -04:00
Bas Schouten
89fedaea2e Bug 877700: Limit the Source region to the area of the parent layer surface. r=roc 2013-07-29 10:35:48 +00:00
Nicholas Cameron
a344f7194c Bug 756606. Add LockDrawTarget to shmem texture clients. r=Bas 2013-07-29 10:12:37 +12:00
Ryan VanderMeulen
bc61d30573 Merge m-c to inbound. 2013-07-25 21:59:02 -04:00
Ed Morley
817db8cfd2 Merge mozilla-central and birch 2013-07-25 17:05:50 +01:00
Michael Wu
08e5ed7e9c Bug 895417 - Fix refpoint coordinates sent to child processes, r=kats 2013-07-24 21:49:49 -04:00
Peter Chang
416da61282 Bug 894262 - Merge GonkIOSurfaceImage to GrallocImage, r=nical, kanru 2013-07-25 10:13:35 +08:00
Ryan VanderMeulen
4089fb5f64 Merge m-c to inbound. 2013-07-24 18:27:51 -04:00
Ryan VanderMeulen
d19fb9ee63 Backed out changeset d264bdb8b400 (bug 884188). 2013-07-24 11:15:47 -04:00
Nicolas Silva
5d2089d328 Bug 858914 - Mark some Image related classes deprecated. r=jrmuizel DONTBUILD 2013-07-24 18:08:35 +02:00
Nicolas Silva
7a55cdf819 Backed out changeset 9089fe288899 2013-07-24 18:01:39 +02:00
Nicolas Silva
a6bf10f5a6 Bug 868914 - Mark some Image related classes deprecated. r=jrmuizel 2013-07-24 17:43:35 +02:00
Nicolas Silva
93faf1e0b6 Bug 858914 - Make CreateTexturedEffect take SurfaceFormat + TextureSource instead of TextureHost. r=Bas 2013-07-24 17:34:09 +02:00
Nicholas Cameron
f86278893f Bug 895369. Add some asserts to ThebesLayerBuffer. r=mattwoodrow 2013-07-24 18:46:27 +12:00
Jim Chen
c16d2bf628 Bug 881018 - Crash when TiledLayerBuffer::GetScaledTileLength returns 0; r=cwiiis 2013-07-24 11:17:49 -04:00
Jim Chen
eb22575f8c Backout f26e4c26ce4a (bug 881018) to land a different patch 2013-07-24 11:10:55 -04:00
David Zbarsky
4ad468f754 Bug 895116: Fix masking with BasicCompositor r=mattwoodrow 2013-07-23 16:38:46 -07:00
Bill McCloskey
a41affaec0 Bug 896651 - Need to clean up resources for out-of-process layer trees when shutting down (r=mattwoodrow) 2013-07-23 14:53:22 -07:00
Botond Ballo
f1334508a1 Bug 895904 - Hook up NativePanZoomController.abortAnimation(). r=kats 2013-07-23 16:41:22 -04:00
Brian R. Bondy
4e2819f011 Bug 869940 - Fix scaling issue with high dpi devices. r=kats 2013-07-25 13:15:10 -04:00
Brian R. Bondy
821930e929 Bug 869940 - Implement pan start/end notifications from APZC. r=kats 2013-07-25 13:15:06 -04:00
Ehsan Akhgari
9854ac6166 Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted 2013-07-30 10:25:31 -04:00
Joshua Cranmer
7b9a04da79 Bug 884061 - Part 4: Remove nsAtomicRefcnt.h, r=jlebar
--HG--
extra : rebase_source : ce24ab345baa48104328e3c101b7266a31e81870
2013-07-11 15:21:45 -05:00
Joshua Cranmer
3913605515 Bug 884061 - Part 3i: Use NS_DECL_THREADSAFE_ISUPPORTS in gfx/, r=roc
--HG--
extra : rebase_source : 130357bc9a7ad66cb0574f7bf3ac69e1c3f4a2ff
2013-07-18 21:23:31 -05:00
Botond Ballo
a0929ab998 Bug 859929 - Make AsyncPanZoomController work with progressive tile painting on Fennec. r=kats 2013-07-22 22:33:05 -04:00
Nicholas Cameron
910d7fc289 Bug 756606. Implement CreateRenderTargetFromSource. r=Bas 2013-07-23 11:07:49 +12:00
Nicholas Cameron
5664deab18 Bug 756606. Fix a bug in EnsureAllocated. r=Bas 2013-07-23 11:05:49 +12:00
Nicholas Cameron
4a6edeaac3 Bug 756606; formatting nits for the d3d11 compositor. r=Bas 2013-07-23 11:05:04 +12:00
Ed Morley
fc0be15eff Merge mozilla-central and inbound 2013-07-22 16:52:23 +01:00
Ed Morley
80f7935e32 Merge latest green birch changeset and mozilla-central 2013-07-22 16:18:53 +01:00
Birunthan Mohanathas
5193af55cb Bug 784739 - Switch from NULL to nullptr in gfx/layers/; r=ehsan
--HG--
extra : rebase_source : d6b0d229e1bdbe53c515b13c73c7b53839d9c756
2013-07-20 11:48:55 +03:00
Birunthan Mohanathas
cf059676d8 Bug 784739 - Switch from NULL to nullptr in gfx/layers/opengl/; r=joe
--HG--
extra : rebase_source : 65e2c8e72dc4b20ef9aa50688c9320792fca69ee
2013-07-20 11:48:55 +03:00
Birunthan Mohanathas
5a59472284 Bug 784739 - Switch from NULL to nullptr in gfx/layers/ipc/; r=ehsan
--HG--
extra : rebase_source : 36cb1b9738de269a10cea871242b0b51588d0f3b
2013-07-20 11:48:55 +03:00
Birunthan Mohanathas
84633c986a Bug 784739 - Switch from NULL to nullptr in gfx/layers/d3d9/; r=ehsan
--HG--
extra : rebase_source : 6628eb59eef0bb828fbcff03ad967f7fc97c437d
2013-07-20 11:48:55 +03:00
Birunthan Mohanathas
45a3cfdfe3 Bug 784739 - Switch from NULL to nullptr in gfx/layers/d3d11/; r=ehsan
--HG--
extra : rebase_source : 9e5625a5318cfb79370c6e944bc9e651822ddd2c
2013-07-20 11:48:55 +03:00
Birunthan Mohanathas
fa1f5f8f3a Bug 784739 - Switch from NULL to nullptr in gfx/layers/d3d10/; r=ehsan
--HG--
extra : rebase_source : 69b7ab7e4aa0eed92d597451bcab820f9d5c3957
2013-07-20 11:48:55 +03:00
Birunthan Mohanathas
975971914b Bug 784739 - Switch from NULL to nullptr in gfx/layers/composite/; r=ehsan
--HG--
extra : rebase_source : c0f144ec277ed64f32c584f1be9e38bac3d1dde3
2013-07-20 11:48:55 +03:00
Chris Lord
f6b2427db2 Bug 886298 - Convert Layers fixed position margins to typed units. r=kats 2013-07-22 09:50:13 +01:00
Chris Lord
28526bfea8 Bug 886298 - Convert Layers fixed position anchor to typed units. r=kats 2013-07-22 09:50:09 +01:00
Chris Lord
29a13bb097 Bug 876542 - Restore async pan/zoom compensation behaviour during overscroll. r=roc
Bug 876542 introduces a patch that reworks how we maintain the position of
fixed position layers, but didn't handle overscroll/zoom. This restores the old
behaviour in this situation.
2013-07-22 09:50:07 +01:00
Chris Lord
f84974d92e Bug 876542 - Restore async fixed layer margin animation. r=roc, kats
Restore the reconciliation between content document fixed position margins at
render time and the fixed layer margins as retrieved via SyncViewportInfo
during async panning/zooming.
2013-07-22 09:50:05 +01:00
David Zbarsky
dddbaab009 Bug 895116: CreateBasicDeprecatedTextureHost should pass along the texture flags r=mattwoodrow 2013-07-21 04:16:28 -07:00
Jed Davis
7b3fcaeb64 Bug 895722 - Don't remove elements from mDurations if it's empty. r=BenWa 2013-07-19 21:20:11 -04:00
James Willcox
7fd84b7bf9 Bug 894405 - fix leaks on a CLOSED TREE
--HG--
extra : rebase_source : d96236c0c9c370bdb055d3ab197707d48f8afe80
2013-07-19 00:23:07 -04:00
Matt Woodrow
d73002e288 Bug 894891 - Follow-up to fix bustage, remove unused shader from the enum. CLOSED TREE 2013-07-19 00:10:21 -04:00
Matt Woodrow
1acb6b69b1 Bug 885580 - Make sure that Compositor::GetBackend is only used [Cfrom the compositor thread. r=nical 2013-06-27 11:30:52 +12:00
Matt Woodrow
49016db6ea Bug 889515 - Get rid of static sCompositorParent. r=nical 2013-07-11 22:32:09 -04:00
Matt Woodrow
24fa947ddd Bug 894891 - Move texture transform from the RGBATextureLayerExternal shader into the vertex shader, and combine the two GL_TEXTURE_EXTERNAL shaders. r=jrmuziel 2013-07-18 23:05:06 -04:00
Matt Woodrow
e06d326e2e Bug 894891 - Use the correct shader for b2g video. r=nrc 2013-07-18 23:05:06 -04:00
James Willcox
ca9e13ffe2 Bug 894405 - Ref GLContext before sending SurfaceStream to compositor r=jgilbert 2013-07-17 13:03:18 -04:00
Robert O'Callahan
984f6e94b7 Bug 876542. Rework TransformFixedLayers so that it explicitly makes layer anchor points invariant under a change in transform of a specified ancestor layer. r=Cwiiis,kats 2013-06-24 13:34:33 +12:00
Ryan VanderMeulen
0439786998 Merge m-c to inbound on a CLOSED TREE. 2013-07-18 14:53:05 -04:00
Ryan VanderMeulen
b334e7b67e Merge m-c to birch. 2013-07-18 14:47:54 -04:00
Jim Chen
71c4cb2664 Bug 881018 - Save TiledLayerBuffer::mResolution to stack to help investigate crash; r=kats 2013-07-18 01:52:38 -04:00
Matt Woodrow
7be2e2face Bug 886667 - Just assert rather than aborting when our framebuffer is invalid. r=jrmuizel 2013-07-16 15:56:10 -04:00
Sotaro Ikeda
66da86c2df Bug 873937 - Extend ThebesLayerBuffer's height to more than 32. r=jmuizelaar 2013-07-18 10:06:46 -04:00
Gabriele Svelto
93c7102266 Bug 884188 - Resize small gralloc'd surfaces to work around issues when drawing small canvases on certain devices. r=nrc 2013-07-17 17:04:33 +02:00
Ed Morley
40e230f211 Merge mozilla-central and inbound 2013-07-18 15:01:47 +01:00
Ryan VanderMeulen
86c2efaa9c Backed out changeset b86c8fc67f5b (bug 873937) for causing bug 895976. 2013-07-19 21:12:18 -04:00
David Zbarsky
9df04c60e4 Bug 895116: Use an ImageSurface in CanvasClient2DUpdate r=mattwoodrow 2013-07-17 23:54:09 -07:00
Markus Stange
edd86aaba1 Bug 894925 - Hold a strong ref to the ImageContainer between DispatchImageClientUpdate and UpdateImageClientNow. r=nical 2013-07-18 08:33:28 +02:00
Matt Woodrow
2dbeb3919b Bug 888048 - Use CreateThebesSurfaceAliasForDrawTarget_hack to avoid having multiple cairo_surface_quartz objects for a single CGContext. r=nrc 2013-07-17 23:24:15 -04:00
Matt Woodrow
bab9f61a38 Bug 875232 - Add a BGRX shader program that reads from GL_TEXTURE_RECTANGLE. r=jrmuziel 2013-07-17 23:24:15 -04:00
Matt Woodrow
c30d4b7957 Bug 875232 - Add SharedSurface_IOSurface for sharing textures on OSX. r=jgilbert 2013-07-17 23:24:15 -04:00
Matt Woodrow
749d37fb57 Bug 875232 - Make alpha channel optional for MacIOSurface. r=BenWa 2013-07-17 23:24:14 -04:00
Chris Lord
023cccd339 Bug 869696 - Disable gralloc surfaces on the Geeksphone Peak. r=jrmuizel
Geeksphone distribute a known bad driver that has issues when using
gralloc-backed surfaces. Performance is much better just falling back to
shared memory.
2013-07-17 15:34:52 +01:00
Brian O'Keefe
a2b1403eb0 Bug 883502 - Part 1: Move 'chromium_config.mk' includes after rules.mk. r=gps 2013-07-04 08:28:43 -04:00
Ryan VanderMeulen
2cca46b24a Merge m-c to birch. 2013-07-12 13:31:17 -04:00
Oleg Romashin
36710b81bc Bug 889241 - ASSERTION: Invalid (negative) scale factor: 'sy >= 0.0'. r=ncameron 2013-07-12 09:24:23 -04:00
Benoit Girard
5b43ee14ca Bug 892861 - Remove useless -D flags 'IMPL_THEBES,_IMPL_NS_GFX,...'. r=glandium 2013-07-12 08:56:54 -04:00
Trevor Saunders
82e5558b37 bug 887483 - remove a bunch of useless assignments to FORCE_STATIC_LIB implied by LIBXUL_LIBRARY=1 r=mshal 2013-07-11 11:06:34 -04:00
Phil Ringnalda
6cf5385d49 Back out cb34d80e6fc8 (bug 889515) for 10.6 assertions
CLOSED TREE
2013-07-11 21:24:20 -07:00
Matt Woodrow
be6f6eea10 Bug 889515 - Get rid of static sCompositorParent. r=nical 2013-07-11 22:32:09 -04:00
Peter Chang
439cf8afa8 Bug 885345 - HwcComposer2D doesn't render Camera or Video frames. r=nrc
Correct the buffer validation inside GetRenderState() to pass gralloc
buffer to composer module
2013-07-12 09:06:26 -04:00
Ed Morley
66290a8f00 Backed out changeset 512a1fd86008 (bug 892285) for failures in invalidation/test-animated-image-layers.html 2013-07-12 10:10:48 +01:00
Michael Wu
de6d0c0859 Bug 892285 - Only unlock gralloc surfaces if they were locked, r=bas 2013-07-12 01:52:37 -04:00
Botond Ballo
57876356d6 Bug 891544 - Remove unneeded FromUnknownPoint and FromUnknownRect calls. r=kats 2013-07-11 10:43:35 -04:00