[webkit-reviews] review granted: [Bug 170980] [WinCairo] Fix build break after updating ANGLE : [Attachment 307468] Patch

[bugzilla-daemon at webkit.org]

Brent Fulgham <bfulgham at webkit.org> has granted Fujii Hironori
<Hironori.Fujii at sony.com>'s request for review:
Bug 170980: [WinCairo] Fix build break after updating ANGLE
https://bugs.webkit.org/show_bug.cgi?id=170980

Attachment 307468: Patch

https://bugs.webkit.org/attachment.cgi?id=307468&action=review




--- Comment #3 from Brent Fulgham <bfulgham at webkit.org> ---
Comment on attachment 307468
  --> https://bugs.webkit.org/attachment.cgi?id=307468
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=307468&action=review

It looks like dino already tried to fix a few of these things. Can you please
update your patch to account for those conflicts? Otherwise I think this looks
good!

> Source/ThirdParty/ANGLE/src/third_party/murmurhash/LICENSE:2
> +// domain. The author hereby disclaims copyright to this source code.

This is now conflicting with r215499.

> Source/ThirdParty/ANGLE/src/third_party/murmurhash/MurmurHash3.cpp:335
> +

This was landed in r215500.

> Source/ThirdParty/ANGLE/src/third_party/murmurhash/MurmurHash3.h:37
> +#endif // _MURMURHASH3_H_

This conflicts with r215500.