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

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

Issue 737523002: Sky: Move iframe geometry updates to FrameView::updateLayout instead of (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: compile 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
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1406 1406
1407 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintIfNeeded()", 1407 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintIfNeeded()",
1408 "object", this->debugName().ascii().data(), 1408 "object", this->debugName().ascii().data(),
1409 "info", jsonObjectForOldAndNewRects(oldBounds, newBounds)); 1409 "info", jsonObjectForOldAndNewRects(oldBounds, newBounds));
1410 1410
1411 InvalidationReason invalidationReason = getPaintInvalidationReason(paintInva lidationContainer, oldBounds, oldLocation, newBounds, newLocation); 1411 InvalidationReason invalidationReason = getPaintInvalidationReason(paintInva lidationContainer, oldBounds, oldLocation, newBounds, newLocation);
1412 1412
1413 if (invalidationReason == InvalidationNone) 1413 if (invalidationReason == InvalidationNone)
1414 return invalidationReason; 1414 return invalidationReason;
1415 1415
1416 invalidateWidgetBounds();
1417
1418 if (invalidationReason == InvalidationIncremental) { 1416 if (invalidationReason == InvalidationIncremental) {
1419 incrementallyInvalidatePaint(paintInvalidationContainer, oldBounds, newB ounds, newLocation); 1417 incrementallyInvalidatePaint(paintInvalidationContainer, oldBounds, newB ounds, newLocation);
1420 return invalidationReason; 1418 return invalidationReason;
1421 } 1419 }
1422 1420
1423 fullyInvalidatePaint(paintInvalidationContainer, invalidationReason, oldBoun ds, newBounds); 1421 fullyInvalidatePaint(paintInvalidationContainer, invalidationReason, oldBoun ds, newBounds);
1424 return invalidationReason; 1422 return invalidationReason;
1425 } 1423 }
1426 1424
1427 InvalidationReason RenderObject::getPaintInvalidationReason(const RenderLayerMod elObject& paintInvalidationContainer, 1425 InvalidationReason RenderObject::getPaintInvalidationReason(const RenderLayerMod elObject& paintInvalidationContainer,
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
2690 { 2688 {
2691 if (object1) { 2689 if (object1) {
2692 const blink::RenderObject* root = object1; 2690 const blink::RenderObject* root = object1;
2693 while (root->parent()) 2691 while (root->parent())
2694 root = root->parent(); 2692 root = root->parent();
2695 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 2693 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
2696 } 2694 }
2697 } 2695 }
2698 2696
2699 #endif 2697 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698