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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 1540443003: Fix LayoutObject::mapToVisibleRectInContainerSpace() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp » ('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 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 return; 1594 return;
1595 1595
1596 if (paintInvalidationState && paintInvalidationState->canMapToContainer(pain tInvalidationContainer)) { 1596 if (paintInvalidationState && paintInvalidationState->canMapToContainer(pain tInvalidationContainer)) {
1597 rect.move(paintInvalidationState->paintOffset()); 1597 rect.move(paintInvalidationState->paintOffset());
1598 if (paintInvalidationState->isClipped()) 1598 if (paintInvalidationState->isClipped())
1599 rect.intersect(paintInvalidationState->clipRect()); 1599 rect.intersect(paintInvalidationState->clipRect());
1600 return; 1600 return;
1601 } 1601 }
1602 1602
1603 if (LayoutObject* o = parent()) { 1603 if (LayoutObject* o = parent()) {
1604 if (o != paintInvalidationContainer && o->hasOverflowClip()) { 1604 if (o->hasOverflowClip()) {
1605 LayoutBox* boxParent = toLayoutBox(o); 1605 LayoutBox* boxParent = toLayoutBox(o);
1606 if (o == paintInvalidationContainer) 1606 if (o == paintInvalidationContainer)
1607 boxParent->applyCachedScrollOffsetForPaintInvalidation(rect); 1607 boxParent->applyCachedScrollOffsetForPaintInvalidation(rect);
1608 else 1608 else
1609 boxParent->applyCachedClipAndScrollOffsetForPaintInvalidation(re ct); 1609 boxParent->applyCachedClipAndScrollOffsetForPaintInvalidation(re ct);
1610 if (rect.isEmpty()) 1610 if (rect.isEmpty())
1611 return; 1611 return;
1612 } 1612 }
1613 1613
1614 o->mapToVisibleRectInContainerSpace(paintInvalidationContainer, rect, pa intInvalidationState); 1614 o->mapToVisibleRectInContainerSpace(paintInvalidationContainer, rect, pa intInvalidationState);
(...skipping 1907 matching lines...) Expand 10 before | Expand all | Expand 10 after
3522 const blink::LayoutObject* root = object1; 3522 const blink::LayoutObject* root = object1;
3523 while (root->parent()) 3523 while (root->parent())
3524 root = root->parent(); 3524 root = root->parent();
3525 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3525 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3526 } else { 3526 } else {
3527 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3527 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3528 } 3528 }
3529 } 3529 }
3530 3530
3531 #endif 3531 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698