Add OILPAN string to developer build chromium's webkit revision

content/common/user_agent.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/user_agent.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
@@ skipping 19 matching lines @@
   return base::SysInfo::GetDeviceName();
 }
 #endif
 
 }  // namespace
 
 std::string GetWebKitVersion() {
   return base::StringPrintf("%d.%d (%s)",
                             WEBKIT_VERSION_MAJOR,
                             WEBKIT_VERSION_MINOR,
-                            WEBKIT_SVN_REVISION);
+                            WEBKIT_SVN_REVISION
+#if defined(ENABLE_OILPAN) && ENABLE_OILPAN && !defined(OFFICIAL_BUILD)

[brettw, 2015/02/07 00:17:17]

You should do either "defined" style or check the value, but not both. Almost
all code does the defined style, and in fact there is no build code to set
ENABLE_OILPAN to 0. So just remove the ENABLE_OILPAN part of this.

Second, I don't understand the OFFICIAL_BUILD condition here. Shouldn't this
just key off of the value? You can key the ENABLE_OILPAN value off of whether
the build is official or not.

[tasak, 2015/02/10 05:51:24]

Because we don't need to add the "OILPAN" string to official build.

- Before shipping, we should not enable oilpan for official builds.
- After shipping, oilpan is always enabled. We don't need to check whether
oilpan build or not.

So I want to explicitly specify "!defined(OFFICIAL_BUILD)" here.
I also added FIXME comment here.

[brettw, 2015/02/10 22:51:38]

But shouldn'e the ENABLE_OILPAN flag always be set correctly? If you've got an
official build with the ENABLE_OILPAN flag set and you don't want oilpan
enabled, or vice versa, something is wrong.

+                            "-OILPAN"
+#endif
+    );
 }
 
 int GetWebKitMajorVersion() {
   return WEBKIT_VERSION_MAJOR;
 }
 
 int GetWebKitMinorVersion() {
   return WEBKIT_VERSION_MINOR;
 }
 
 std::string GetWebKitRevision() {
-  return WEBKIT_SVN_REVISION;
+  return WEBKIT_SVN_REVISION
+#if defined(ENABLE_OILPAN) && ENABLE_OILPAN && !defined(OFFICIAL_BUILD)
+         "-OILPAN"
+#endif
+    ;
 }
 
 std::string BuildOSCpuInfo() {
   std::string os_cpu;
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ||\
     defined(OS_ANDROID)
   int32 os_major_version = 0;
   int32 os_minor_version = 0;
   int32 os_bugfix_version = 0;
@@ skipping 125 matching lines @@
       os_info.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR);
   return user_agent;
 }
 
 }  // namespace content