Bug 119863 - [iOS] Upstream WebCore/editing/ios
Summary: [iOS] Upstream WebCore/editing/ios
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: HTML Editing (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Daniel Bates
URL:
Keywords:
Depends on:
Blocks: 116412
  Show dependency tree / graph
 
Reported: 2013-08-15 13:59 PDT by Daniel Bates
Modified: 2013-08-15 15:07 PDT (History)
2 users (show)

See Also:

Attachments
Patch (11.04 KB, patch)
2013-08-15 14:13 PDT, Daniel Bates 		no flags Details | Formatted Diff | Diff
Patch (15.31 KB, patch)
2013-08-15 14:25 PDT, Daniel Bates 		ddkilzer: review-
Details | Formatted Diff | Diff
Fix up WebCore Xcode project file (4.88 KB, patch)
2013-08-15 14:48 PDT, Daniel Bates 		ddkilzer: review-
Details | Formatted Diff | Diff
Fix up WebCore Xcode project file (5.33 KB, patch)
2013-08-15 14:58 PDT, Daniel Bates 		ddkilzer: review+
Details | Formatted Diff | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Bates 2013-08-15 13:59:36 PDT 
Upstream iOS-specific changes to WebCore/editing.
Comment 1 Daniel Bates 2013-08-15 14:13:20 PDT 
Created attachment 208854 [details]
Patch
Comment 2 David Kilzer (:ddkilzer) 2013-08-15 14:18:08 PDT 
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.)
Comment 3 Daniel Bates 2013-08-15 14:25:45 PDT 
Created attachment 208855 [details]
Patch
Comment 4 Daniel Bates 2013-08-15 14:30:22 PDT 
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.
Comment 5 Daniel Bates 2013-08-15 14:32:14 PDT 
Committed r154134: <http://trac.webkit.org/changeset/154134>
Comment 6 David Kilzer (:ddkilzer) 2013-08-15 14:32:41 PDT 
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.
Comment 7 Daniel Bates 2013-08-15 14:47:40 PDT 
Reopening bug to fix up WebCore Xcode project file.
Comment 8 Daniel Bates 2013-08-15 14:48:43 PDT 
Created attachment 208860 [details]
Fix up WebCore Xcode project file
Comment 9 David Kilzer (:ddkilzer) 2013-08-15 14:50:13 PDT 
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.
Comment 10 Daniel Bates 2013-08-15 14:58:35 PDT 
Created attachment 208861 [details]
Fix up WebCore Xcode project file

Use the same UUID for group ios as we do in the iOS tree.
Comment 11 David Kilzer (:ddkilzer) 2013-08-15 15:00:17 PDT 
Comment on attachment 208861 [details]
Fix up WebCore Xcode project file

r=me!
Comment 12 Daniel Bates 2013-08-15 15:07:10 PDT 
Committed r154140: <http://trac.webkit.org/changeset/154140>