third_party/WebKit/Source/core/input/EventHandler.cpp - Issue 1367193003: NOT FOR LANDING Allocate SVGImageForContainer on demand

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 1367193003: NOT FOR LANDING Allocate SVGImageForContainer on demand (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added some NeedsRebaseline and revived some LayoutListMarker code that turned out to be important Created 5 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLImageElement.cpp ('k') | third_party/WebKit/Source/core/layout/HitTestResult.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/input/EventHandler.cpp

diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp

index 4f97d79ed05aaaaee08082ed82196d6e60cfbad5..2ef87b66a91907478a75605b5526bdf351c941e1 100644

--- a/third_party/WebKit/Source/core/input/EventHandler.cpp

+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp

@@ -756,7 +756,7 @@ OptionalCursor EventHandler::selectCursor(const HitTestResult& result)

// Get hotspot and convert from logical pixels to physical pixels.

IntPoint hotSpot = (*cursors)[i].hotSpot();

hotSpot.scale(scale, scale);

- IntSize size = cachedImage->imageForLayoutObject(layoutObject)->size();

+ IntSize size = cachedImage->image()->size();

if (cachedImage->errorOccurred())

continue;

// Limit the size of cursors (in UI pixels) so that they cannot be

@@ -765,7 +765,7 @@ OptionalCursor EventHandler::selectCursor(const HitTestResult& result)

if (size.width() > maximumCursorSize || size.height() > maximumCursorSize)

continue;

- Image* image = cachedImage->imageForLayoutObject(layoutObject);

+ Image* image = cachedImage->image();

// Ensure no overflow possible in calculations above.

if (scale < minimumCursorScale)

continue;