Commit Graph

170 Commits

Author SHA1 Message Date
Mathias Agopian
18d8446fe1 cleanup, remove unused fields. Also make sure that we don't systematically allocate a Surface in Surface.java if only a SurfaceControl is needed (Common case). 2009-04-16 20:30:22 -07:00
Mathias Agopian
01b766839e more splitting of Surface/SurfaceControl. Surface.java is now implemented in terms of Surface and SurfaceControl.
The WindowManager side of Surface.java holds a SurfaceControl, while the client-side holds a Surface. When the client is in the system process, Surface.java holds both (which is a problem we'll try to fix later).
2009-04-16 20:04:08 -07:00
Mathias Agopian
62185b7335 split Surface.cpp into Surface and SurfaceControl
SurfaceControl is used for controling the geometry of the surface (for the WM), while Surface is used to access the buffers (for SF's clients).
SurfaceFlingerClient now uses the SurfaceID instead of Surface*.

Currently Surface still has the SurfaceControl API and is implemented by calling into SurfaceControl.
2009-04-16 16:19:50 -07:00
Mathias Agopian
62b74444be fix a few typos in comments. this is really intended as a git pull/push test. 2009-04-16 12:29:34 -07:00
Mathias Agopian
40b7f6e043 fix some issues with Surface's lifetime management.
To deal with Java's lack of destructors and delayed garbage collection, we used to duplicate Surface.cpp objects in some case; this caused some issues because Surface is supposed to be reference-counted and unique.
2009-04-16 12:29:34 -07:00
Mathias Agopian
4243e66621 fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off.
Squashed commit of the following:

commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5
Author: Mathias Agopian <mathias@google.com>
Date:   Wed Apr 15 18:30:30 2009 -0700

    fix and improve BufferMapper's tracking of mapped buffers.

commit 1a8deaed15811092b2349cc3c40cafb5f722046c
Author: Mathias Agopian <mathias@google.com>
Date:   Wed Apr 15 00:52:02 2009 -0700

    fix some bugs with the Singleton<> class. untested.

commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8
Author: Mathias Agopian <mathias@google.com>
Date:   Tue Apr 14 19:29:25 2009 -0700

    some work to debug the Singleton<> template.
2009-04-15 18:34:24 -07:00
Mathias Agopian
4cf74ac30a Merge commit 'goog/master' into merge_master 2009-04-14 15:21:33 -07:00
Mathias Agopian
0a2b2b905f Merge commit 'goog/master_gl' into merge_master 2009-04-14 14:56:34 -07:00
Mathias Agopian
83d184a299 Merge commit 'goog/master' into merge_master 2009-04-14 14:45:37 -07:00
Yu Shan Emily Lau
7b624ffa05 Merge branch 'readonly-p4-master' 2009-04-14 14:33:23 -07:00
Dan Bornstein
a2aef005fc Merge branch 'readonly-p4-master' 2009-04-14 12:42:22 -07:00
Brett Chabot
7d6daac1a1 Merge branch 'readonly-p4-master' 2009-04-14 12:39:37 -07:00
Lorenzo Colitti
4680ab625f Merge branch 'readonly-p4-master' 2009-04-14 12:10:26 -07:00
Leon Scroggins
56eccb2855 Merge commit 'goog/master' 2009-04-14 12:06:19 -07:00
Android (Google) Code Review
11b61b471f Merge change 79
* changes:
  Squashed commit of the following:
2009-04-14 11:54:14 -07:00
Leon Scroggins
b52d5323ea Merge branch 'readonly-p4-master' 2009-04-14 11:07:14 -07:00
Jack Palevich
8f75e091d9 Add clarifying comment.
(Primarily as a test of the master_gl branch.)
2009-04-13 22:03:39 -07:00
Jack Palevich
08a305b8f7 Merge commit 'goog/master' into HEAD 2009-04-13 19:52:45 -07:00
Jeffrey Sharkey
cdda14a60c Merge branch 'readonly-p4-master' 2009-04-13 16:58:42 -07:00
Dianne Hackborn
7a8e25ab11 Merge branch 'readonly-p4-master' 2009-04-13 16:55:10 -07:00
Dirk Dougherty
c11ebc3cd3 Merge branch 'readonly-p4-master' 2009-04-13 16:52:33 -07:00
Dianne Hackborn
75d2f0da2c Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
2f6d881687 AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Mathias Agopian
efffa67bf9 Merge commit 'goog/master' into master_gl 2009-04-13 14:31:08 -07:00
Grace Kloba
6c7aa8d6b8 Merge branch 'readonly-p4-master' 2009-04-13 14:05:40 -07:00
Patrick Scott
bcf27e3ee8 Merge branch 'readonly-p4-master' 2009-04-13 09:59:09 -07:00
Mathias Agopian
8b765b7f5e more debugging tools around BufferMapper 2009-04-10 20:34:46 -07:00
Mathias Agopian
2b2fb1a693 fix KeyedVector::replaceValueAt, which wouldn't even compile if used. 2009-04-10 20:27:25 -07:00
Feng Qian
26945b419b Merge branch 'readonly-p4-master' 2009-04-10 18:12:55 -07:00
Mathias Agopian
0308739d0b Merge commit 'goog/master' into master_gl
Conflicts:
	libs/utils/Parcel.cpp
2009-04-10 14:36:33 -07:00
Mathias Agopian
076b1cc3a9 Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00
Jack Palevich
34a85cc7c0 Merge branch 'readonly-p4-master' 2009-04-09 19:54:37 -07:00
Jack Palevich
eafa04c90d Merge branch 'readonly-p4-master' 2009-04-09 19:41:44 -07:00
Fred Quintana
002c054d61 Merge branch 'readonly-p4-master' 2009-04-09 15:07:04 -07:00
Jack Palevich
8386075e62 Merge branch 'readonly-p4-master' 2009-04-09 15:04:22 -07:00
Jack Palevich
3986a024cf Merge branch 'readonly-p4-master' 2009-04-09 14:55:24 -07:00
Eric Fischer
ec2d5b75a2 Merge branch 'readonly-p4-master' 2009-04-09 14:33:10 -07:00
Nick Pelly
078edfb6ba Merge branch 'readonly-p4-master' 2009-04-08 19:24:05 -07:00
Romain Guy
82734d92a0 Merge branch 'readonly-p4-master' 2009-04-08 19:21:21 -07:00
Fred Quintana
57fb1cba52 Merge branch 'readonly-p4-master' 2009-04-08 19:16:09 -07:00
Android (Google) Code Review
d83eaa0d31 Merge change 54
* changes:
  Revert "Enable OpenCORE on master - part 1"
2009-04-08 17:02:55 -07:00
Android (Google) Code Review
f968f2de31 Merge change 53
* changes:
  Revert "Changes required to accommodate OpenCORE 2.0"
2009-04-08 16:59:58 -07:00
Cynthia Wong
5ef76a0245 Merge branch 'readonly-p4-master' 2009-04-08 13:33:32 -07:00
Fred Quintana
4248a4e776 Merge branch 'readonly-p4-master' 2009-04-08 00:39:52 -07:00
Andy McFadden
e9e210781e Merge branch 'readonly-p4-master' 2009-04-08 00:37:08 -07:00
Eric Fischer
fb21b9565e Merge branch 'readonly-p4-master' 2009-04-08 00:31:50 -07:00
Dave Sparks
ab14b7f8e1 Merge branch 'readonly-p4-master' 2009-04-06 18:41:07 -07:00
Wink Saville
76e9b15b00 Merge branch 'readonly-p4-master' 2009-04-06 15:24:36 -07:00
Jaikumar Ganesh
260f6c7431 Merge branch 'readonly-p4-master' 2009-04-06 13:42:57 -07:00
Mike Lockwood
29932391ac Merge branch 'readonly-p4-master' 2009-04-06 10:53:41 -07:00