119863 2013-08-15 13:59:36 -0700 [iOS] Upstream WebCore/editing/ios 2013-08-15 15:07:10 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116412 1 dbates dbates darin ddkilzer oldest_to_newest 917684 0 dbates 2013-08-15 13:59:36 -0700 Upstream iOS-specific changes to WebCore/editing. 917692 1 208854 dbates 2013-08-15 14:13:20 -0700 Created attachment 208854 Patch 917694 2 208854 ddkilzer 2013-08-15 14:18:08 -0700 Comment on attachment 208854 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.) 917699 3 208855 dbates 2013-08-15 14:25:45 -0700 Created attachment 208855 Patch 917704 4 208855 dbates 2013-08-15 14:30:22 -0700 Comment on attachment 208855 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. 917706 5 dbates 2013-08-15 14:32:14 -0700 Committed r154134: <http://trac.webkit.org/changeset/154134> 917707 6 208855 ddkilzer 2013-08-15 14:32:41 -0700 Comment on attachment 208855 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. 917715 7 dbates 2013-08-15 14:47:40 -0700 Reopening bug to fix up WebCore Xcode project file. 917716 8 208860 dbates 2013-08-15 14:48:43 -0700 Created attachment 208860 Fix up WebCore Xcode project file 917718 9 208860 ddkilzer 2013-08-15 14:50:13 -0700 Comment on attachment 208860 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. 917720 10 208861 dbates 2013-08-15 14:58:35 -0700 Created attachment 208861 Fix up WebCore Xcode project file Use the same UUID for group ios as we do in the iOS tree. 917721 11 208861 ddkilzer 2013-08-15 15:00:17 -0700 Comment on attachment 208861 Fix up WebCore Xcode project file r=me! 917725 12 dbates 2013-08-15 15:07:10 -0700 Committed r154140: <http://trac.webkit.org/changeset/154140> 208854 2013-08-15 14:13:20 -0700 2013-08-15 14:25:43 -0700 Patch bug-119863-20130815141323.patch text/plain 11308 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAwYzJhNDMxNzQ3NjE0 NDYwYmNjZWQ1MWE5YTJkYWIyYmNjZGRlYi4uNjkzZDJhNTJkODk2NDg0OTQxYTQwNGQ3MTQyNzM5 MDVmNDcyYTg0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA4LTE1ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMTE5ODYzPiBbaU9TXSBVcHN0cmVhbSBXZWJDb3JlL2VkaXRpbmcvaW9zCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL2lvcy9F ZGl0b3JJT1MubW06IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpuZXdHZW5lcmFs Q2xpcGJvYXJkKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6c2hvd0ZvbnRQYW5lbCk6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnNob3dTdHlsZXNQYW5lbCk6CisgICAgICAgIChXZWJD b3JlOjpFZGl0b3I6OnNob3dDb2xvclBhbmVsKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6 c2V0VGV4dEFsaWdubWVudEZvckNoYW5nZWRCYXNlV3JpdGluZ0RpcmVjdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpFZGl0b3I6Omluc2VydFBhcmFncmFwaFNlcGFyYXRvckluUXVvdGVkQ29udGVu dCk6CisgICAgICAgIChXZWJDb3JlOjpzdHlsZUZvclNlbGVjdGlvblN0YXJ0KToKKyAgICAgICAg KFdlYkNvcmU6OkVkaXRvcjo6Zm9udEZvclNlbGVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpF ZGl0b3I6OmZvbnRBdHRyaWJ1dGVzRm9yU2VsZWN0aW9uU3RhcnQpOgorICAgICAgICAoV2ViQ29y ZTo6RWRpdG9yOjpyZW1vdmVVbmNoYW5nZWFibGVTdHlsZXMpOgorCiAyMDEzLTA4LTE0ICBSb2Ig QnVpcyAgPHJ3bGJ1aXNAd2Via2l0Lm9yZz4KIAogICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSBp biBSZW5kZXJPYmplY3Q6OmRyYXdMaW5lRm9yQm94U2lkZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9pb3MvRWRpdG9ySU9TLm1tIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9p b3MvRWRpdG9ySU9TLm1tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjcyMGQ1YzlmNjE4NDM0ZDU5ZDgyZmIzZjQ4YTY0 NDBhNDk2NDFiZmYKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2lv cy9FZGl0b3JJT1MubW0KQEAgLTAsMCArMSwyNjUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIw MDYsIDIwMDcsIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor CisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiRWRpdG9yLmgiCisKKyNpbmNsdWRlICJD bGlwYm9hcmQuaCIKKyNpbmNsdWRlICJDbGlwYm9hcmRJT1MuaCIKKyNpbmNsdWRlICJDU1NDb21w dXRlZFN0eWxlRGVjbGFyYXRpb24uaCIKKyNpbmNsdWRlICJDU1NQcmltaXRpdmVWYWx1ZU1hcHBp bmdzLmgiCisjaW5jbHVkZSAiRm9udC5oIgorI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAi SFRNTElucHV0RWxlbWVudC5oIgorI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgorI2luY2x1ZGUgIkhU TUxUZXh0QXJlYUVsZW1lbnQuaCIKKyNpbmNsdWRlICJOb2RlVHJhdmVyc2FsLmgiCisjaW5jbHVk ZSAiUmVuZGVyQmxvY2suaCIKKyNpbmNsdWRlICJTdHlsZVByb3BlcnR5U2V0LmgiCisjaW5jbHVk ZSAiVGV4dC5oIgorI2luY2x1ZGUgIlR5cGluZ0NvbW1hbmQuaCIKKyNpbmNsdWRlICJXQUtBcHBL aXRTdHVicy5oIgorI2luY2x1ZGUgImh0bWxlZGl0aW5nLmgiCisKKyNpZiBQTEFURk9STShJT1Mp CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKwordXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKKwor UGFzc1JlZlB0cjxDbGlwYm9hcmQ+IEVkaXRvcjo6bmV3R2VuZXJhbENsaXBib2FyZChDbGlwYm9h cmRBY2Nlc3NQb2xpY3kgcG9saWN5LCBGcmFtZSogZnJhbWUpCit7CisgICAgcmV0dXJuIENsaXBi b2FyZElPUzo6Y3JlYXRlKENsaXBib2FyZDo6Q29weUFuZFBhc3RlLCBwb2xpY3ksIGZyYW1lKTsK K30gICAgCisKK3ZvaWQgRWRpdG9yOjpzaG93Rm9udFBhbmVsKCkKK3sKK30KKwordm9pZCBFZGl0 b3I6OnNob3dTdHlsZXNQYW5lbCgpCit7Cit9CisKK3ZvaWQgRWRpdG9yOjpzaG93Q29sb3JQYW5l bCgpCit7Cit9CisKK3ZvaWQgRWRpdG9yOjpzZXRUZXh0QWxpZ25tZW50Rm9yQ2hhbmdlZEJhc2VX cml0aW5nRGlyZWN0aW9uKFdyaXRpbmdEaXJlY3Rpb24gZGlyZWN0aW9uKQoreworICAgIC8vIE5v dGUgdGhhdCB0aGUgcGFzc2VkLWluIGFyZ3VtZW50IGlzIHRoZSBkaXJlY3Rpb24gdGhhdCBoYXMg YmVlbiBjaGFuZ2VkIHRvIGJ5CisgICAgLy8gc29tZSBjb2RlIG9yIHVzZXIgaW50ZXJhY3Rpb24g b3V0c2lkZSB0aGUgc2NvcGUgb2YgdGhpcyBmdW5jdGlvbi4gVGhlIGZvcm1lcgorICAgIC8vIGRp cmVjdGlvbiBpcyBub3Qga25vd24sIG5vciBpcyBpdCByZXF1aXJlZCBmb3IgdGhlIGtpbmQgb2Yg dGV4dCBhbGlnbm1lbnQKKyAgICAvLyBjaGFuZ2VzIGRvbmUgYnkgdGhpcyBmdW5jdGlvbi4KKyAg ICAvLworICAgIC8vIFJ1bGVzOgorICAgIC8vIFdoZW4gdGV4dCBoYXMgbm8gZXhwbGljaXQgYWxp Z25tZW50LCBzZXQgdG8gYWxpZ25tZW50IHRvIG1hdGNoIHRoZSB3cml0aW5nIGRpcmVjdGlvbi4K KyAgICAvLyBJZiB0aGUgdGV4dCBoYXMgbGVmdCBvciByaWdodCBhbGlnbm1lbnQsIGZsaXAgbGVm dC0+cmlnaHQgYW5kIHJpZ2h0LT5sZWZ0LiAKKyAgICAvLyBPdGhlcndpc2UsIGRvIG5vdGhpbmcu CisKKyAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiBzZWxlY3Rpb25TdHlsZSA9IEVkaXRpbmdTdHls ZTo6c3R5bGVBdFNlbGVjdGlvblN0YXJ0KGZyYW1lKCktPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24o KSk7CisgICAgaWYgKCFzZWxlY3Rpb25TdHlsZSB8fCAhc2VsZWN0aW9uU3R5bGUtPnN0eWxlKCkp CisgICAgICAgICByZXR1cm47CisKKyAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHZhbHVl ID0gc3RhdGljX3BvaW50ZXJfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oc2VsZWN0aW9uU3R5bGUt PnN0eWxlKCktPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlUZXh0QWxpZ24pKTsKKyAg ICBpZiAoIXZhbHVlKQorICAgICAgICByZXR1cm47CisgICAgICAgIAorICAgIGNvbnN0IGNoYXIg Km5ld1ZhbHVlID0gTlVMTDsKKyAgICBFVGV4dEFsaWduIHRleHRBbGlnbiA9ICp2YWx1ZTsKKyAg ICBzd2l0Y2ggKHRleHRBbGlnbikgeworICAgICAgICBjYXNlIFRBU1RBUlQ6CisgICAgICAgIGNh c2UgVEFFTkQ6CisgICAgICAgIHsKKyAgICAgICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7Cisg ICAgICAgICAgICAgICAgY2FzZSBOYXR1cmFsV3JpdGluZ0RpcmVjdGlvbjoKKyAgICAgICAgICAg ICAgICAgICAgLy8gbm8tb3AKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICAgICAgY2FzZSBMZWZ0VG9SaWdodFdyaXRpbmdEaXJlY3Rpb246CisgICAgICAgICAgICAgICAg ICAgIG5ld1ZhbHVlID0gImxlZnQiOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgICAgICBjYXNlIFJpZ2h0VG9MZWZ0V3JpdGluZ0RpcmVjdGlvbjoKKyAgICAgICAgICAg ICAgICAgICAgbmV3VmFsdWUgPSAicmlnaHQiOworICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGNh c2UgTEVGVDoKKyAgICAgICAgY2FzZSBXRUJLSVRfTEVGVDoKKyAgICAgICAgICAgIG5ld1ZhbHVl ID0gInJpZ2h0IjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFJJR0hUOgorICAg ICAgICBjYXNlIFdFQktJVF9SSUdIVDoKKyAgICAgICAgICAgIG5ld1ZhbHVlID0gImxlZnQiOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQ0VOVEVSOgorICAgICAgICBjYXNlIFdF QktJVF9DRU5URVI6CisgICAgICAgIGNhc2UgSlVTVElGWToKKyAgICAgICAgICAgIC8vIG5vLW9w CisgICAgICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBpZiAoIW5ld1ZhbHVlKQorICAgICAg ICByZXR1cm47CisKKyAgICBFbGVtZW50KiBmb2N1c2VkRWxlbWVudCA9IGZyYW1lKCktPmRvY3Vt ZW50KCktPmZvY3VzZWRFbGVtZW50KCk7CisgICAgaWYgKGZvY3VzZWRFbGVtZW50ICYmIChmb2N1 c2VkRWxlbWVudC0+aGFzVGFnTmFtZSh0ZXh0YXJlYVRhZykgfHwgKGZvY3VzZWRFbGVtZW50LT5o YXNUYWdOYW1lKGlucHV0VGFnKSAmJgorICAgICAgICAoc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxl bWVudCo+KGZvY3VzZWRFbGVtZW50KS0+aXNUZXh0RmllbGQoKSB8fAorICAgICAgICAgc3RhdGlj X2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KGZvY3VzZWRFbGVtZW50KS0+aXNTZWFyY2hGaWVsZCgp KSkpKSB7CisgICAgICAgIGlmIChkaXJlY3Rpb24gPT0gTmF0dXJhbFdyaXRpbmdEaXJlY3Rpb24p CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4o Zm9jdXNlZEVsZW1lbnQpLT5zZXRBdHRyaWJ1dGUoYWxpZ25BdHRyLCBuZXdWYWx1ZSk7CisgICAg ICAgIGZyYW1lKCktPmRvY3VtZW50KCktPnVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKworICAgIFJlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gc3R5 bGUgPSBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDo6Y3JlYXRlKCk7CisgICAgc3R5bGUtPnNldFBy b3BlcnR5KENTU1Byb3BlcnR5VGV4dEFsaWduLCBuZXdWYWx1ZSk7CisgICAgYXBwbHlQYXJhZ3Jh cGhTdHlsZShzdHlsZS5nZXQoKSk7Cit9CisKK2Jvb2wgRWRpdG9yOjppbnNlcnRQYXJhZ3JhcGhT ZXBhcmF0b3JJblF1b3RlZENvbnRlbnQoKQoreworICAgIC8vIEZJWE1FOiBXaHkgaXMgdGhpcyBt aXNzaW5nIGNhbGxzIHRvIGNhbkVkaXQsIGNhbkVkaXRSaWNobHksIGV0Yy4uLgorICAgIFR5cGlu Z0NvbW1hbmQ6Omluc2VydFBhcmFncmFwaFNlcGFyYXRvckluUXVvdGVkQ29udGVudChtX2ZyYW1l LT5kb2N1bWVudCgpKTsKKyAgICByZXZlYWxTZWxlY3Rpb25BZnRlckVkaXRpbmdPcGVyYXRpb24o KTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworLy8gRklYTUU6IENvcGllZCBmcm9tIEVkaXRvck1h Yy4gVGhpcyBzaG91bGQgYmUgc2hhcmVkIGJldHdlZW4gdGhlIHR3byBzbyB0aGF0CisvLyB0aGUg aW1wbGVtZW50YXRpb24gZG9lcyBub3QgZGlmZmVyLgorc3RhdGljIFJlbmRlclN0eWxlKiBzdHls ZUZvclNlbGVjdGlvblN0YXJ0KEZyYW1lKiBmcmFtZSwgTm9kZSAqJm5vZGVUb1JlbW92ZSkKK3sK KyAgICBub2RlVG9SZW1vdmUgPSAwOworCisgICAgaWYgKGZyYW1lLT5zZWxlY3Rpb24oKS0+aXNO b25lKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgUG9zaXRpb24gcG9zaXRpb24gPSBmcmFt ZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpLnZpc2libGVTdGFydCgpLmRlZXBFcXVpdmFsZW50 KCk7CisgICAgaWYgKCFwb3NpdGlvbi5pc0NhbmRpZGF0ZSgpIHx8IHBvc2l0aW9uLmlzTnVsbCgp KQorICAgICAgICByZXR1cm4gMDsKKworICAgIFJlZlB0cjxFZGl0aW5nU3R5bGU+IHR5cGluZ1N0 eWxlID0gZnJhbWUtPnNlbGVjdGlvbigpLT50eXBpbmdTdHlsZSgpOworICAgIGlmICghdHlwaW5n U3R5bGUgfHwgIXR5cGluZ1N0eWxlLT5zdHlsZSgpKQorICAgICAgICByZXR1cm4gcG9zaXRpb24u ZGVwcmVjYXRlZE5vZGUoKS0+cmVuZGVyZXIoKS0+c3R5bGUoKTsKKworICAgIFJlZlB0cjxFbGVt ZW50PiBzdHlsZUVsZW1lbnQgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+Y3JlYXRlRWxlbWVudChzcGFu VGFnLCBmYWxzZSk7CisKKyAgICBTdHJpbmcgc3R5bGVUZXh0ID0gdHlwaW5nU3R5bGUtPnN0eWxl KCktPmFzVGV4dCgpICsgIiBkaXNwbGF5OiBpbmxpbmUiOworICAgIHN0eWxlRWxlbWVudC0+c2V0 QXR0cmlidXRlKHN0eWxlQXR0ciwgc3R5bGVUZXh0LmltcGwoKSk7CisKKyAgICBFeGNlcHRpb25D b2RlIGVjID0gMDsKKyAgICBzdHlsZUVsZW1lbnQtPmFwcGVuZENoaWxkKGZyYW1lLT5kb2N1bWVu dCgpLT5jcmVhdGVFZGl0aW5nVGV4dE5vZGUoIiIpLCBlYyk7CisgICAgQVNTRVJUKCFlYyk7CisK KyAgICBwb3NpdGlvbi5kZXByZWNhdGVkTm9kZSgpLT5wYXJlbnROb2RlKCktPmFwcGVuZENoaWxk KHN0eWxlRWxlbWVudCwgZWMpOworICAgIEFTU0VSVCghZWMpOworCisgICAgbm9kZVRvUmVtb3Zl ID0gc3R5bGVFbGVtZW50LmdldCgpOworICAgIHJldHVybiBzdHlsZUVsZW1lbnQtPnJlbmRlcmVy KCkgPyBzdHlsZUVsZW1lbnQtPnJlbmRlcmVyKCktPnN0eWxlKCkgOiAwOworfQorCitjb25zdCBT aW1wbGVGb250RGF0YSogRWRpdG9yOjpmb250Rm9yU2VsZWN0aW9uKGJvb2wmIGhhc011bHRpcGxl Rm9udHMpIGNvbnN0Cit7CisgICAgaGFzTXVsdGlwbGVGb250cyA9IGZhbHNlOworCisgICAgaWYg KCFtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+aXNSYW5nZSgpKSB7CisgICAgICAgIE5vZGUqIG5vZGVU b1JlbW92ZTsKKyAgICAgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gc3R5bGVGb3JTZWxlY3Rpb25T dGFydChtX2ZyYW1lLCBub2RlVG9SZW1vdmUpOyAvLyBzZXRzIG5vZGVUb1JlbW92ZQorCisgICAg ICAgIGNvbnN0IFNpbXBsZUZvbnREYXRhKiByZXN1bHQgPSAwOworICAgICAgICBpZiAoc3R5bGUp CisgICAgICAgICAgICByZXN1bHQgPSBzdHlsZS0+Zm9udCgpLnByaW1hcnlGb250KCk7CisKKyAg ICAgICAgaWYgKG5vZGVUb1JlbW92ZSkgeworICAgICAgICAgICAgRXhjZXB0aW9uQ29kZSBlYzsK KyAgICAgICAgICAgIG5vZGVUb1JlbW92ZS0+cmVtb3ZlKGVjKTsKKyAgICAgICAgICAgIEFTU0VS VCghZWMpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9CisKKyAg ICBjb25zdCBTaW1wbGVGb250RGF0YSogZm9udCA9IDA7CisgICAgUmVmUHRyPFJhbmdlPiByYW5n ZSA9IG1fZnJhbWUtPnNlbGVjdGlvbigpLT50b05vcm1hbGl6ZWRSYW5nZSgpOworICAgIGlmIChO b2RlKiBzdGFydE5vZGUgPSBhZGp1c3RlZFNlbGVjdGlvblN0YXJ0Rm9yU3R5bGVDb21wdXRhdGlv bihtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2VsZWN0aW9uKCkpLmRlcHJlY2F0ZWROb2RlKCkpIHsK KyAgICAgICAgTm9kZSogcGFzdEVuZCA9IHJhbmdlLT5wYXN0TGFzdE5vZGUoKTsKKyAgICAgICAg Ly8gSW4gdGhlIGxvb3AgYmVsb3csIG4gc2hvdWxkIGV2ZW50dWFsbHkgbWF0Y2ggcGFzdEVuZCBh bmQgbm90IGJlY29tZSBuaWwsIGJ1dCB3ZSd2ZSBzZWVuIGF0IGxlYXN0IG9uZQorICAgICAgICAv LyB1bnJlcHJvZHVjaWJsZSBjYXNlIHdoZXJlIHRoaXMgZGlkbid0IGhhcHBlbiwgc28gY2hlY2sg Zm9yIG51bGwgYWxzby4KKyAgICAgICAgZm9yIChOb2RlKiBub2RlID0gc3RhcnROb2RlOyBub2Rl ICYmIG5vZGUgIT0gcGFzdEVuZDsgbm9kZSA9IE5vZGVUcmF2ZXJzYWw6Om5leHQobm9kZSkpIHsK KyAgICAgICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigpOwor ICAgICAgICAgICAgaWYgKCFyZW5kZXJlcikKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgICAgIC8vIEZJWE1FOiBBcmUgdGhlcmUgYW55IG5vZGUgdHlwZXMgdGhhdCBoYXZlIHJl bmRlcmVycywgYnV0IHRoYXQgd2Ugc2hvdWxkIGJlIHNraXBwaW5nPworICAgICAgICAgICAgY29u c3QgU2ltcGxlRm9udERhdGEqIHByaW1hcnlGb250ID0gcmVuZGVyZXItPnN0eWxlKCktPmZvbnQo KS5wcmltYXJ5Rm9udCgpOworICAgICAgICAgICAgaWYgKCFmb250KQorICAgICAgICAgICAgICAg IGZvbnQgPSBwcmltYXJ5Rm9udDsKKyAgICAgICAgICAgIGVsc2UgaWYgKGZvbnQgIT0gcHJpbWFy eUZvbnQpIHsKKyAgICAgICAgICAgICAgICBoYXNNdWx0aXBsZUZvbnRzID0gdHJ1ZTsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAg IHJldHVybiBmb250OworfQorCitOU0RpY3Rpb25hcnkqIEVkaXRvcjo6Zm9udEF0dHJpYnV0ZXNG b3JTZWxlY3Rpb25TdGFydCgpIGNvbnN0Cit7CisgICAgTm9kZSogbm9kZVRvUmVtb3ZlOworICAg IFJlbmRlclN0eWxlKiBzdHlsZSA9IHN0eWxlRm9yU2VsZWN0aW9uU3RhcnQobV9mcmFtZSwgbm9k ZVRvUmVtb3ZlKTsKKyAgICBpZiAoIXN0eWxlKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAg TlNNdXRhYmxlRGljdGlvbmFyeSogcmVzdWx0ID0gW05TTXV0YWJsZURpY3Rpb25hcnkgZGljdGlv bmFyeV07CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwordm9pZCBFZGl0b3I6OnJlbW92ZVVuY2hh bmdlYWJsZVN0eWxlcygpCit7CisgICAgLy8gVGhpcyBmdW5jdGlvbiByZW1vdmVzIHN0eWxlcyB0 aGF0IHRoZSB1c2VyIGNhbm5vdCBtb2RpZnkgYnkgYXBwbHlpbmcgdGhlaXIgZGVmYXVsdCB2YWx1 ZXMuCisgICAgCisgICAgUmVmUHRyPEVkaXRpbmdTdHlsZT4gZWRpdGluZ1N0eWxlID0gRWRpdGlu Z1N0eWxlOjpjcmVhdGUobV9mcmFtZS0+ZG9jdW1lbnQoKS0+Ym9keSgpKTsKKyAgICBSZWZQdHI8 TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IGRlZmF1bHRTdHlsZSA9IGVkaXRpbmdTdHlsZS5nZXQo KS0+c3R5bGUoKS0+bXV0YWJsZUNvcHkoKTsKKyAgICAKKyAgICAvLyBUZXh0IHdpZGdldHMgaW1w bGVtZW50IGJhY2tncm91bmQgY29sb3IgdmlhIHRoZSBVSVZpZXcgcHJvcGVydHkuIFRoZWlyIGJv ZHkgZWxlbWVudCB3aWxsIG5vdCBoYXZlIG9uZS4KKyAgICBkZWZhdWx0U3R5bGUtPnNldFByb3Bl cnR5KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCAicmdiYSgyNTUsIDI1NSwgMjU1LCAwLjAp Iik7CisgICAgCisgICAgLy8gUmVtb3ZlIHByb3BlcnRpZXMgdGhhdCB0aGUgdXNlciBjYW4gbW9k aWZ5LCBsaWtlIGZvbnQtd2VpZ2h0LiAKKyAgICAvLyBBbHNvIHJlbW92ZSBmb250LWZhbWlseSwg cGVyIEhJIHNwZWMuCisgICAgLy8gRklYTUU6IGl0J2QgYmUgbmljZSBpZiBrbm93bGVkZ2UgYWJv dXQgd2hpY2ggc3R5bGVzIHdlcmUgdW5jaGFuZ2VhYmxlIHdhcyBub3QgaGFyZC1jb2RlZCBoZXJl LgorICAgIGRlZmF1bHRTdHlsZS0+cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlGb250V2VpZ2h0 KTsKKyAgICBkZWZhdWx0U3R5bGUtPnJlbW92ZVByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFN0eWxl KTsKKyAgICBkZWZhdWx0U3R5bGUtPnJlbW92ZVByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlh bnQpOworICAgIC8vIEZJWE1FOiB3ZSBzaG91bGQgaGFuZGxlIGFsc28gcGFzdGVkIHF1b3RlZCB0 ZXh0LCBzdHJpa2V0aHJvdWdoLCBldGMuIDxyZGFyOi8vcHJvYmxlbS85MjU1MTE1PgorICAgIGRl ZmF1bHRTdHlsZS0+cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlUZXh0RGVjb3JhdGlvbik7Cisg ICAgZGVmYXVsdFN0eWxlLT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNv cmF0aW9uc0luRWZmZWN0KTsgLy8gaW1wbGVtZW50cyB1bmRlcmxpbmUKKworICAgIC8vIEZJWE1F IGFkZCBFZGl0QWN0aW9uTWF0Y2hTdGx5ZSA8cmRhcjovL3Byb2JsZW0vOTE1NjUwNz4gVW5kbyBy aWNoIHRleHQncyBwYXN0ZSAmIG1hdGNoIHN0eWxlIHNob3VsZCBzYXkgIlVuZG8gTWF0Y2ggU3R5 bGUiCisgICAgYXBwbHlTdHlsZVRvU2VsZWN0aW9uKGRlZmF1bHRTdHlsZS5nZXQoKSwgRWRpdEFj dGlvbkNoYW5nZUF0dHJpYnV0ZXMpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNl bmRpZiAvLyBQTEFURk9STShJT1MpCg== 208855 2013-08-15 14:25:45 -0700 2013-08-15 14:48:43 -0700 Patch bug-119863-20130815142548.patch text/plain 15673 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAwYzJhNDMxNzQ3NjE0 NDYwYmNjZWQ1MWE5YTJkYWIyYmNjZGRlYi4uYjliYzViNTMzYzVmODBlOGE3MTEyMDk2YjFiNzVm ZjM4MzBhNTg4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA4LTE1ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMTE5ODYzPiBbaU9TXSBVcHN0cmVhbSBXZWJDb3JlL2VkaXRpbmcvaW9zCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogZWRpdGluZy9pb3MvRWRpdG9ySU9TLm1t OiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6bmV3R2VuZXJhbENsaXBib2FyZCk6 CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnNob3dGb250UGFuZWwpOgorICAgICAgICAoV2Vi Q29yZTo6RWRpdG9yOjpzaG93U3R5bGVzUGFuZWwpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9y OjpzaG93Q29sb3JQYW5lbCk6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnNldFRleHRBbGln bm1lbnRGb3JDaGFuZ2VkQmFzZVdyaXRpbmdEaXJlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6 RWRpdG9yOjppbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JJblF1b3RlZENvbnRlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6c3R5bGVGb3JTZWxlY3Rpb25TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpF ZGl0b3I6OmZvbnRGb3JTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpmb250 QXR0cmlidXRlc0ZvclNlbGVjdGlvblN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6 cmVtb3ZlVW5jaGFuZ2VhYmxlU3R5bGVzKToKKwogMjAxMy0wOC0xNCAgUm9iIEJ1aXMgIDxyd2xi dWlzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQXNzZXJ0aW9uIGZhaWx1cmUgaW4gUmVuZGVyT2Jq ZWN0OjpkcmF3TGluZUZvckJveFNpZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBlN2M0NDYzNDQ3MmMwNzRlMWYxNTc1N2U4NTE1 ZTQ5YThiMDhiYmIzLi42YWU0YWQzNDdjMzhkNjc0YTI5ODVkYWYxMzU0ODM1MWMxMGZjNTFkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CkBAIC01MjM2LDYgKzUyMzYsNyBAQAogCQlDRTA1N0ZBNjEyMjA3MzExMDBBNDc2RDUgLyogRG9j dW1lbnRNYXJrZXJDb250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBDRTA1N0ZBNDEyMjA3MzExMDBBNDc2RDUgLyogRG9jdW1lbnRNYXJrZXJD b250cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg fTsKIAkJQ0UwOEMzRDExNTJCNTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENvbnRyb2xs ZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0Uw OEMzQ0YxNTJCNTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuY3BwICov OyB9OwogCQlDRTA4QzNEMjE1MkI1OTlBMDAyMUI4QzIgLyogQWx0ZXJuYXRpdmVUZXh0Q29udHJv bGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0Uw OEMzRDAxNTJCNTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuaCAqLzsg c2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9ICgpOyB9OyB9OworCQlDRTEzQ0E5NTE3QkQ3REIzMDAx Q0YzQkUgLyogRWRpdG9ySU9TLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gQ0UxM0NBOTQxN0JEN0RCMzAwMUNGM0JFIC8qIEVkaXRvcklPUy5tbSAqLzsg fTsKIAkJQ0U3QjJEQjMxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0aXZlVGV4dFVJQ29udHJv bGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0U3 QjJEQUYxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0aXZlVGV4dFVJQ29udHJvbGxlci5oICov OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUNFN0IyREI0 MTU4NkFCQUQwMDk4QjNGQSAvKiBBbHRlcm5hdGl2ZVRleHRVSUNvbnRyb2xsZXIubW0gaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRTdCMkRCMDE1ODZBQkFE MDA5OEIzRkEgLyogQWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyLm1tICovOyB9OwogCQlDRTdC MkRCNTE1ODZBQkFEMDA5OEIzRkEgLyogVGV4dEFsdGVybmF0aXZlV2l0aFJhbmdlLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRTdCMkRCMTE1ODZBQkFE MDA5OEIzRkEgLyogVGV4dEFsdGVybmF0aXZlV2l0aFJhbmdlLmggKi87IHNldHRpbmdzID0ge0FU VFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTEyMDA2LDYgKzEyMDA3LDcgQEAKIAkJ Q0UwNTdGQTQxMjIwNzMxMTAwQTQ3NkQ1IC8qIERvY3VtZW50TWFya2VyQ29udHJvbGxlci5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXIu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0UwOEMzQ0YxNTJCNTk5QTAwMjFCOEMy IC8qIEFsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCUNFMDhDM0QwMTUyQjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2 ZVRleHRDb250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEFsdGVy bmF0aXZlVGV4dENvbnRyb2xsZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJQ0Ux M0NBOTQxN0JEN0RCMzAwMUNGM0JFIC8qIEVkaXRvcklPUy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLm9iamNwcDsgcGF0aCA9IEVkaXRvcklPUy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJQ0U1Q0IxQjMxNEVEQUI2RjAwQkIyNzk1IC8qIEV2ZW50U2VuZGVyLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEV2ZW50U2VuZGVyLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCUNFN0IyREFGMTU4NkFCQUQwMDk4QjNGQSAvKiBBbHRlcm5hdGl2ZVRl eHRVSUNvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gQWx0ZXJu YXRpdmVUZXh0VUlDb250cm9sbGVyLmg7IHBhdGggPSBtYWMvQWx0ZXJuYXRpdmVUZXh0VUlDb250 cm9sbGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUNFN0IyREIwMTU4NkFCQUQw MDk4QjNGQSAvKiBBbHRlcm5hdGl2ZVRleHRVSUNvbnRyb2xsZXIubW0gKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5vYmpjcHA7IG5hbWUgPSBBbHRlcm5hdGl2ZVRleHRVSUNvbnRyb2xsZXIubW07 IHBhdGggPSBtYWMvQWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwpAQCAtMTU1MDgsNiArMTU1MTAsNyBAQAogCQk5MzMwOUQ4NjA5OUU2NDkx MDA1NkU1ODEgLyogZWRpdGluZyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRy ZW4gPSAoCisJCQkJQ0UxM0NBOTMxN0JEN0RCMzAwMUNGM0JFIC8qIGlvcyAqLywKIAkJCQlFRDUw MURDOTBCMjQ5RjM5MDBBRTE4RDkgLyogbWFjICovLAogCQkJCUNFMDhDM0NGMTUyQjU5OUEwMDIx QjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcCAqLywKIAkJCQlDRTA4QzNEMDE1 MkI1OTlBMDAyMUI4QzIgLyogQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5oICovLApAQCAtMTk0 ODMsNiArMTk0ODYsMTQgQEAKIAkJCW5hbWUgPSBFbmNyeXB0ZWRNZWRpYTsKIAkJCXNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7CiAJCX07CisJCUNFMTNDQTkzMTdCRDdEQjMwMDFDRjNCRSAvKiBpb3Mg Ki8gPSB7CisJCQlpc2EgPSBQQlhHcm91cDsKKwkJCWNoaWxkcmVuID0gKAorCQkJCUNFMTNDQTk0 MTdCRDdEQjMwMDFDRjNCRSAvKiBFZGl0b3JJT1MubW0gKi8sCisJCQkpOworCQkJcGF0aCA9IGlv czsKKwkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CisJCX07CiAJCURGOUFGRDZGMTNGQzMxQjAw MDE1RkVCNyAvKiBvYmpjICovID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9 ICgKQEAgLTI0OTg1LDYgKzI0OTk2LDcgQEAKIAkJCQk5QkFCNkM2RDEyNTUwNjMxMDAxNjI2RDQg LyogRWRpdGluZ1N0eWxlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTRCMzA0M0NDMEFFMDM3M0Iw MEE4MjY0NyAvKiBFZGl0b3IuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJOTNBMzhCNEIwRDBFNTgw ODAwNjg3MkMyIC8qIEVkaXRvckNvbW1hbmQuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJQ0UxM0NB OTUxN0JEN0RCMzAwMUNGM0JFIC8qIEVkaXRvcklPUy5tbSBpbiBTb3VyY2VzICovLAogCQkJCUVE NTAxREM2MEIyNDlGMjkwMEFFMThEOSAvKiBFZGl0b3JNYWMubW0gaW4gU291cmNlcyAqLywKIAkJ CQlBOEM0QTgwODA5RDU2MzI3MDAwM0FDOEQgLyogRWxlbWVudC5jcHAgaW4gU291cmNlcyAqLywK IAkJCQk0RkZDMDIyRDE2NDNCNzI2MDA0RTE2MzggLyogRWxlbWVudFJhcmVEYXRhLmNwcCBpbiBT b3VyY2VzICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9pb3MvRWRpdG9y SU9TLm1tIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9pb3MvRWRpdG9ySU9TLm1tCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjcyMGQ1YzlmNjE4NDM0ZDU5ZDgyZmIzZjQ4YTY0NDBhNDk2NDFiZmYKLS0tIC9kZXYvbnVs bAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2lvcy9FZGl0b3JJT1MubW0KQEAgLTAsMCAr MSwyNjUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMTMgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisg KiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMg cHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAq IEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1F RC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBF WEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJW SUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisj aW5jbHVkZSAiRWRpdG9yLmgiCisKKyNpbmNsdWRlICJDbGlwYm9hcmQuaCIKKyNpbmNsdWRlICJD bGlwYm9hcmRJT1MuaCIKKyNpbmNsdWRlICJDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uaCIK KyNpbmNsdWRlICJDU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgiCisjaW5jbHVkZSAiRm9udC5o IgorI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiSFRNTElucHV0RWxlbWVudC5oIgorI2lu Y2x1ZGUgIkhUTUxOYW1lcy5oIgorI2luY2x1ZGUgIkhUTUxUZXh0QXJlYUVsZW1lbnQuaCIKKyNp bmNsdWRlICJOb2RlVHJhdmVyc2FsLmgiCisjaW5jbHVkZSAiUmVuZGVyQmxvY2suaCIKKyNpbmNs dWRlICJTdHlsZVByb3BlcnR5U2V0LmgiCisjaW5jbHVkZSAiVGV4dC5oIgorI2luY2x1ZGUgIlR5 cGluZ0NvbW1hbmQuaCIKKyNpbmNsdWRlICJXQUtBcHBLaXRTdHVicy5oIgorI2luY2x1ZGUgImh0 bWxlZGl0aW5nLmgiCisKKyNpZiBQTEFURk9STShJT1MpCisKK25hbWVzcGFjZSBXZWJDb3JlIHsK KwordXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKKworUGFzc1JlZlB0cjxDbGlwYm9hcmQ+IEVk aXRvcjo6bmV3R2VuZXJhbENsaXBib2FyZChDbGlwYm9hcmRBY2Nlc3NQb2xpY3kgcG9saWN5LCBG cmFtZSogZnJhbWUpCit7CisgICAgcmV0dXJuIENsaXBib2FyZElPUzo6Y3JlYXRlKENsaXBib2Fy ZDo6Q29weUFuZFBhc3RlLCBwb2xpY3ksIGZyYW1lKTsKK30gICAgCisKK3ZvaWQgRWRpdG9yOjpz aG93Rm9udFBhbmVsKCkKK3sKK30KKwordm9pZCBFZGl0b3I6OnNob3dTdHlsZXNQYW5lbCgpCit7 Cit9CisKK3ZvaWQgRWRpdG9yOjpzaG93Q29sb3JQYW5lbCgpCit7Cit9CisKK3ZvaWQgRWRpdG9y OjpzZXRUZXh0QWxpZ25tZW50Rm9yQ2hhbmdlZEJhc2VXcml0aW5nRGlyZWN0aW9uKFdyaXRpbmdE aXJlY3Rpb24gZGlyZWN0aW9uKQoreworICAgIC8vIE5vdGUgdGhhdCB0aGUgcGFzc2VkLWluIGFy Z3VtZW50IGlzIHRoZSBkaXJlY3Rpb24gdGhhdCBoYXMgYmVlbiBjaGFuZ2VkIHRvIGJ5CisgICAg Ly8gc29tZSBjb2RlIG9yIHVzZXIgaW50ZXJhY3Rpb24gb3V0c2lkZSB0aGUgc2NvcGUgb2YgdGhp cyBmdW5jdGlvbi4gVGhlIGZvcm1lcgorICAgIC8vIGRpcmVjdGlvbiBpcyBub3Qga25vd24sIG5v ciBpcyBpdCByZXF1aXJlZCBmb3IgdGhlIGtpbmQgb2YgdGV4dCBhbGlnbm1lbnQKKyAgICAvLyBj aGFuZ2VzIGRvbmUgYnkgdGhpcyBmdW5jdGlvbi4KKyAgICAvLworICAgIC8vIFJ1bGVzOgorICAg IC8vIFdoZW4gdGV4dCBoYXMgbm8gZXhwbGljaXQgYWxpZ25tZW50LCBzZXQgdG8gYWxpZ25tZW50 IHRvIG1hdGNoIHRoZSB3cml0aW5nIGRpcmVjdGlvbi4KKyAgICAvLyBJZiB0aGUgdGV4dCBoYXMg bGVmdCBvciByaWdodCBhbGlnbm1lbnQsIGZsaXAgbGVmdC0+cmlnaHQgYW5kIHJpZ2h0LT5sZWZ0 LiAKKyAgICAvLyBPdGhlcndpc2UsIGRvIG5vdGhpbmcuCisKKyAgICBSZWZQdHI8RWRpdGluZ1N0 eWxlPiBzZWxlY3Rpb25TdHlsZSA9IEVkaXRpbmdTdHlsZTo6c3R5bGVBdFNlbGVjdGlvblN0YXJ0 KGZyYW1lKCktPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKSk7CisgICAgaWYgKCFzZWxlY3Rpb25T dHlsZSB8fCAhc2VsZWN0aW9uU3R5bGUtPnN0eWxlKCkpCisgICAgICAgICByZXR1cm47CisKKyAg ICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHZhbHVlID0gc3RhdGljX3BvaW50ZXJfY2FzdDxD U1NQcmltaXRpdmVWYWx1ZT4oc2VsZWN0aW9uU3R5bGUtPnN0eWxlKCktPmdldFByb3BlcnR5Q1NT VmFsdWUoQ1NTUHJvcGVydHlUZXh0QWxpZ24pKTsKKyAgICBpZiAoIXZhbHVlKQorICAgICAgICBy ZXR1cm47CisgICAgICAgIAorICAgIGNvbnN0IGNoYXIgKm5ld1ZhbHVlID0gTlVMTDsKKyAgICBF VGV4dEFsaWduIHRleHRBbGlnbiA9ICp2YWx1ZTsKKyAgICBzd2l0Y2ggKHRleHRBbGlnbikgewor ICAgICAgICBjYXNlIFRBU1RBUlQ6CisgICAgICAgIGNhc2UgVEFFTkQ6CisgICAgICAgIHsKKyAg ICAgICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7CisgICAgICAgICAgICAgICAgY2FzZSBOYXR1 cmFsV3JpdGluZ0RpcmVjdGlvbjoKKyAgICAgICAgICAgICAgICAgICAgLy8gbm8tb3AKKyAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBMZWZ0VG9SaWdodFdy aXRpbmdEaXJlY3Rpb246CisgICAgICAgICAgICAgICAgICAgIG5ld1ZhbHVlID0gImxlZnQiOwor ICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBjYXNlIFJpZ2h0VG9M ZWZ0V3JpdGluZ0RpcmVjdGlvbjoKKyAgICAgICAgICAgICAgICAgICAgbmV3VmFsdWUgPSAicmln aHQiOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGNhc2UgTEVGVDoKKyAgICAgICAgY2FzZSBX RUJLSVRfTEVGVDoKKyAgICAgICAgICAgIG5ld1ZhbHVlID0gInJpZ2h0IjsKKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICBjYXNlIFJJR0hUOgorICAgICAgICBjYXNlIFdFQktJVF9SSUdIVDoK KyAgICAgICAgICAgIG5ld1ZhbHVlID0gImxlZnQiOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGNhc2UgQ0VOVEVSOgorICAgICAgICBjYXNlIFdFQktJVF9DRU5URVI6CisgICAgICAgIGNh c2UgSlVTVElGWToKKyAgICAgICAgICAgIC8vIG5vLW9wCisgICAgICAgICAgICBicmVhazsKKyAg ICB9CisKKyAgICBpZiAoIW5ld1ZhbHVlKQorICAgICAgICByZXR1cm47CisKKyAgICBFbGVtZW50 KiBmb2N1c2VkRWxlbWVudCA9IGZyYW1lKCktPmRvY3VtZW50KCktPmZvY3VzZWRFbGVtZW50KCk7 CisgICAgaWYgKGZvY3VzZWRFbGVtZW50ICYmIChmb2N1c2VkRWxlbWVudC0+aGFzVGFnTmFtZSh0 ZXh0YXJlYVRhZykgfHwgKGZvY3VzZWRFbGVtZW50LT5oYXNUYWdOYW1lKGlucHV0VGFnKSAmJgor ICAgICAgICAoc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KGZvY3VzZWRFbGVtZW50KS0+ aXNUZXh0RmllbGQoKSB8fAorICAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+ KGZvY3VzZWRFbGVtZW50KS0+aXNTZWFyY2hGaWVsZCgpKSkpKSB7CisgICAgICAgIGlmIChkaXJl Y3Rpb24gPT0gTmF0dXJhbFdyaXRpbmdEaXJlY3Rpb24pCisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4oZm9jdXNlZEVsZW1lbnQpLT5zZXRBdHRy aWJ1dGUoYWxpZ25BdHRyLCBuZXdWYWx1ZSk7CisgICAgICAgIGZyYW1lKCktPmRvY3VtZW50KCkt PnVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIFJl ZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gc3R5bGUgPSBNdXRhYmxlU3R5bGVQcm9wZXJ0 eVNldDo6Y3JlYXRlKCk7CisgICAgc3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5VGV4dEFs aWduLCBuZXdWYWx1ZSk7CisgICAgYXBwbHlQYXJhZ3JhcGhTdHlsZShzdHlsZS5nZXQoKSk7Cit9 CisKK2Jvb2wgRWRpdG9yOjppbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JJblF1b3RlZENvbnRlbnQo KQoreworICAgIC8vIEZJWE1FOiBXaHkgaXMgdGhpcyBtaXNzaW5nIGNhbGxzIHRvIGNhbkVkaXQs IGNhbkVkaXRSaWNobHksIGV0Yy4uLgorICAgIFR5cGluZ0NvbW1hbmQ6Omluc2VydFBhcmFncmFw aFNlcGFyYXRvckluUXVvdGVkQ29udGVudChtX2ZyYW1lLT5kb2N1bWVudCgpKTsKKyAgICByZXZl YWxTZWxlY3Rpb25BZnRlckVkaXRpbmdPcGVyYXRpb24oKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30K KworLy8gRklYTUU6IENvcGllZCBmcm9tIEVkaXRvck1hYy4gVGhpcyBzaG91bGQgYmUgc2hhcmVk IGJldHdlZW4gdGhlIHR3byBzbyB0aGF0CisvLyB0aGUgaW1wbGVtZW50YXRpb24gZG9lcyBub3Qg ZGlmZmVyLgorc3RhdGljIFJlbmRlclN0eWxlKiBzdHlsZUZvclNlbGVjdGlvblN0YXJ0KEZyYW1l KiBmcmFtZSwgTm9kZSAqJm5vZGVUb1JlbW92ZSkKK3sKKyAgICBub2RlVG9SZW1vdmUgPSAwOwor CisgICAgaWYgKGZyYW1lLT5zZWxlY3Rpb24oKS0+aXNOb25lKCkpCisgICAgICAgIHJldHVybiAw OworCisgICAgUG9zaXRpb24gcG9zaXRpb24gPSBmcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlv bigpLnZpc2libGVTdGFydCgpLmRlZXBFcXVpdmFsZW50KCk7CisgICAgaWYgKCFwb3NpdGlvbi5p c0NhbmRpZGF0ZSgpIHx8IHBvc2l0aW9uLmlzTnVsbCgpKQorICAgICAgICByZXR1cm4gMDsKKwor ICAgIFJlZlB0cjxFZGl0aW5nU3R5bGU+IHR5cGluZ1N0eWxlID0gZnJhbWUtPnNlbGVjdGlvbigp LT50eXBpbmdTdHlsZSgpOworICAgIGlmICghdHlwaW5nU3R5bGUgfHwgIXR5cGluZ1N0eWxlLT5z dHlsZSgpKQorICAgICAgICByZXR1cm4gcG9zaXRpb24uZGVwcmVjYXRlZE5vZGUoKS0+cmVuZGVy ZXIoKS0+c3R5bGUoKTsKKworICAgIFJlZlB0cjxFbGVtZW50PiBzdHlsZUVsZW1lbnQgPSBmcmFt ZS0+ZG9jdW1lbnQoKS0+Y3JlYXRlRWxlbWVudChzcGFuVGFnLCBmYWxzZSk7CisKKyAgICBTdHJp bmcgc3R5bGVUZXh0ID0gdHlwaW5nU3R5bGUtPnN0eWxlKCktPmFzVGV4dCgpICsgIiBkaXNwbGF5 OiBpbmxpbmUiOworICAgIHN0eWxlRWxlbWVudC0+c2V0QXR0cmlidXRlKHN0eWxlQXR0ciwgc3R5 bGVUZXh0LmltcGwoKSk7CisKKyAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKKyAgICBzdHlsZUVs ZW1lbnQtPmFwcGVuZENoaWxkKGZyYW1lLT5kb2N1bWVudCgpLT5jcmVhdGVFZGl0aW5nVGV4dE5v ZGUoIiIpLCBlYyk7CisgICAgQVNTRVJUKCFlYyk7CisKKyAgICBwb3NpdGlvbi5kZXByZWNhdGVk Tm9kZSgpLT5wYXJlbnROb2RlKCktPmFwcGVuZENoaWxkKHN0eWxlRWxlbWVudCwgZWMpOworICAg IEFTU0VSVCghZWMpOworCisgICAgbm9kZVRvUmVtb3ZlID0gc3R5bGVFbGVtZW50LmdldCgpOwor ICAgIHJldHVybiBzdHlsZUVsZW1lbnQtPnJlbmRlcmVyKCkgPyBzdHlsZUVsZW1lbnQtPnJlbmRl cmVyKCktPnN0eWxlKCkgOiAwOworfQorCitjb25zdCBTaW1wbGVGb250RGF0YSogRWRpdG9yOjpm b250Rm9yU2VsZWN0aW9uKGJvb2wmIGhhc011bHRpcGxlRm9udHMpIGNvbnN0Cit7CisgICAgaGFz TXVsdGlwbGVGb250cyA9IGZhbHNlOworCisgICAgaWYgKCFtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+ aXNSYW5nZSgpKSB7CisgICAgICAgIE5vZGUqIG5vZGVUb1JlbW92ZTsKKyAgICAgICAgUmVuZGVy U3R5bGUqIHN0eWxlID0gc3R5bGVGb3JTZWxlY3Rpb25TdGFydChtX2ZyYW1lLCBub2RlVG9SZW1v dmUpOyAvLyBzZXRzIG5vZGVUb1JlbW92ZQorCisgICAgICAgIGNvbnN0IFNpbXBsZUZvbnREYXRh KiByZXN1bHQgPSAwOworICAgICAgICBpZiAoc3R5bGUpCisgICAgICAgICAgICByZXN1bHQgPSBz dHlsZS0+Zm9udCgpLnByaW1hcnlGb250KCk7CisKKyAgICAgICAgaWYgKG5vZGVUb1JlbW92ZSkg eworICAgICAgICAgICAgRXhjZXB0aW9uQ29kZSBlYzsKKyAgICAgICAgICAgIG5vZGVUb1JlbW92 ZS0+cmVtb3ZlKGVjKTsKKyAgICAgICAgICAgIEFTU0VSVCghZWMpOworICAgICAgICB9CisKKyAg ICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9CisKKyAgICBjb25zdCBTaW1wbGVGb250RGF0YSog Zm9udCA9IDA7CisgICAgUmVmUHRyPFJhbmdlPiByYW5nZSA9IG1fZnJhbWUtPnNlbGVjdGlvbigp LT50b05vcm1hbGl6ZWRSYW5nZSgpOworICAgIGlmIChOb2RlKiBzdGFydE5vZGUgPSBhZGp1c3Rl ZFNlbGVjdGlvblN0YXJ0Rm9yU3R5bGVDb21wdXRhdGlvbihtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+ c2VsZWN0aW9uKCkpLmRlcHJlY2F0ZWROb2RlKCkpIHsKKyAgICAgICAgTm9kZSogcGFzdEVuZCA9 IHJhbmdlLT5wYXN0TGFzdE5vZGUoKTsKKyAgICAgICAgLy8gSW4gdGhlIGxvb3AgYmVsb3csIG4g c2hvdWxkIGV2ZW50dWFsbHkgbWF0Y2ggcGFzdEVuZCBhbmQgbm90IGJlY29tZSBuaWwsIGJ1dCB3 ZSd2ZSBzZWVuIGF0IGxlYXN0IG9uZQorICAgICAgICAvLyB1bnJlcHJvZHVjaWJsZSBjYXNlIHdo ZXJlIHRoaXMgZGlkbid0IGhhcHBlbiwgc28gY2hlY2sgZm9yIG51bGwgYWxzby4KKyAgICAgICAg Zm9yIChOb2RlKiBub2RlID0gc3RhcnROb2RlOyBub2RlICYmIG5vZGUgIT0gcGFzdEVuZDsgbm9k ZSA9IE5vZGVUcmF2ZXJzYWw6Om5leHQobm9kZSkpIHsKKyAgICAgICAgICAgIFJlbmRlck9iamVj dCogcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigpOworICAgICAgICAgICAgaWYgKCFyZW5kZXJl cikKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBBcmUg dGhlcmUgYW55IG5vZGUgdHlwZXMgdGhhdCBoYXZlIHJlbmRlcmVycywgYnV0IHRoYXQgd2Ugc2hv dWxkIGJlIHNraXBwaW5nPworICAgICAgICAgICAgY29uc3QgU2ltcGxlRm9udERhdGEqIHByaW1h cnlGb250ID0gcmVuZGVyZXItPnN0eWxlKCktPmZvbnQoKS5wcmltYXJ5Rm9udCgpOworICAgICAg ICAgICAgaWYgKCFmb250KQorICAgICAgICAgICAgICAgIGZvbnQgPSBwcmltYXJ5Rm9udDsKKyAg ICAgICAgICAgIGVsc2UgaWYgKGZvbnQgIT0gcHJpbWFyeUZvbnQpIHsKKyAgICAgICAgICAgICAg ICBoYXNNdWx0aXBsZUZvbnRzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBmb250OworfQorCitOU0Rp Y3Rpb25hcnkqIEVkaXRvcjo6Zm9udEF0dHJpYnV0ZXNGb3JTZWxlY3Rpb25TdGFydCgpIGNvbnN0 Cit7CisgICAgTm9kZSogbm9kZVRvUmVtb3ZlOworICAgIFJlbmRlclN0eWxlKiBzdHlsZSA9IHN0 eWxlRm9yU2VsZWN0aW9uU3RhcnQobV9mcmFtZSwgbm9kZVRvUmVtb3ZlKTsKKyAgICBpZiAoIXN0 eWxlKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgTlNNdXRhYmxlRGljdGlvbmFyeSogcmVz dWx0ID0gW05TTXV0YWJsZURpY3Rpb25hcnkgZGljdGlvbmFyeV07CisgICAgcmV0dXJuIHJlc3Vs dDsKK30KKwordm9pZCBFZGl0b3I6OnJlbW92ZVVuY2hhbmdlYWJsZVN0eWxlcygpCit7CisgICAg Ly8gVGhpcyBmdW5jdGlvbiByZW1vdmVzIHN0eWxlcyB0aGF0IHRoZSB1c2VyIGNhbm5vdCBtb2Rp ZnkgYnkgYXBwbHlpbmcgdGhlaXIgZGVmYXVsdCB2YWx1ZXMuCisgICAgCisgICAgUmVmUHRyPEVk aXRpbmdTdHlsZT4gZWRpdGluZ1N0eWxlID0gRWRpdGluZ1N0eWxlOjpjcmVhdGUobV9mcmFtZS0+ ZG9jdW1lbnQoKS0+Ym9keSgpKTsKKyAgICBSZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+ IGRlZmF1bHRTdHlsZSA9IGVkaXRpbmdTdHlsZS5nZXQoKS0+c3R5bGUoKS0+bXV0YWJsZUNvcHko KTsKKyAgICAKKyAgICAvLyBUZXh0IHdpZGdldHMgaW1wbGVtZW50IGJhY2tncm91bmQgY29sb3Ig dmlhIHRoZSBVSVZpZXcgcHJvcGVydHkuIFRoZWlyIGJvZHkgZWxlbWVudCB3aWxsIG5vdCBoYXZl IG9uZS4KKyAgICBkZWZhdWx0U3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5QmFja2dyb3Vu ZENvbG9yLCAicmdiYSgyNTUsIDI1NSwgMjU1LCAwLjApIik7CisgICAgCisgICAgLy8gUmVtb3Zl IHByb3BlcnRpZXMgdGhhdCB0aGUgdXNlciBjYW4gbW9kaWZ5LCBsaWtlIGZvbnQtd2VpZ2h0LiAK KyAgICAvLyBBbHNvIHJlbW92ZSBmb250LWZhbWlseSwgcGVyIEhJIHNwZWMuCisgICAgLy8gRklY TUU6IGl0J2QgYmUgbmljZSBpZiBrbm93bGVkZ2UgYWJvdXQgd2hpY2ggc3R5bGVzIHdlcmUgdW5j aGFuZ2VhYmxlIHdhcyBub3QgaGFyZC1jb2RlZCBoZXJlLgorICAgIGRlZmF1bHRTdHlsZS0+cmVt b3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlGb250V2VpZ2h0KTsKKyAgICBkZWZhdWx0U3R5bGUtPnJl bW92ZVByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFN0eWxlKTsKKyAgICBkZWZhdWx0U3R5bGUtPnJl bW92ZVByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnQpOworICAgIC8vIEZJWE1FOiB3ZSBz aG91bGQgaGFuZGxlIGFsc28gcGFzdGVkIHF1b3RlZCB0ZXh0LCBzdHJpa2V0aHJvdWdoLCBldGMu IDxyZGFyOi8vcHJvYmxlbS85MjU1MTE1PgorICAgIGRlZmF1bHRTdHlsZS0+cmVtb3ZlUHJvcGVy dHkoQ1NTUHJvcGVydHlUZXh0RGVjb3JhdGlvbik7CisgICAgZGVmYXVsdFN0eWxlLT5yZW1vdmVQ cm9wZXJ0eShDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uc0luRWZmZWN0KTsgLy8gaW1w bGVtZW50cyB1bmRlcmxpbmUKKworICAgIC8vIEZJWE1FIGFkZCBFZGl0QWN0aW9uTWF0Y2hTdGx5 ZSA8cmRhcjovL3Byb2JsZW0vOTE1NjUwNz4gVW5kbyByaWNoIHRleHQncyBwYXN0ZSAmIG1hdGNo IHN0eWxlIHNob3VsZCBzYXkgIlVuZG8gTWF0Y2ggU3R5bGUiCisgICAgYXBwbHlTdHlsZVRvU2Vs ZWN0aW9uKGRlZmF1bHRTdHlsZS5nZXQoKSwgRWRpdEFjdGlvbkNoYW5nZUF0dHJpYnV0ZXMpOwor fQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBQTEFURk9STShJT1MpCg== 208860 2013-08-15 14:48:43 -0700 2013-08-15 14:58:35 -0700 Fix up WebCore Xcode project file Fixup119863.diff text/plain 4992 dbates ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlYzg4NDhkLi43N2U1Y2EwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTgg QEAKIAogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE5ODYzPiBbaU9TXSBVcHN0cmVh bSBXZWJDb3JlL2VkaXRpbmcvaW9zCiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIHRoZSBzYW1lIFVVSUQgZm9yIEVkaXRvcklPUy5tbSBhcyBpbiB0 aGUgaU9TIHRyZWUgc28gYXMgdG8gbWFrZQorICAgICAgICBpdCBzdHJhaWdodGZvcndhcmQgdG8g bWVyZ2UgY2hhbmdlcyB0byB0aGUgV2ViQ29yZSBYY29kZSBwcm9qZWN0IGZpbGUKKyAgICAgICAg b24gV2ViS2l0Lm9yZyB3aXRoIGNoYW5nZXMgdG8gdGhlIHNhbWUgZmlsZSBpbiB0aGUgaU9TIHRy ZWUuCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKzIw MTMtMDgtMTUgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIDxo dHRwczovL3dlYmtpdC5vcmcvYi8xMTk4NjM+IFtpT1NdIFVwc3RyZWFtIFdlYkNvcmUvZWRpdGlu Zy9pb3MKKwogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBLaWx6ZXIuCiAKICAgICAgICAgKiBX ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMDU0ZWE3YS4uNGM1YTJiMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agpAQCAtNTIxMSw3ICs1MjExLDcgQEAKIAkJQ0UwNTdGQTYxMjIwNzMxMTAwQTQ3NkQ1IC8qIERv Y3VtZW50TWFya2VyQ29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQ0UwNTdGQTQxMjIwNzMxMTAwQTQ3NkQ1IC8qIERvY3VtZW50TWFya2Vy Q29udHJvbGxlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07 IH07CiAJCUNFMDhDM0QxMTUyQjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9s bGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENF MDhDM0NGMTUyQjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcCAq LzsgfTsKIAkJQ0UwOEMzRDIxNTJCNTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENvbnRy b2xsZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENF MDhDM0QwMTUyQjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmggKi87 IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoKTsgfTsgfTsKLQkJQ0UxM0NBOTUxN0JEN0RCMzAw MUNGM0JFIC8qIEVkaXRvcklPUy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IENFMTNDQTk0MTdCRDdEQjMwMDFDRjNCRSAvKiBFZGl0b3JJT1MubW0gKi87 IH07CisJCUZFRDEzRDNBMENFQTkzNDYwMEQ4OTQ2NiAvKiBFZGl0b3JJT1MubW0gaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQxM0QzOTBDRUE5MzQ2MDBE ODk0NjYgLyogRWRpdG9ySU9TLm1tICovOyB9OwogCQlDRTdCMkRCMzE1ODZBQkFEMDA5OEIzRkEg LyogQWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRTdCMkRBRjE1ODZBQkFEMDA5OEIzRkEgLyogQWx0ZXJu YXRpdmVUZXh0VUlDb250cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJp dmF0ZSwgKTsgfTsgfTsKIAkJQ0U3QjJEQjQxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0aXZl VGV4dFVJQ29udHJvbGxlci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IENFN0IyREIwMTU4NkFCQUQwMDk4QjNGQSAvKiBBbHRlcm5hdGl2ZVRleHRVSUNv bnRyb2xsZXIubW0gKi87IH07CiAJCUNFN0IyREI1MTU4NkFCQUQwMDk4QjNGQSAvKiBUZXh0QWx0 ZXJuYXRpdmVXaXRoUmFuZ2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IENFN0IyREIxMTU4NkFCQUQwMDk4QjNGQSAvKiBUZXh0QWx0ZXJuYXRpdmVXaXRo UmFuZ2UuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpA QCAtMTE5NDcsNyArMTE5NDcsNyBAQAogCQlDRTA1N0ZBNDEyMjA3MzExMDBBNDc2RDUgLyogRG9j dW1lbnRNYXJrZXJDb250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IERvY3VtZW50TWFya2VyQ29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQlDRTA4QzNDRjE1MkI1OTlBMDAyMUI4QzIgLyogQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBbHRlcm5hdGl2ZVRleHRD b250cm9sbGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0UwOEMzRDAxNTJC NTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwotCQlDRTEzQ0E5NDE3QkQ3REIzMDAxQ0YzQkUgLyogRWRpdG9y SU9TLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gRWRpdG9ySU9T Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQlGRUQxM0QzOTBDRUE5MzQ2MDBEODk0 NjYgLyogRWRpdG9ySU9TLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRo ID0gRWRpdG9ySU9TLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDRTVDQjFCMzE0 RURBQjZGMDBCQjI3OTUgLyogRXZlbnRTZW5kZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gRXZlbnRTZW5kZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0U3 QjJEQUYxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0aXZlVGV4dFVJQ29udHJvbGxlci5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBBbHRlcm5hdGl2ZVRleHRVSUNvbnRyb2xs ZXIuaDsgcGF0aCA9IG1hYy9BbHRlcm5hdGl2ZVRleHRVSUNvbnRyb2xsZXIuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0U3QjJEQjAxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0 aXZlVGV4dFVJQ29udHJvbGxlci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsg bmFtZSA9IEFsdGVybmF0aXZlVGV4dFVJQ29udHJvbGxlci5tbTsgcGF0aCA9IG1hYy9BbHRlcm5h dGl2ZVRleHRVSUNvbnRyb2xsZXIubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0x OTM5NCw3ICsxOTM5NCw3IEBACiAJCUNFMTNDQTkzMTdCRDdEQjMwMDFDRjNCRSAvKiBpb3MgKi8g PSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAotCQkJCUNFMTNDQTk0MTdC RDdEQjMwMDFDRjNCRSAvKiBFZGl0b3JJT1MubW0gKi8sCisJCQkJRkVEMTNEMzkwQ0VBOTM0NjAw RDg5NDY2IC8qIEVkaXRvcklPUy5tbSAqLywKIAkJCSk7CiAJCQlwYXRoID0gaW9zOwogCQkJc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsKQEAgLTI0ODkxLDcgKzI0ODkxLDcgQEAKIAkJCQk5QkFCNkM2 RDEyNTUwNjMxMDAxNjI2RDQgLyogRWRpdGluZ1N0eWxlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJ CTRCMzA0M0NDMEFFMDM3M0IwMEE4MjY0NyAvKiBFZGl0b3IuY3BwIGluIFNvdXJjZXMgKi8sCiAJ CQkJOTNBMzhCNEIwRDBFNTgwODAwNjg3MkMyIC8qIEVkaXRvckNvbW1hbmQuY3BwIGluIFNvdXJj ZXMgKi8sCi0JCQkJQ0UxM0NBOTUxN0JEN0RCMzAwMUNGM0JFIC8qIEVkaXRvcklPUy5tbSBpbiBT b3VyY2VzICovLAorCQkJCUZFRDEzRDNBMENFQTkzNDYwMEQ4OTQ2NiAvKiBFZGl0b3JJT1MubW0g aW4gU291cmNlcyAqLywKIAkJCQlFRDUwMURDNjBCMjQ5RjI5MDBBRTE4RDkgLyogRWRpdG9yTWFj Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQThDNEE4MDgwOUQ1NjMyNzAwMDNBQzhEIC8qIEVsZW1l bnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNEZGQzAyMkQxNjQzQjcyNjAwNEUxNjM4IC8qIEVs ZW1lbnRSYXJlRGF0YS5jcHAgaW4gU291cmNlcyAqLywK 208861 2013-08-15 14:58:35 -0700 2013-08-15 15:00:17 -0700 Fix up WebCore Xcode project file Fixup119863_1.diff text/plain 5459 dbates ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlYzg4NDhkLi43N2U1Y2EwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTgg QEAKIAogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE5ODYzPiBbaU9TXSBVcHN0cmVh bSBXZWJDb3JlL2VkaXRpbmcvaW9zCiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIHRoZSBzYW1lIFVVSUQgZm9yIEVkaXRvcklPUy5tbSBhcyBpbiB0 aGUgaU9TIHRyZWUgc28gYXMgdG8gbWFrZQorICAgICAgICBpdCBzdHJhaWdodGZvcndhcmQgdG8g bWVyZ2UgY2hhbmdlcyB0byB0aGUgV2ViQ29yZSBYY29kZSBwcm9qZWN0IGZpbGUKKyAgICAgICAg b24gV2ViS2l0Lm9yZyB3aXRoIGNoYW5nZXMgdG8gdGhlIHNhbWUgZmlsZSBpbiB0aGUgaU9TIHRy ZWUuCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKzIw MTMtMDgtMTUgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIDxo dHRwczovL3dlYmtpdC5vcmcvYi8xMTk4NjM+IFtpT1NdIFVwc3RyZWFtIFdlYkNvcmUvZWRpdGlu Zy9pb3MKKwogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBLaWx6ZXIuCiAKICAgICAgICAgKiBX ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMDU0ZWE3YS4uNmQxMDdjYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agpAQCAtNTIxMSw3ICs1MjExLDcgQEAKIAkJQ0UwNTdGQTYxMjIwNzMxMTAwQTQ3NkQ1IC8qIERv Y3VtZW50TWFya2VyQ29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQ0UwNTdGQTQxMjIwNzMxMTAwQTQ3NkQ1IC8qIERvY3VtZW50TWFya2Vy Q29udHJvbGxlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07 IH07CiAJCUNFMDhDM0QxMTUyQjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9s bGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENF MDhDM0NGMTUyQjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcCAq LzsgfTsKIAkJQ0UwOEMzRDIxNTJCNTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENvbnRy b2xsZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENF MDhDM0QwMTUyQjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmggKi87 IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoKTsgfTsgfTsKLQkJQ0UxM0NBOTUxN0JEN0RCMzAw MUNGM0JFIC8qIEVkaXRvcklPUy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IENFMTNDQTk0MTdCRDdEQjMwMDFDRjNCRSAvKiBFZGl0b3JJT1MubW0gKi87 IH07CisJCUZFRDEzRDNBMENFQTkzNDYwMEQ4OTQ2NiAvKiBFZGl0b3JJT1MubW0gaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQxM0QzOTBDRUE5MzQ2MDBE ODk0NjYgLyogRWRpdG9ySU9TLm1tICovOyB9OwogCQlDRTdCMkRCMzE1ODZBQkFEMDA5OEIzRkEg LyogQWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRTdCMkRBRjE1ODZBQkFEMDA5OEIzRkEgLyogQWx0ZXJu YXRpdmVUZXh0VUlDb250cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJp dmF0ZSwgKTsgfTsgfTsKIAkJQ0U3QjJEQjQxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0aXZl VGV4dFVJQ29udHJvbGxlci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IENFN0IyREIwMTU4NkFCQUQwMDk4QjNGQSAvKiBBbHRlcm5hdGl2ZVRleHRVSUNv bnRyb2xsZXIubW0gKi87IH07CiAJCUNFN0IyREI1MTU4NkFCQUQwMDk4QjNGQSAvKiBUZXh0QWx0 ZXJuYXRpdmVXaXRoUmFuZ2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IENFN0IyREIxMTU4NkFCQUQwMDk4QjNGQSAvKiBUZXh0QWx0ZXJuYXRpdmVXaXRo UmFuZ2UuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpA QCAtMTE5NDcsNyArMTE5NDcsNyBAQAogCQlDRTA1N0ZBNDEyMjA3MzExMDBBNDc2RDUgLyogRG9j dW1lbnRNYXJrZXJDb250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IERvY3VtZW50TWFya2VyQ29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQlDRTA4QzNDRjE1MkI1OTlBMDAyMUI4QzIgLyogQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBbHRlcm5hdGl2ZVRleHRD b250cm9sbGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0UwOEMzRDAxNTJC NTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwotCQlDRTEzQ0E5NDE3QkQ3REIzMDAxQ0YzQkUgLyogRWRpdG9y SU9TLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gRWRpdG9ySU9T Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQlGRUQxM0QzOTBDRUE5MzQ2MDBEODk0 NjYgLyogRWRpdG9ySU9TLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRo ID0gRWRpdG9ySU9TLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDRTVDQjFCMzE0 RURBQjZGMDBCQjI3OTUgLyogRXZlbnRTZW5kZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gRXZlbnRTZW5kZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0U3 QjJEQUYxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0aXZlVGV4dFVJQ29udHJvbGxlci5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBBbHRlcm5hdGl2ZVRleHRVSUNvbnRyb2xs ZXIuaDsgcGF0aCA9IG1hYy9BbHRlcm5hdGl2ZVRleHRVSUNvbnRyb2xsZXIuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0U3QjJEQjAxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0 aXZlVGV4dFVJQ29udHJvbGxlci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsg bmFtZSA9IEFsdGVybmF0aXZlVGV4dFVJQ29udHJvbGxlci5tbTsgcGF0aCA9IG1hYy9BbHRlcm5h dGl2ZVRleHRVSUNvbnRyb2xsZXIubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0x NTQzOCw3ICsxNTQzOCw3IEBACiAJCTkzMzA5RDg2MDk5RTY0OTEwMDU2RTU4MSAvKiBlZGl0aW5n ICovID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKLQkJCQlDRTEzQ0E5 MzE3QkQ3REIzMDAxQ0YzQkUgLyogaW9zICovLAorCQkJCTQ0MzI5MkMxMEVCQTZENzMwMEU2MjAx NiAvKiBpb3MgKi8sCiAJCQkJRUQ1MDFEQzkwQjI0OUYzOTAwQUUxOEQ5IC8qIG1hYyAqLywKIAkJ CQlDRTA4QzNDRjE1MkI1OTlBMDAyMUI4QzIgLyogQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5j cHAgKi8sCiAJCQkJQ0UwOEMzRDAxNTJCNTk5QTAwMjFCOEMyIC8qIEFsdGVybmF0aXZlVGV4dENv bnRyb2xsZXIuaCAqLywKQEAgLTE5MzkxLDEwICsxOTM5MSwxMCBAQAogCQkJbmFtZSA9IEVuY3J5 cHRlZE1lZGlhOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKIAkJfTsKLQkJQ0UxM0NBOTMx N0JEN0RCMzAwMUNGM0JFIC8qIGlvcyAqLyA9IHsKKwkJNDQzMjkyQzEwRUJBNkQ3MzAwRTYyMDE2 IC8qIGlvcyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCi0JCQkJ Q0UxM0NBOTQxN0JEN0RCMzAwMUNGM0JFIC8qIEVkaXRvcklPUy5tbSAqLywKKwkJCQlGRUQxM0Qz OTBDRUE5MzQ2MDBEODk0NjYgLyogRWRpdG9ySU9TLm1tICovLAogCQkJKTsKIAkJCXBhdGggPSBp b3M7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpAQCAtMjQ4OTEsNyArMjQ4OTEsNyBAQAog CQkJCTlCQUI2QzZEMTI1NTA2MzEwMDE2MjZENCAvKiBFZGl0aW5nU3R5bGUuY3BwIGluIFNvdXJj ZXMgKi8sCiAJCQkJNEIzMDQzQ0MwQUUwMzczQjAwQTgyNjQ3IC8qIEVkaXRvci5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQk5M0EzOEI0QjBEMEU1ODA4MDA2ODcyQzIgLyogRWRpdG9yQ29tbWFuZC5j cHAgaW4gU291cmNlcyAqLywKLQkJCQlDRTEzQ0E5NTE3QkQ3REIzMDAxQ0YzQkUgLyogRWRpdG9y SU9TLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJRkVEMTNEM0EwQ0VBOTM0NjAwRDg5NDY2IC8qIEVk aXRvcklPUy5tbSBpbiBTb3VyY2VzICovLAogCQkJCUVENTAxREM2MEIyNDlGMjkwMEFFMThEOSAv KiBFZGl0b3JNYWMubW0gaW4gU291cmNlcyAqLywKIAkJCQlBOEM0QTgwODA5RDU2MzI3MDAwM0FD OEQgLyogRWxlbWVudC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk0RkZDMDIyRDE2NDNCNzI2MDA0 RTE2MzggLyogRWxlbWVudFJhcmVEYXRhLmNwcCBpbiBTb3VyY2VzICovLAo=