Bug 126698 – [iOS] Upstream WebCore and Tools miscellaneous changes

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Daniel Bates]

Upstream iOS miscellaneous changes to WebCore and Tools.

[Daniel Bates]

Created attachment 220739 [details]
Patch

[WebKit Commit Bot]

Attachment 220739 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/Configurations/Base.xcconfig', u'Source/WebCore/Configurations/WebCore.xcconfig', u'Source/WebCore/Configurations/WebCoreTestSupport.xcconfig', u'Source/WebCore/Configurations/iOS.xcconfig', u'Source/WebCore/DerivedSources.make', u'Source/WebCore/English.lproj/Localizable.strings', u'Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp', u'Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h', u'Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl', u'Source/WebCore/Modules/geolocation/Geolocation.cpp', u'Source/WebCore/Modules/geolocation/Geolocation.h', u'Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp', u'Source/WebCore/Modules/geolocation/NavigatorGeolocation.h', u'Source/WebCore/Modules/speech/SpeechSynthesis.cpp', u'Source/WebCore/Modules/speech/SpeechSynthesis.h', u'Source/WebCore/Modules/webaudio/AudioContext.cpp', u'Source/WebCore/Modules/webaudio/AudioContext.h', u'Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp', u'Source/WebCore/Modules/webdatabase/Database.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseContext.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseContext.h', u'Source/WebCore/Modules/webdatabase/DatabaseManagerClient.h', u'Source/WebCore/Modules/webdatabase/DatabaseTask.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseTask.h', u'Source/WebCore/Modules/webdatabase/DatabaseThread.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseThread.h', u'Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseTracker.h', u'Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp', u'Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h', u'Source/WebCore/Resources/DictationPhraseWithAlternativesDot.png', u'Source/WebCore/Resources/[e-mail]', u'Source/WebCore/Resources/SpellingDot.png', u'Source/WebCore/Resources/[e-mail]', u'Source/WebCore/Resources/decrementArrow.tiff', u'Source/WebCore/Resources/hScrollControl_left.png', u'Source/WebCore/Resources/hScrollControl_middle.png', u'Source/WebCore/Resources/hScrollControl_right.png', u'Source/WebCore/Resources/incrementArrow.tiff', u'Source/WebCore/Resources/markedLeft.png', u'Source/WebCore/Resources/markedMiddle.png', u'Source/WebCore/Resources/markedRight.png', u'Source/WebCore/Resources/vScrollControl_bottom.png', u'Source/WebCore/Resources/vScrollControl_middle.png', u'Source/WebCore/Resources/vScrollControl_top.png', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/bindings/js/GCController.cpp', u'Source/WebCore/bindings/js/GCController.h', u'Source/WebCore/bindings/js/JSCallbackData.h', u'Source/WebCore/bindings/js/JSDOMWindowBase.cpp', u'Source/WebCore/bindings/js/JSDOMWindowCustom.cpp', u'Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp', u'Source/WebCore/bindings/js/JSMainThreadExecState.h', u'Source/WebCore/bindings/js/JSTouchCustom.cpp', u'Source/WebCore/bindings/js/JSTouchListCustom.cpp', u'Source/WebCore/bindings/js/PageScriptDebugServer.cpp', u'Source/WebCore/bindings/js/ScriptController.cpp', u'Source/WebCore/bindings/js/ScriptDebugServer.cpp', u'Source/WebCore/bindings/js/ios/TouchConstructors.cpp', u'Source/WebCore/bindings/objc/DOM.mm', u'Source/WebCore/bindings/objc/DOMEvents.h', u'Source/WebCore/bindings/objc/DOMEvents.mm', u'Source/WebCore/bindings/objc/DOMExtensions.h', u'Source/WebCore/bindings/objc/DOMHTML.mm', u'Source/WebCore/bindings/objc/DOMInternal.h', u'Source/WebCore/bindings/objc/DOMInternal.mm', u'Source/WebCore/bindings/objc/DOMPrivate.h', u'Source/WebCore/bindings/objc/DOMUIKitExtensions.h', u'Source/WebCore/bindings/objc/DOMUIKitExtensions.mm', u'Source/WebCore/bindings/objc/PublicDOMInterfaces.h', u'Source/WebCore/bindings/scripts/CodeGeneratorJS.pm', u'Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm', u'Source/WebCore/bindings/scripts/IDLAttributes.txt', u'Source/WebCore/bindings/scripts/preprocessor.pm', u'Source/WebCore/bridge/objc/objc_class.mm', u'Source/WebCore/bridge/objc/objc_instance.mm', u'Source/WebCore/config.h', u'Source/WebCore/dom/Document.cpp', u'Source/WebCore/dom/Document.h', u'Source/WebCore/dom/Document.idl', u'Source/WebCore/dom/ios/TouchEvents.cpp', u'Source/WebCore/editing/ApplyStyleCommand.cpp', u'Source/WebCore/editing/CompositeEditCommand.cpp', u'Source/WebCore/editing/CompositeEditCommand.h', u'Source/WebCore/editing/DeleteButton.h', u'Source/WebCore/editing/DeleteButtonController.cpp', u'Source/WebCore/editing/DeleteSelectionCommand.cpp', u'Source/WebCore/editing/DeleteSelectionCommand.h', u'Source/WebCore/editing/EditAction.h', u'Source/WebCore/editing/EditCommand.h', u'Source/WebCore/editing/EditingStyle.cpp', u'Source/WebCore/editing/Editor.cpp', u'Source/WebCore/editing/Editor.h', u'Source/WebCore/editing/EditorCommand.cpp', u'Source/WebCore/editing/FrameSelection.cpp', u'Source/WebCore/editing/FrameSelection.h', u'Source/WebCore/editing/InsertIntoTextNodeCommand.cpp', u'Source/WebCore/editing/InsertIntoTextNodeCommand.h', u'Source/WebCore/editing/InsertTextCommand.h', u'Source/WebCore/editing/ReplaceSelectionCommand.cpp', u'Source/WebCore/editing/TextAffinity.h', u'Source/WebCore/editing/TextCheckingHelper.cpp', u'Source/WebCore/editing/TextGranularity.h', u'Source/WebCore/editing/TextIterator.cpp', u'Source/WebCore/editing/TypingCommand.cpp', u'Source/WebCore/editing/TypingCommand.h', u'Source/WebCore/editing/VisiblePosition.h', u'Source/WebCore/editing/VisibleSelection.cpp', u'Source/WebCore/editing/VisibleUnits.cpp', u'Source/WebCore/editing/VisibleUnits.h', u'Source/WebCore/editing/ios/DictationCommandIOS.cpp', u'Source/WebCore/editing/ios/DictationCommandIOS.h', u'Source/WebCore/editing/mac/FrameSelectionMac.mm', u'Source/WebCore/fileapi/AsyncFileStream.cpp', u'Source/WebCore/generate-export-file', u'Source/WebCore/inspector/InspectorCounters.h', u'Source/WebCore/inspector/InspectorFrontendHost.h', u'Source/WebCore/inspector/InspectorPageAgent.cpp', u'Source/WebCore/make-export-file-generator', u'Source/WebCore/plugins/PluginPackage.h', u'Source/WebCore/plugins/PluginViewBase.h', u'Source/WebCore/style/StyleResolveForDocument.cpp', u'Source/WebCore/style/StyleResolveTree.cpp', u'Source/WebCore/testing/Internals.cpp', u'Source/WebCore/workers/WorkerThread.cpp', u'Source/WebKit/ChangeLog', u'Source/WebKit/WebKit.xcodeproj/project.pbxproj', u'Source/WebKit/mac/ChangeLog', u'Source/WebKit/mac/MigrateHeaders.make', u'Source/WebKit/mac/scrub-ifdefs.pl', u'Tools/ChangeLog', u'Tools/Scripts/check-for-inappropriate-objc-class-names', u'Tools/Scripts/check-for-webkit-framework-include-consistency', '--commit-queue']" exit_code: 1
Traceback (most recent call last):
  File "Tools/Scripts/check-webkit-style", line 48, in <module>
    sys.exit(CheckWebKitStyle().main())
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/main.py", line 154, in main
    patch_checker.check(patch)
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/patchreader.py", line 71, in check
    self._text_file_reader.process_file(file_path=path, line_numbers=None)
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/filereader.py", line 118, in process_file
    lines = self._read_lines(file_path)
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/filereader.py", line 86, in _read_lines
    contents = file.read()
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/codecs.py", line 671, in read
    return self.reader.read(size)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/codecs.py", line 477, in read
    newchars, decodedbytes = self.decode(data, self.errors)
UnicodeDecodeError: 'utf8' codec can't decode byte 0x89 in position 0: invalid start byte


If any of these errors are false positives, please file a bug against check-webkit-style.

[Daniel Bates]

(In reply to comment #2)
> Attachment 220739 [details] did not pass style-queue:
> 
> ...
> Traceback (most recent call last):
>   File "Tools/Scripts/check-webkit-style", line 48, in <module>
>     sys.exit(CheckWebKitStyle().main())
>  ...
>   File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/codecs.py", line 477, in read
>     newchars, decodedbytes = self.decode(data, self.errors)
> UnicodeDecodeError: 'utf8' codec can't decode byte 0x89 in position 0: invalid start byte
> 
> 
> If any of these errors are false positives, please file a bug against check-webkit-style.

Filed bug #126702.

[Build Bot]

Comment on attachment 220739 [details]
Patch

Attachment 220739 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/4878008569561088

[Build Bot]

Comment on attachment 220739 [details]
Patch

Attachment 220739 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/4646782831165440

[EFL EWS Bot]

Comment on attachment 220739 [details]
Patch

Attachment 220739 [details] did not pass efl-ews (efl):
Output: http://webkit-queues.appspot.com/results/5901838175961088

[Daniel Bates]

Created attachment 220746 [details]
Patch

[Daniel Bates]

Created attachment 220748 [details]
Patch

[WebKit Commit Bot]

Attachment 220748 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/Configurations/Base.xcconfig', u'Source/WebCore/Configurations/WebCore.xcconfig', u'Source/WebCore/Configurations/WebCoreTestSupport.xcconfig', u'Source/WebCore/Configurations/iOS.xcconfig', u'Source/WebCore/DerivedSources.make', u'Source/WebCore/English.lproj/Localizable.strings', u'Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp', u'Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h', u'Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl', u'Source/WebCore/Modules/geolocation/Geolocation.cpp', u'Source/WebCore/Modules/geolocation/Geolocation.h', u'Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp', u'Source/WebCore/Modules/geolocation/NavigatorGeolocation.h', u'Source/WebCore/Modules/speech/SpeechSynthesis.cpp', u'Source/WebCore/Modules/speech/SpeechSynthesis.h', u'Source/WebCore/Modules/webaudio/AudioContext.cpp', u'Source/WebCore/Modules/webaudio/AudioContext.h', u'Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp', u'Source/WebCore/Modules/webdatabase/Database.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseContext.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseContext.h', u'Source/WebCore/Modules/webdatabase/DatabaseManagerClient.h', u'Source/WebCore/Modules/webdatabase/DatabaseTask.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseTask.h', u'Source/WebCore/Modules/webdatabase/DatabaseThread.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseThread.h', u'Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp', u'Source/WebCore/Modules/webdatabase/DatabaseTracker.h', u'Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp', u'Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h', u'Source/WebCore/Resources/DictationPhraseWithAlternativesDot.png', u'Source/WebCore/Resources/[e-mail]', u'Source/WebCore/Resources/SpellingDot.png', u'Source/WebCore/Resources/[e-mail]', u'Source/WebCore/Resources/decrementArrow.tiff', u'Source/WebCore/Resources/hScrollControl_left.png', u'Source/WebCore/Resources/hScrollControl_middle.png', u'Source/WebCore/Resources/hScrollControl_right.png', u'Source/WebCore/Resources/incrementArrow.tiff', u'Source/WebCore/Resources/markedLeft.png', u'Source/WebCore/Resources/markedMiddle.png', u'Source/WebCore/Resources/markedRight.png', u'Source/WebCore/Resources/vScrollControl_bottom.png', u'Source/WebCore/Resources/vScrollControl_middle.png', u'Source/WebCore/Resources/vScrollControl_top.png', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/bindings/js/GCController.cpp', u'Source/WebCore/bindings/js/GCController.h', u'Source/WebCore/bindings/js/JSCallbackData.h', u'Source/WebCore/bindings/js/JSDOMWindowBase.cpp', u'Source/WebCore/bindings/js/JSDOMWindowCustom.cpp', u'Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp', u'Source/WebCore/bindings/js/JSMainThreadExecState.h', u'Source/WebCore/bindings/js/JSTouchCustom.cpp', u'Source/WebCore/bindings/js/JSTouchListCustom.cpp', u'Source/WebCore/bindings/js/PageScriptDebugServer.cpp', u'Source/WebCore/bindings/js/ScriptController.cpp', u'Source/WebCore/bindings/js/ScriptDebugServer.cpp', u'Source/WebCore/bindings/js/ios/TouchConstructors.cpp', u'Source/WebCore/bindings/objc/DOM.mm', u'Source/WebCore/bindings/objc/DOMEvents.h', u'Source/WebCore/bindings/objc/DOMEvents.mm', u'Source/WebCore/bindings/objc/DOMExtensions.h', u'Source/WebCore/bindings/objc/DOMHTML.mm', u'Source/WebCore/bindings/objc/DOMInternal.h', u'Source/WebCore/bindings/objc/DOMInternal.mm', u'Source/WebCore/bindings/objc/DOMPrivate.h', u'Source/WebCore/bindings/objc/DOMUIKitExtensions.h', u'Source/WebCore/bindings/objc/DOMUIKitExtensions.mm', u'Source/WebCore/bindings/objc/PublicDOMInterfaces.h', u'Source/WebCore/bindings/scripts/CodeGeneratorJS.pm', u'Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm', u'Source/WebCore/bindings/scripts/IDLAttributes.txt', u'Source/WebCore/bindings/scripts/preprocessor.pm', u'Source/WebCore/bridge/objc/objc_class.mm', u'Source/WebCore/bridge/objc/objc_instance.mm', u'Source/WebCore/config.h', u'Source/WebCore/dom/Document.cpp', u'Source/WebCore/dom/Document.h', u'Source/WebCore/dom/Document.idl', u'Source/WebCore/dom/ios/TouchEvents.cpp', u'Source/WebCore/editing/ApplyStyleCommand.cpp', u'Source/WebCore/editing/CompositeEditCommand.cpp', u'Source/WebCore/editing/CompositeEditCommand.h', u'Source/WebCore/editing/DeleteButton.h', u'Source/WebCore/editing/DeleteButtonController.cpp', u'Source/WebCore/editing/DeleteSelectionCommand.cpp', u'Source/WebCore/editing/DeleteSelectionCommand.h', u'Source/WebCore/editing/EditAction.h', u'Source/WebCore/editing/EditCommand.h', u'Source/WebCore/editing/EditingStyle.cpp', u'Source/WebCore/editing/Editor.cpp', u'Source/WebCore/editing/Editor.h', u'Source/WebCore/editing/EditorCommand.cpp', u'Source/WebCore/editing/FrameSelection.cpp', u'Source/WebCore/editing/FrameSelection.h', u'Source/WebCore/editing/InsertIntoTextNodeCommand.cpp', u'Source/WebCore/editing/InsertIntoTextNodeCommand.h', u'Source/WebCore/editing/InsertTextCommand.h', u'Source/WebCore/editing/ReplaceSelectionCommand.cpp', u'Source/WebCore/editing/TextAffinity.h', u'Source/WebCore/editing/TextCheckingHelper.cpp', u'Source/WebCore/editing/TextGranularity.h', u'Source/WebCore/editing/TextIterator.cpp', u'Source/WebCore/editing/TypingCommand.cpp', u'Source/WebCore/editing/TypingCommand.h', u'Source/WebCore/editing/VisiblePosition.h', u'Source/WebCore/editing/VisibleSelection.cpp', u'Source/WebCore/editing/VisibleUnits.cpp', u'Source/WebCore/editing/VisibleUnits.h', u'Source/WebCore/editing/ios/DictationCommandIOS.cpp', u'Source/WebCore/editing/ios/DictationCommandIOS.h', u'Source/WebCore/editing/mac/FrameSelectionMac.mm', u'Source/WebCore/fileapi/AsyncFileStream.cpp', u'Source/WebCore/generate-export-file', u'Source/WebCore/inspector/InspectorCounters.h', u'Source/WebCore/inspector/InspectorFrontendHost.h', u'Source/WebCore/make-export-file-generator', u'Source/WebCore/plugins/PluginPackage.h', u'Source/WebCore/plugins/PluginViewBase.h', u'Source/WebCore/style/StyleResolveForDocument.cpp', u'Source/WebCore/style/StyleResolveTree.cpp', u'Source/WebCore/testing/Internals.cpp', u'Source/WebCore/workers/WorkerThread.cpp', u'Source/WebKit/ChangeLog', u'Source/WebKit/WebKit.xcodeproj/project.pbxproj', u'Source/WebKit/mac/ChangeLog', u'Source/WebKit/mac/MigrateHeaders.make', u'Source/WebKit/mac/scrub-ifdefs.pl', u'Tools/ChangeLog', u'Tools/Scripts/check-for-inappropriate-objc-class-names', u'Tools/Scripts/check-for-webkit-framework-include-consistency', '--commit-queue']" exit_code: 1
Traceback (most recent call last):
  File "Tools/Scripts/check-webkit-style", line 48, in <module>
    sys.exit(CheckWebKitStyle().main())
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/main.py", line 154, in main
    patch_checker.check(patch)
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/patchreader.py", line 71, in check
    self._text_file_reader.process_file(file_path=path, line_numbers=None)
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/filereader.py", line 118, in process_file
    lines = self._read_lines(file_path)
  File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/filereader.py", line 86, in _read_lines
    contents = file.read()
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/codecs.py", line 671, in read
    return self.reader.read(size)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/codecs.py", line 477, in read
    newchars, decodedbytes = self.decode(data, self.errors)
UnicodeDecodeError: 'utf8' codec can't decode byte 0x89 in position 0: invalid start byte


If any of these errors are false positives, please file a bug against check-webkit-style.

[David Kilzer (:ddkilzer)]

Comment on attachment 220748 [details]
Patch

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

rs=me.  Please wait to land until build fixes from the previous merge commit are settled.

> Source/WebCore/Configurations/WebCore.xcconfig:37
> +EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;

We shouldn't bring back ppc64.

Nit: And we could remove ppc.

> Source/WebCore/bindings/objc/PublicDOMInterfaces.h:29
> +#include <wtf/Platform.h>

I know we include this, but if this is a public header, we should not include it at all.  Needs to be fixed before the next release.

> Source/WebKit/WebKit.xcodeproj/project.pbxproj:833
> +		CE2616AB187E6675007955F3 /* scrub-ifdefs.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "scrub-ifdefs.pl"; path = "mac/scrub-ifdefs.pl"; sourceTree = "<group>"; };

The scrub-ifdefs.pl script is not needed in open source.  Andy Estes implemented them differently using the "Postprocess Headers" phase.

All of the changes to Source/WebKit/WebKit.xcodeproj/project.pbxproj can be dropped.

> Source/WebKit/mac/scrub-ifdefs.pl:1
> +#!/usr/bin/perl -w

This whole script does not need to be upstreamed.

[Daniel Bates]

Comment on attachment 220748 [details]
Patch

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

>> Source/WebCore/Configurations/WebCore.xcconfig:37
>> +EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;
> 
> We shouldn't bring back ppc64.
> 
> Nit: And we could remove ppc.

Will remove ppc64 and ppc.

>> Source/WebKit/WebKit.xcodeproj/project.pbxproj:833
>> +		CE2616AB187E6675007955F3 /* scrub-ifdefs.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "scrub-ifdefs.pl"; path = "mac/scrub-ifdefs.pl"; sourceTree = "<group>"; };
> 
> The scrub-ifdefs.pl script is not needed in open source.  Andy Estes implemented them differently using the "Postprocess Headers" phase.
> 
> All of the changes to Source/WebKit/WebKit.xcodeproj/project.pbxproj can be dropped.

Neither the "Postprocess Headers" script in OpenSource nor the "Postprocess Headers" script we use internally seem to work. I'll take a look at the "Postprocess header" script tomorrow and work with Andy to ensure we post process the headers.

For completeness, when I remove scrub-ifdefs.pl and build WebKit I get the following error:

...
Ld WebKit
PhaseScriptExecution Check\
PhaseScriptExecution Check\
PhaseScriptExecution Check\
error: WebKit.framework/Versions/A/Headers/DOMEvents.h included <WebKit/DOMTouchEvent.h> but I could not find a header of that name!
error: WebKit.framework/Versions/A/Headers/DOMEvents.h included <WebKit/DOMGestureEvent.h> but I could not find a header of that name!
error: WebKit.framework/Versions/A/PrivateHeaders/DOMPrivate.h included <WebKit/WebAutocapitalize.h> but I could not find a header of that name!
** BUILD FAILED **

The following build commands failed:
	PhaseScriptExecution Check\ For\ Framework\ Include\ Consistency /WebKitDev/OpenSource/WebKitBuild/WebKit.build/Debug/WebKit.build/Script-5D88EE6C11407DE800BC3ABC.sh
(1 failure)

[Daniel Bates]

(In reply to comment #11)
> (From update of attachment 220748 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=220748&action=review
> [...]
> 
> For completeness, when I remove scrub-ifdefs.pl and build WebKit I get the following error:

*build WebKit for OS X (e.g. Tools/Scripts/build-webkit)

[Daniel Bates]

(In reply to comment #11)
> (From update of attachment 220748 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=220748&action=review
> [...]
> >> Source/WebKit/WebKit.xcodeproj/project.pbxproj:833
> >> +		CE2616AB187E6675007955F3 /* scrub-ifdefs.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "scrub-ifdefs.pl"; path = "mac/scrub-ifdefs.pl"; sourceTree = "<group>"; };
> > 
> > The scrub-ifdefs.pl script is not needed in open source.  Andy Estes implemented them differently using the "Postprocess Headers" phase.
> > 
> > All of the changes to Source/WebKit/WebKit.xcodeproj/project.pbxproj can be dropped.
> 
> Neither the "Postprocess Headers" script in OpenSource nor the "Postprocess Headers" script we use internally seem to work. I'll take a look at the "Postprocess header" script tomorrow and work with Andy to ensure we post process the headers.

I resolved the issue by teaching the script about the defines ENABLE_IOS_TOUCH_EVENTS and ENABLE_IOS_GESTURE_EVENTS and substituting TARGET_OS_EMBEDDED for PLATFORM(IOS) in the header files in Source/WebCore/bindings/objc.

[Daniel Bates]

Committed r161638: <http://trac.webkit.org/changeset/161638>

[Csaba Osztrogonác]

Comment on attachment 220748 [details]
Patch

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

> Source/WebCore/DerivedSources.make:745
> +ADDITIONAL_BINDING_IDLS = \
> +	GestureEvent.idl \
> +	Touch.idl \
> +	TouchEvent.idl \
> +	TouchList.idl

It is incorrect, because these bindings weren't inside MACOS guard
and it broke the Windows build. See https://bugs.webkit.org/show_bug.cgi?id=126916
for details.