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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 930183002: Move and rename RenderEmbeddedObject and RenderIFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename properly to LayoutIFrame in test expectations. Created 5 years, 10 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
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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 { 627 {
628 if (!size().isEmpty()) 628 if (!size().isEmpty())
629 rects.append(LayoutRect(additionalOffset, size())); 629 rects.append(LayoutRect(additionalOffset, size()));
630 } 630 }
631 631
632 bool RenderBox::canResize() const 632 bool RenderBox::canResize() const
633 { 633 {
634 // We need a special case for <iframe> because they never have 634 // We need a special case for <iframe> because they never have
635 // hasOverflowClip(). However, they do "implicitly" clip their contents, so 635 // hasOverflowClip(). However, they do "implicitly" clip their contents, so
636 // we want to allow resizing them also. 636 // we want to allow resizing them also.
637 return (hasOverflowClip() || isRenderIFrame()) && style()->resize() != RESIZ E_NONE; 637 return (hasOverflowClip() || isLayoutIFrame()) && style()->resize() != RESIZ E_NONE;
638 } 638 }
639 639
640 void RenderBox::addLayerHitTestRects(LayerHitTestRects& layerRects, const Layer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const 640 void RenderBox::addLayerHitTestRects(LayerHitTestRects& layerRects, const Layer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const
641 { 641 {
642 LayoutPoint adjustedLayerOffset = layerOffset + locationOffset(); 642 LayoutPoint adjustedLayerOffset = layerOffset + locationOffset();
643 RenderBoxModelObject::addLayerHitTestRects(layerRects, currentLayer, adjuste dLayerOffset, containerRect); 643 RenderBoxModelObject::addLayerHitTestRects(layerRects, currentLayer, adjuste dLayerOffset, containerRect);
644 } 644 }
645 645
646 void RenderBox::computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutP oint& layerOffset) const 646 void RenderBox::computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutP oint& layerOffset) const
647 { 647 {
(...skipping 3957 matching lines...) Expand 10 before | Expand all | Expand 10 after
4605 } 4605 }
4606 4606
4607 void RenderBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst 4607 void RenderBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst
4608 { 4608 {
4609 RenderBoxModelObject::invalidateDisplayItemClients(displayItemList); 4609 RenderBoxModelObject::invalidateDisplayItemClients(displayItemList);
4610 if (LayerScrollableArea* area = scrollableArea()) 4610 if (LayerScrollableArea* area = scrollableArea())
4611 displayItemList->invalidate(area->displayItemClient()); 4611 displayItemList->invalidate(area->displayItemClient());
4612 } 4612 }
4613 4613
4614 } // namespace blink 4614 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/style/StyleRareNonInheritedData.h ('k') | Source/core/rendering/RenderEmbeddedObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698