summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorjamesr <jamesr@chromium.org>2014-09-04 20:55:30 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-05 03:57:46 +0000
commit4f45409615609a5bf0084b9a7670b2fffda8a952 (patch)
tree887330523395566b3047ca06287da6427875e9a6 /gpu
parentce3882e5eece400fa4291cc4090ebf5db810fd5a (diff)
downloadchromium_src-4f45409615609a5bf0084b9a7670b2fffda8a952.zip
chromium_src-4f45409615609a5bf0084b9a7670b2fffda8a952.tar.gz
chromium_src-4f45409615609a5bf0084b9a7670b2fffda8a952.tar.bz2
Avoid memcmp on potentially unpacked structs in MailboxManager::TargetNameLess
R=piman@chromium.org Review URL: https://codereview.chromium.org/538273002 Cr-Commit-Position: refs/heads/master@{#293428}
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/mailbox_manager.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/mailbox_manager.cc b/gpu/command_buffer/service/mailbox_manager.cc
index 12a13fb..e6962df 100644
--- a/gpu/command_buffer/service/mailbox_manager.cc
+++ b/gpu/command_buffer/service/mailbox_manager.cc
@@ -101,7 +101,9 @@ MailboxManager::TargetName::TargetName(unsigned target, const Mailbox& mailbox)
bool MailboxManager::TargetNameLess(const MailboxManager::TargetName& lhs,
const MailboxManager::TargetName& rhs) {
- return memcmp(&lhs, &rhs, sizeof(lhs)) < 0;
+ if (lhs.target != rhs.target)
+ return lhs.target < rhs.target;
+ return lhs.mailbox < rhs.mailbox;
}
} // namespace gles2