Source/core/rendering/RenderBoxModelObject.cpp - Issue 197283025: Use new is*Element() helper functions more in rendering code

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

Issue 197283025: Use new is*Element() helper functions more in rendering code (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 9 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | Source/core/rendering/RenderButton.h » ('j') | no next file with comments »

OLD	NEW
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 Apple Inc. All rights reserved.	6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.

7 * Copyright (C) 2010 Google Inc. All rights reserved.	7 * Copyright (C) 2010 Google Inc. 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 620 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
631 }	631 }

632	632

633 // Only fill with a base color (e.g., white) if we're the root document, sin ce iframes/frames with	633 // Only fill with a base color (e.g., white) if we're the root document, sin ce iframes/frames with

634 // no background in the child document should show the parent's background.	634 // no background in the child document should show the parent's background.

635 bool isOpaqueRoot = false;	635 bool isOpaqueRoot = false;

636 if (isRoot) {	636 if (isRoot) {

637 isOpaqueRoot = true;	637 isOpaqueRoot = true;

638 if (!bgLayer->next() && bgColor.hasAlpha() && view()->frameView()) {	638 if (!bgLayer->next() && bgColor.hasAlpha() && view()->frameView()) {

639 Element* ownerElement = document().ownerElement();	639 Element* ownerElement = document().ownerElement();

640 if (ownerElement) {	640 if (ownerElement) {

641 if (!ownerElement->hasTagName(frameTag)) {	641 if (!isHTMLFrameElement(*ownerElement)) {

642 // Locate the <body> element using the DOM. This is easier than trying	642 // Locate the <body> element using the DOM. This is easier than trying

643 // to crawl around a render tree with potential :before/:aft er content and	643 // to crawl around a render tree with potential :before/:aft er content and

644 // anonymous blocks created by inline <body> tags etc. We c an locate the <body>	644 // anonymous blocks created by inline <body> tags etc. We c an locate the <body>

645 // render object very easily via the DOM.	645 // render object very easily via the DOM.

646 HTMLElement* body = document().body();	646 HTMLElement* body = document().body();

647 if (body) {	647 if (body) {

648 // Can't scroll a frameset document anyway.	648 // Can't scroll a frameset document anyway.

649 isOpaqueRoot = body->hasLocalName(framesetTag);	649 isOpaqueRoot = body->hasLocalName(framesetTag);

650 } else {	650 } else {

651 // SVG documents and XML documents with SVG root nodes a re transparent.	651 // SVG documents and XML documents with SVG root nodes a re transparent.

(...skipping 2154 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2806 ASSERT(!beforeChild \|\| toBoxModelObject == beforeChild->parent());	2806 ASSERT(!beforeChild \|\| toBoxModelObject == beforeChild->parent());

2807 for (RenderObject* child = startChild; child && child != endChild; ) {	2807 for (RenderObject* child = startChild; child && child != endChild; ) {

2808 // Save our next sibling as moveChildTo will clear it.	2808 // Save our next sibling as moveChildTo will clear it.

2809 RenderObject* nextSibling = child->nextSibling();	2809 RenderObject* nextSibling = child->nextSibling();

2810 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);	2810 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);

2811 child = nextSibling;	2811 child = nextSibling;

2812 }	2812 }

2813 }	2813 }

2814	2814

2815 } // namespace WebCore	2815 } // namespace WebCore

OLD	NEW