mek, can you take a look?

No idea why anything in OriginTrials.cpp would need string hash traits...

 Issue 601656  has been merged into this issue.

No idea why either, but maybe this static function needs to be moved into a .cpp and explicitly exported.

mek, can you please revert if this is tricky to fix? leaving the component build broken for a day is not so good.

I have no idea if this is tricky to fix. I don't have a Windows environment set up and there don't seem to be try bots for this configuration, so there really isn't anything I can do to fix it. Hopefully somebody that is having this issue can try to figure out what is going on.

I'll try to take a look tomorrow. I clicked revert until then.

Thanks! Sounds good to me.

This change fixes the build failure. There's probably a better fix that would make inclusion of WTFString.h less error prone.


diff --git a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
index 62f1733..7b4a39e 100644
--- a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
@@ -5,6 +5,7 @@
 #define OriginTrials_h
 
 #include "core/CoreExport.h"
+#include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {

revert is failing? https://codereview.chromium.org/1875593003/

I've made a patch to do the same thing as comment 11.
https://codereview.chromium.org/1863323004

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a34111d476c333a6e7b182f0d703e67d8172d2d3

commit a34111d476c333a6e7b182f0d703e67d8172d2d3
Author: shinyak <shinyak@google.com>
Date: Fri Apr 08 06:39:23 2016

Windows component build fix: OriginTraials.h

Fix the following error:

webcore_shared.OriginTrials.obj : error LNK2001: unresolved external
symbol "public: static bool __cdecl WTF::HashTraits<class WTF::String>
::isEmptyValue(class WTF::String const &)"
(?isEmptyValue@?$HashTraits@VString@WTF@@@WTF@@SA_NABVString@2@@Z)

TBR=iclelland@chromium.org,rbyers@chromium.org,mek@chromium.org
BUG= 601282 

Review URL: https://codereview.chromium.org/1863323004

Cr-Commit-Position: refs/heads/master@{#386009}

[modify] https://crrev.com/a34111d476c333a6e7b182f0d703e67d8172d2d3/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/079a5f825dc266bc78beab35ba1baa54fb363088

commit 079a5f825dc266bc78beab35ba1baa54fb363088
Author: shinyak <shinyak@google.com>
Date: Fri Apr 15 03:16:12 2016

Move StringHash.h include to OriginTrialContext.h

This is a follow-up patch for r386009.

We added StringHash.h include in OriginTrial.h to fix build before.
However, this is used for HashSet<String>, and actually
OriginTrialContext.h has HashSet<String>.

So, we should have added StirngHash.h in OriginTrialContext.h
instead of OriginTrials.h.

BUG= 601282 

Review URL: https://codereview.chromium.org/1879993002

Cr-Commit-Position: refs/heads/master@{#387535}

[modify] https://crrev.com/079a5f825dc266bc78beab35ba1baa54fb363088/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
[modify] https://crrev.com/079a5f825dc266bc78beab35ba1baa54fb363088/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h