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

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 Image* HitTestResult::image() const 311 Image* HitTestResult::image() const
312 { 312 {
313 Node* innerNodeOrImageMapImage = this->innerNodeOrImageMapImage(); 313 Node* innerNodeOrImageMapImage = this->innerNodeOrImageMapImage();
314 if (!innerNodeOrImageMapImage) 314 if (!innerNodeOrImageMapImage)
315 return nullptr; 315 return nullptr;
316 316
317 LayoutObject* layoutObject = innerNodeOrImageMapImage->layoutObject(); 317 LayoutObject* layoutObject = innerNodeOrImageMapImage->layoutObject();
318 if (layoutObject && layoutObject->isImage()) { 318 if (layoutObject && layoutObject->isImage()) {
319 LayoutImage* image = toLayoutImage(layoutObject); 319 LayoutImage* image = toLayoutImage(layoutObject);
320 if (image->cachedImage() && !image->cachedImage()->errorOccurred()) 320 if (image->cachedImage() && !image->cachedImage()->errorOccurred())
321 return image->cachedImage()->image(); 321 return image->cachedImage()->getImage();
322 } 322 }
323 323
324 return nullptr; 324 return nullptr;
325 } 325 }
326 326
327 IntRect HitTestResult::imageRect() const 327 IntRect HitTestResult::imageRect() const
328 { 328 {
329 if (!image()) 329 if (!image())
330 return IntRect(); 330 return IntRect();
331 return innerNodeOrImageMapImage()->layoutBox()->absoluteContentQuad().enclos ingBoundingBox(); 331 return innerNodeOrImageMapImage()->layoutBox()->absoluteContentQuad().enclos ingBoundingBox();
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 else if (isHTMLMapElement(m_innerNode)) 542 else if (isHTMLMapElement(m_innerNode))
543 imageMapImageElement = toHTMLMapElement(m_innerNode)->imageElement(); 543 imageMapImageElement = toHTMLMapElement(m_innerNode)->imageElement();
544 544
545 if (!imageMapImageElement) 545 if (!imageMapImageElement)
546 return m_innerNode.get(); 546 return m_innerNode.get();
547 547
548 return imageMapImageElement; 548 return imageMapImageElement;
549 } 549 }
550 550
551 } // namespace blink 551 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698