firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename createsNewDisplayList to requiresCompositing

Browse Source 
This patch prepares for introducing the compositing system by repurposing the
relevant parts of the createsNewDisplayList system. This patch also removes the
no-longer-relevant parts of that system.
This commit is contained in:
Adam Barth 2015-08-13 12:43:39 -07:00
parent 45be4c6faf
commit be8454073a
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/flutter/lib/rendering/object.dart
View File

@ -36,15 +36,10 @@ class PaintingContext {
PaintingContext(this.canvas); PaintingContext(this.canvas);
List<RenderObject> _descendentsWithPaintingCanvases = new List<RenderObject>(); // used by RenderObject._updatePaintingCanvas() to find out which RenderObjects to ask to paint
void paintChild(RenderObject child, Point point) { void paintChild(RenderObject child, Point point) {
if (child.createNewDisplayList) { // TODO(abarth): Support compositing.
assert(!_descendentsWithPaintingCanvases.contains(child)); assert(!child.requiresCompositing);
_descendentsWithPaintingCanvases.add(child); child._paintWithContext(this, point.toOffset());
canvas.drawPaintingNode(child._paintingNode, point);
} else {
child._paintWithContext(this, point.toOffset());
}
} }
} }
@ -320,11 +315,6 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
static List<RenderObject> _nodesNeedingPaint = new List<RenderObject>(); static List<RenderObject> _nodesNeedingPaint = new List<RenderObject>();
final sky.PaintingNode _paintingNode = new sky.PaintingNode();
sky.PaintingNode get paintingNode {
assert(createNewDisplayList);
return _paintingNode;
}
bool _needsPaint = true; bool _needsPaint = true;
bool get needsPaint => _needsPaint; bool get needsPaint => _needsPaint;
@ -332,7 +322,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(!debugDoingPaint); assert(!debugDoingPaint);
if (!attached) return; // Don't try painting things that aren't in the hierarchy if (!attached) return; // Don't try painting things that aren't in the hierarchy
if (_needsPaint) return; if (_needsPaint) return;
if (createNewDisplayList) { if (requiresCompositing) {
_needsPaint = true; _needsPaint = true;
_nodesNeedingPaint.add(this); _nodesNeedingPaint.add(this);
scheduler.ensureVisualUpdate(); scheduler.ensureVisualUpdate();
@ -355,7 +345,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
_nodesNeedingPaint = new List<RenderObject>(); _nodesNeedingPaint = new List<RenderObject>();
for (RenderObject node in dirtyNodes..sort((a, b) => a.depth - b.depth)) { for (RenderObject node in dirtyNodes..sort((a, b) => a.depth - b.depth)) {
if (node._needsPaint && node.attached) if (node._needsPaint && node.attached)
node._updatePaintingCanvas(); node._repaint();
}; };
assert(_nodesNeedingPaint.length == 0); assert(_nodesNeedingPaint.length == 0);
} finally { } finally {
@ -364,9 +354,9 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
} }
} }
void _updatePaintingCanvas() { void _repaint() {
assert(!_needsLayout); assert(!_needsLayout);
assert(createNewDisplayList); assert(requiresCompositing);
sky.PictureRecorder recorder = new sky.PictureRecorder(); sky.PictureRecorder recorder = new sky.PictureRecorder();
sky.Canvas canvas = new sky.Canvas(recorder, paintBounds); sky.Canvas canvas = new sky.Canvas(recorder, paintBounds);
PaintingContext context = new PaintingContext(canvas); PaintingContext context = new PaintingContext(canvas);
@ -374,21 +364,13 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
try { try {
_paintWithContext(context, Offset.zero); _paintWithContext(context, Offset.zero);
} catch (e) { } catch (e) {
print('Exception raised during _updatePaintingCanvas:\n${e}\nContext:\n${this}'); print('Exception raised during _repaint:\n${e}\nContext:\n${this}');
if (inDebugBuild) if (inDebugBuild)
rethrow; rethrow;
return; return;
} }
assert(!_needsLayout); // check that the paint() method didn't mark us dirty again assert(!_needsLayout); // check that the paint() method didn't mark us dirty again
assert(!_needsPaint); // check that the paint() method didn't mark us dirty again assert(!_needsPaint); // check that the paint() method didn't mark us dirty again
_paintingNode.setBackingDrawable(recorder.endRecordingAsDrawable());
if (context._descendentsWithPaintingCanvases != null) {
for (RenderObject node in context._descendentsWithPaintingCanvases) {
assert(node.attached == attached);
if (node._needsPaint)
node._updatePaintingCanvas();
};
}
} }
void _paintWithContext(PaintingContext context, Offset offset) { void _paintWithContext(PaintingContext context, Offset offset) {
@ -417,7 +399,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(!_needsPaint); assert(!_needsPaint);
} }
bool get createNewDisplayList => false; bool get requiresCompositing => false;
Rect get paintBounds; Rect get paintBounds;
void debugPaint(PaintingContext context, Offset offset) { } void debugPaint(PaintingContext context, Offset offset) { }
void paint(PaintingContext context, Offset offset) { } void paint(PaintingContext context, Offset offset) { }