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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 if (!styleImage) 802 if (!styleImage)
803 continue; 803 continue;
804 ImageResource* cachedImage = styleImage->cachedImage(); 804 ImageResource* cachedImage = styleImage->cachedImage();
805 if (!cachedImage) 805 if (!cachedImage)
806 continue; 806 continue;
807 float scale = styleImage->imageScaleFactor(); 807 float scale = styleImage->imageScaleFactor();
808 bool hotSpotSpecified = (*cursors)[i].hotSpotSpecified(); 808 bool hotSpotSpecified = (*cursors)[i].hotSpotSpecified();
809 // Get hotspot and convert from logical pixels to physical pixels. 809 // Get hotspot and convert from logical pixels to physical pixels.
810 IntPoint hotSpot = (*cursors)[i].hotSpot(); 810 IntPoint hotSpot = (*cursors)[i].hotSpot();
811 hotSpot.scale(scale, scale); 811 hotSpot.scale(scale, scale);
812 IntSize size = cachedImage->image()->size(); 812 IntSize size = cachedImage->image()->defaultConcreteObjectSize();
813 if (cachedImage->errorOccurred()) 813 if (cachedImage->errorOccurred())
814 continue; 814 continue;
815 // Limit the size of cursors (in UI pixels) so that they cannot be 815 // Limit the size of cursors (in UI pixels) so that they cannot be
816 // used to cover UI elements in chrome. 816 // used to cover UI elements in chrome.
817 size.scale(1 / scale); 817 size.scale(1 / scale);
818 if (size.width() > maximumCursorSize || size.height() > maximumCurso rSize) 818 if (size.width() > maximumCursorSize || size.height() > maximumCurso rSize)
819 continue; 819 continue;
820 820
821 Image* image = cachedImage->image(); 821 Image* image = cachedImage->image();
822 // Ensure no overflow possible in calculations above. 822 // Ensure no overflow possible in calculations above.
(...skipping 3153 matching lines...) Expand 10 before | Expand all | Expand 10 after
3976 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() 3976 PlatformEvent::Modifiers EventHandler::accessKeyModifiers()
3977 { 3977 {
3978 #if OS(MACOSX) 3978 #if OS(MACOSX)
3979 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey); 3979 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey);
3980 #else 3980 #else
3981 return PlatformEvent::AltKey; 3981 return PlatformEvent::AltKey;
3982 #endif 3982 #endif
3983 } 3983 }
3984 3984
3985 } // namespace blink 3985 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698