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

Side by Side Diff: Source/core/frame/SmartClip.cpp

Issue 923953002: Move rendering/RenderImage* to layout/LayoutImage* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/core/fetch/ImageResourceClient.h ('k') | Source/core/html/HTMLAnchorElement.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 IntRect nodeRect = node->pixelSnappedBoundingBox(); 173 IntRect nodeRect = node->pixelSnappedBoundingBox();
174 174
175 if (node->isElementNode() && equalIgnoringCase(toElement(node)->fastGetA ttribute(HTMLNames::aria_hiddenAttr), "true")) { 175 if (node->isElementNode() && equalIgnoringCase(toElement(node)->fastGetA ttribute(HTMLNames::aria_hiddenAttr), "true")) {
176 node = NodeTraversal::nextSkippingChildren(*node, rootNode); 176 node = NodeTraversal::nextSkippingChildren(*node, rootNode);
177 continue; 177 continue;
178 } 178 }
179 179
180 LayoutObject* renderer = node->renderer(); 180 LayoutObject* renderer = node->renderer();
181 if (renderer && !nodeRect.isEmpty()) { 181 if (renderer && !nodeRect.isEmpty()) {
182 if (renderer->isText() 182 if (renderer->isText()
183 || renderer->isRenderImage() 183 || renderer->isLayoutImage()
184 || node->isFrameOwnerElement() 184 || node->isFrameOwnerElement()
185 || (renderer->style()->hasBackgroundImage() && !shouldSkipBackgr oundImage(node))) { 185 || (renderer->style()->hasBackgroundImage() && !shouldSkipBackgr oundImage(node))) {
186 if (resizedCropRect.intersects(nodeRect)) { 186 if (resizedCropRect.intersects(nodeRect)) {
187 minNode = minNodeContainsNodes(minNode, node); 187 minNode = minNodeContainsNodes(minNode, node);
188 } else { 188 } else {
189 node = NodeTraversal::nextSkippingChildren(*node, rootNode); 189 node = NodeTraversal::nextSkippingChildren(*node, rootNode);
190 continue; 190 continue;
191 } 191 }
192 } 192 }
193 } 193 }
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 268
269 result.append(nodeValue); 269 result.append(nodeValue);
270 } 270 }
271 } 271 }
272 } 272 }
273 273
274 return result.toString(); 274 return result.toString();
275 } 275 }
276 276
277 } // namespace blink 277 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/fetch/ImageResourceClient.h ('k') | Source/core/html/HTMLAnchorElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698