Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / base / accelerators / accelerator.cc

diff --git a/src/ui/base/accelerators/accelerator.cc b/src/ui/base/accelerators/accelerator.cc
index de3cbf2..9d6ffa7 100644 (file)
--- a/src/ui/base/accelerators/accelerator.cc
+++ b/src/ui/base/accelerators/accelerator.cc
@@ -68,14 +68,15 @@ bool Accelerator::operator <(const Accelerator& rhs) const {
 }
 
 bool Accelerator::operator ==(const Accelerator& rhs) const {
-  if (platform_accelerator_.get() != rhs.platform_accelerator_.get() &&
-      ((!platform_accelerator_.get() || !rhs.platform_accelerator_.get()) ||
-       !platform_accelerator_->Equals(*rhs.platform_accelerator_))) {
-    return false;
-  }
+  if ((key_code_ == rhs.key_code_) && (type_ == rhs.type_) &&
+      (modifiers_ == rhs.modifiers_))
+    return true;
+
+  bool platform_equal =
+      platform_accelerator_.get() && rhs.platform_accelerator_.get() &&
+      platform_accelerator_.get() == rhs.platform_accelerator_.get();
 
-  return (key_code_ == rhs.key_code_) && (type_ == rhs.type_) &&
-      (modifiers_ == rhs.modifiers_);
+  return platform_equal;
 }
 
 bool Accelerator::operator !=(const Accelerator& rhs) const {