Bug 119863 – [iOS] Upstream WebCore/editing/ios

• Status: RESOLVED
• Resolution: FIXED
• Component: HTML Editing

[Daniel Bates]

Upstream iOS-specific changes to WebCore/editing.

[Daniel Bates]

Created attachment 208854 [details]
Patch

[David Kilzer (:ddkilzer)]

Comment on attachment 208854 [details]
Patch

r=me, but you should upstream the Xcode project file changes so this file shows up in Xcode with the project.  (Otherwise, it's going to miss out on project-wide searches, etc.)

[Daniel Bates]

Created attachment 208855 [details]
Patch

[Daniel Bates]

Comment on attachment 208855 [details]
Patch

Clearing review flag since David Kilzer r+'ed the patch in comment 2. Will land this version of the patch, which add EditorIOS.mm to the WebCore Xcode project file.

[Daniel Bates]

Committed r154134: <http://trac.webkit.org/changeset/154134>

[David Kilzer (:ddkilzer)]

Comment on attachment 208855 [details]
Patch

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

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:5239
> +		CE13CA9517BD7DB3001CF3BE /* EditorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE13CA9417BD7DB3001CF3BE /* EditorIOS.mm */; };

Please use the UUIDs from the iOS tree.  It will make merging much simpler later.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:12010
> +		CE13CA9417BD7DB3001CF3BE /* EditorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EditorIOS.mm; sourceTree = "<group>"; };

Ditto.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:15513
> +				CE13CA9317BD7DB3001CF3BE /* ios */,

Ditto.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:19496
> +		CE13CA9317BD7DB3001CF3BE /* ios */ = {
> +			isa = PBXGroup;
> +			children = (
> +				CE13CA9417BD7DB3001CF3BE /* EditorIOS.mm */,
> +			);
> +			path = ios;
> +			sourceTree = "<group>";
> +		};

Ditto.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:24999
> +				CE13CA9517BD7DB3001CF3BE /* EditorIOS.mm in Sources */,

Ditto.

[Daniel Bates]

Reopening bug to fix up WebCore Xcode project file.

[Daniel Bates]

Created attachment 208860 [details]
Fix up WebCore Xcode project file

[David Kilzer (:ddkilzer)]

Comment on attachment 208860 [details]
Fix up WebCore Xcode project file

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

You also need to fix the 'ios' subdirectory that was added.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:19394
>  		CE13CA9317BD7DB3001CF3BE /* ios */ = {

This needs to be fixed as well.

[Daniel Bates]

Created attachment 208861 [details]
Fix up WebCore Xcode project file

Use the same UUID for group ios as we do in the iOS tree.

[David Kilzer (:ddkilzer)]

Comment on attachment 208861 [details]
Fix up WebCore Xcode project file

r=me!

[Daniel Bates]

Committed r154140: <http://trac.webkit.org/changeset/154140>