Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 691663002: Unfork Sky's trace events (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1286 { 1286 {
1287 if (r.isEmpty()) 1287 if (r.isEmpty())
1288 return; 1288 return;
1289 1289
1290 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate 1290 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate
1291 // the selection. crbug.com/368140. 1291 // the selection. crbug.com/368140.
1292 if (!isRooted()) 1292 if (!isRooted())
1293 return; 1293 return;
1294 1294
1295 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()", 1295 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()",
1296 "object", this->debugName().ascii(), 1296 "object", this->debugName().ascii().data(),
1297 "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString (invalidationReason))); 1297 "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString (invalidationReason)));
1298 1298
1299 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) { 1299 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) {
1300 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend NeedsPaintInvalidationInRect(r); 1300 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend NeedsPaintInvalidationInRect(r);
1301 return; 1301 return;
1302 } 1302 }
1303 1303
1304 if (paintInvalidationContainer->isRenderView()) { 1304 if (paintInvalidationContainer->isRenderView()) {
1305 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r) ; 1305 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r) ;
1306 return; 1306 return;
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1414 { 1414 {
1415 const LayoutRect& newBounds = previousPaintInvalidationRect(); 1415 const LayoutRect& newBounds = previousPaintInvalidationRect();
1416 const LayoutPoint& newLocation = previousPositionFromPaintInvalidationContai ner(); 1416 const LayoutPoint& newLocation = previousPositionFromPaintInvalidationContai ner();
1417 1417
1418 // FIXME: PaintInvalidationState should not be required here, but the call t o flipForWritingMode 1418 // FIXME: PaintInvalidationState should not be required here, but the call t o flipForWritingMode
1419 // in mapRectToPaintInvalidationBacking will give us the wrong results with it disabled. 1419 // in mapRectToPaintInvalidationBacking will give us the wrong results with it disabled.
1420 // crbug.com/393762 1420 // crbug.com/393762
1421 ASSERT(newBounds == boundsRectForPaintInvalidation(&paintInvalidationContain er, &paintInvalidationState)); 1421 ASSERT(newBounds == boundsRectForPaintInvalidation(&paintInvalidationContain er, &paintInvalidationState));
1422 1422
1423 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintIfNeeded()", 1423 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintIfNeeded()",
1424 "object", this->debugName().ascii(), 1424 "object", this->debugName().ascii().data(),
1425 "info", jsonObjectForOldAndNewRects(oldBounds, newBounds)); 1425 "info", jsonObjectForOldAndNewRects(oldBounds, newBounds));
1426 1426
1427 InvalidationReason invalidationReason = getPaintInvalidationReason(paintInva lidationContainer, oldBounds, oldLocation, newBounds, newLocation); 1427 InvalidationReason invalidationReason = getPaintInvalidationReason(paintInva lidationContainer, oldBounds, oldLocation, newBounds, newLocation);
1428 1428
1429 if (invalidationReason == InvalidationNone) 1429 if (invalidationReason == InvalidationNone)
1430 return invalidationReason; 1430 return invalidationReason;
1431 1431
1432 if (invalidationReason == InvalidationIncremental) { 1432 if (invalidationReason == InvalidationIncremental) {
1433 incrementallyInvalidatePaint(paintInvalidationContainer, oldBounds, newB ounds, newLocation); 1433 incrementallyInvalidatePaint(paintInvalidationContainer, oldBounds, newB ounds, newLocation);
1434 return invalidationReason; 1434 return invalidationReason;
(...skipping 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after
2852 { 2852 {
2853 if (object1) { 2853 if (object1) {
2854 const blink::RenderObject* root = object1; 2854 const blink::RenderObject* root = object1;
2855 while (root->parent()) 2855 while (root->parent())
2856 root = root->parent(); 2856 root = root->parent();
2857 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 2857 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
2858 } 2858 }
2859 } 2859 }
2860 2860
2861 #endif 2861 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/loader/FrameFetchContext.cpp ('k') | sky/engine/core/rendering/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698