Commit Graph

2320 Commits

Author SHA1 Message Date
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