OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
35e9fa4
cb2de71
)
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
author
Elliott Hughes
<enh@google.com>
Mon, 17 Oct 2011 18:32:08 +0000
(11:32 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 17 Oct 2011 18:32:08 +0000
(11:32 -0700)
1
2
include/surfaceflinger/ISurfaceComposer.h
patch
|
diff1
|
diff2
|
blob
|
history
services/surfaceflinger/Layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/surfaceflinger/SurfaceFlinger.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/surfaceflinger/SurfaceFlinger.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/surfaceflinger/ISurfaceComposer.h
Simple merge
diff --cc
services/surfaceflinger/Layer.cpp
Simple merge
diff --cc
services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc
services/surfaceflinger/SurfaceFlinger.h
index
3c8f4e5
,
eabcc9d
..
1490dec
---
1
/
services/surfaceflinger/SurfaceFlinger.h
---
2
/
services/surfaceflinger/SurfaceFlinger.h
+++ b/
services/surfaceflinger/SurfaceFlinger.h
@@@
-46,10
-46,8
+46,9
@@@
namespace android
class Client;
class DisplayHardware;
- class FreezeLock;
class Layer;
class LayerDim;
+class LayerScreenshot;
struct surface_flinger_cblk_t;
#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true ))