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

Side by Side Diff: Source/WebCore/rendering/RenderBox.h

Issue 10272008: Merge 113497 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 months 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 | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderInline.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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 { 478 {
479 if (RenderOverflow* overflow = hasRenderOverflow()) { 479 if (RenderOverflow* overflow = hasRenderOverflow()) {
480 LayoutRect layoutOverflowRect = overflow->layoutOverflowRect(); 480 LayoutRect layoutOverflowRect = overflow->layoutOverflowRect();
481 flipForWritingMode(layoutOverflowRect); 481 flipForWritingMode(layoutOverflowRect);
482 return layoutOverflowRect.y() < y() || layoutOverflowRect.maxY() > y () + logicalHeight(); 482 return layoutOverflowRect.y() < y() || layoutOverflowRect.maxY() > y () + logicalHeight();
483 } 483 }
484 484
485 return false; 485 return false;
486 } 486 }
487 487
488 virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject*) con st
489 {
490 ASSERT_NOT_REACHED();
491 return 0;
492 }
493
488 protected: 494 protected:
489 virtual void willBeDestroyed(); 495 virtual void willBeDestroyed();
490 496
491 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); 497 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
492 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 498 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
493 virtual void updateBoxModelInfoFromStyle(); 499 virtual void updateBoxModelInfoFromStyle();
494 500
495 virtual bool backgroundIsObscured() const { return false; } 501 virtual bool backgroundIsObscured() const { return false; }
496 void paintBackground(const PaintInfo&, const LayoutRect&, BackgroundBleedAvo idance = BackgroundBleedNone); 502 void paintBackground(const PaintInfo&, const LayoutRect&, BackgroundBleedAvo idance = BackgroundBleedNone);
497 503
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 bool onlyOverflowHidden = style()->overflowX() == OHIDDEN && style()->overfl owY() == OHIDDEN; 633 bool onlyOverflowHidden = style()->overflowX() == OHIDDEN && style()->overfl owY() == OHIDDEN;
628 634
629 // Currently {push|pop}ContentsClip do not handle properly all cases involvi ng a clip 635 // Currently {push|pop}ContentsClip do not handle properly all cases involvi ng a clip
630 // with a border radius so we need a RenderLayer to handle them. 636 // with a border radius so we need a RenderLayer to handle them.
631 return !onlyOverflowHidden || style()->hasBorderRadius(); 637 return !onlyOverflowHidden || style()->hasBorderRadius();
632 } 638 }
633 639
634 } // namespace WebCore 640 } // namespace WebCore
635 641
636 #endif // RenderBox_h 642 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698