[webkit-reviews] review denied: [Bug 76216] WebKit does not support DOM 3 Events FocusEvent : [Attachment 127003] Patch

[bugzilla-daemon at webkit.org]

Eric Seidel <eric at webkit.org> has denied Terry Anderson
<tdanderson at chromium.org>'s request for review:
Bug 76216: WebKit does not support DOM 3 Events FocusEvent
https://bugs.webkit.org/show_bug.cgi?id=76216

Attachment 127003: Patch
https://bugs.webkit.org/attachment.cgi?id=127003&action=review

------- Additional Comments from Eric Seidel <eric at webkit.org>
View in context: https://bugs.webkit.org/attachment.cgi?id=127003&action=review


The diff is a bit broken, but otherwise looks OK.  Upload a new patch and we're
good to go.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:996
> -		4123081B138C429700BCCFCA /* WebCore.framework in Frameworks */
= {isa = PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC /* WebCore.framework
*/; };
> +		4123081B138C429700BCCFCA /* .framework in Frameworks */ = {isa
= PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC /* .framework */; };

I think this is an error.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:7819
> -		417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */ =
{isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib";
includeInIndex = 0; path = libWebCoreTestSupport.dylib; sourceTree =
BUILT_PRODUCTS_DIR; };
> +		417DA6D013734E02007C57FB /* .dylib */ = {isa =
PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex =
0; path = .dylib; sourceTree = BUILT_PRODUCTS_DIR; };
>		417DA71B13735DFA007C57FB /* JSInternals.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = JSInternals.cpp; sourceTree = "<group>"; };

This too.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:10142
> -		93F19B1A08245E5A001E9ABC /* WebCore.framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
> +		93F19B1A08245E5A001E9ABC /* .framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = .framework; sourceTree = BUILT_PRODUCTS_DIR; };

Same error.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:24278
> +<<<<<<< HEAD
> +				B6D9D23514EABD260090D75E /* FocusEvent.h in
Headers */,
> +				B6D9D27B14EAC0860090D75E /* JSFocusEvent.h in
Headers */,
> +=======
>				C598905714E9C28000E8D18B /*
PasteboardStrategy.h in Headers */,
>				C598905814E9C29900E8D18B /*
PlatformPasteboard.h in Headers */,
> +>>>>>>> gclient

Merge confict.