summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 18:53:02 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 18:53:02 +0000
commit72ed0b850d453af806341557ce61c41281ebe142 (patch)
tree803054117dc9a4c004cc5b7b480c8796348b95fd /ui
parent1e44abfd0cc4c0da8e77600e85f1d9a840f34a5f (diff)
downloadchromium_src-72ed0b850d453af806341557ce61c41281ebe142.zip
chromium_src-72ed0b850d453af806341557ce61c41281ebe142.tar.gz
chromium_src-72ed0b850d453af806341557ce61c41281ebe142.tar.bz2
switch to int64_t types for SkBitmap
BUG= R=thakis@chromium.org Review URL: https://codereview.chromium.org/114883005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/clipboard/clipboard.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/clipboard/clipboard.cc b/ui/base/clipboard/clipboard.cc
index a77efd6..c71d5b9 100644
--- a/ui/base/clipboard/clipboard.cc
+++ b/ui/base/clipboard/clipboard.cc
@@ -163,7 +163,7 @@ void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) {
}
// Make sure the size is representable as a signed 32-bit int, so
// SkBitmap::getSize() won't be truncated.
- if (bitmap.getSize64().is64())
+ if (!sk_64_isS32(bitmap.computeSize64()))
return;
// It's OK to cast away constness here since we map the handle as