Silent mouse lock after unlock by target

content/common/mouse_lock.h

+// Copyright (c) 2010 The Chromium Authors. All rights reserved.

[scheib, 2012/05/30 16:41:21]

2012

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_COMMON_MOUSE_LOCK_REQUEST_H_
+#define CONTENT_COMMON_MOUSE_LOCK_REQUEST_H_
+#pragma once
+
+#include "ipc/ipc_param_traits.h"
+#include "ipc/ipc_message_macros.h"
+#include "content/common/content_export.h"
+
+namespace content {
+
+// The source of a mouse lock request

[scheib, 2012/05/30 16:41:21]

Punctuation:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Punctu...

+enum MouseLockSource {
+  // Lock requested with a user gesture
+  USER_GESTURE,

[scheib, 2012/05/30 16:41:21]

These enum names are too generic for the content namespace, e.g.
content::USER_GESTURE. They should have name prefixes that give them context,
e.g. as in view_type.h, page_zoom.h p2p_sockets.h; or should be enclosed in a
class or additional namespace. (I prefer former).

Some ideas:
MOUSE_LOCK_VIA_USER_GESTURE,
MOUSE_LOCK_NO_USER_GESTURE

MOUSE_UNLOCKED_BY_LOCK_TARGET,
MOUSE_UNLOCKED_BY_BROWSER

+  // Lock requested not from a user gesture
+  NOT_USER_GESTURE
+};
+
+// The source of an unlock request
+enum MouseUnlockSource {
+  // The target requested the unlock
+  TARGET,
+  // User requested unlock by pressing ESC or initial state
+  NOT_TARGET
+};
+
+} // namespace content
+
+// param traits for serialization over IPC

[scheib, 2012/05/30 16:41:21]

As you mention, the implementation should be placed in a CC file. You'll need to
add this .h and the .cc to src/content/content_common.gypi

+namespace IPC {
+template<>
+struct ParamTraits<content::MouseLockSource> {
+  typedef content::MouseLockSource param_type;

[scheib, 2012/05/30 16:41:21]

IMHO the typedef param_type makes this code less readable. I see it's use in
some other bits of code, but I also see examples of direct use of types and
prefer those.

+  static void Write(Message* m, const param_type& p) {
+    m->WriteInt(static_cast<int>(p));
+  }
+  static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
+    int type;
+    if (!m->ReadInt(iter, &type))
+      return false;
+    *p = static_cast<param_type>(type);
+    return true;
+  }
+  static void Log(const param_type& p, std::string* l) {
+    std::string source;
+    switch (p) {
+      case content::USER_GESTURE:
+        source = "USER_GESTURE";
+        break;
+      case content::NOT_USER_GESTURE:
+        source = "NOT_USER_GESTURE";
+        break;
+    }
+    LogParam(source, l);
+  }
+};
+
+template<>
+struct ParamTraits<content::MouseUnlockSource> {
+  typedef content::MouseUnlockSource param_type;
+  static void Write(Message* m, const param_type& p) {
+    m->WriteInt(static_cast<int>(p));
+  }
+  static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
+    int type;
+    if (!m->ReadInt(iter, &type))
+      return false;
+    *p = static_cast<param_type>(type);
+    return true;
+  }
+  static void Log(const param_type& p, std::string* l) {
+    std::string source;
+    switch (p) {
+      case content::TARGET:
+        source = "TARGET";
+        break;
+      case content::NOT_TARGET:
+        source = "NOT_TARGET";
+        break;
+    }
+    LogParam(source, l);
+  }
+};
+}
+
+#endif /* CONTENT_COMMON_MOUSE_LOCK_REQUEST_H_ */