106517 2013-01-09 18:50:53 -0800 intrinsic min-width's don't override width for file upload controls 2013-01-10 10:09:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106143 1 ojan ojan eric esprehn hyatt jchaffraix mifenton ojan.autocc tkent tony webkit.review.bot oldest_to_newest 803928 0 ojan 2013-01-09 18:50:53 -0800 intrinsic min-width's don't override width for file upload controls 803935 1 182043 ojan 2013-01-09 18:54:52 -0800 Created attachment 182043 Patch 804477 2 182043 tony 2013-01-10 09:53:52 -0800 Comment on attachment 182043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182043&action=review > Source/WebCore/ChangeLog:3 > + intrinsic min-width's don't override width for file upload controls Nit: min-width's -> min-widths > Source/WebCore/ChangeLog:10 > + The preferred width is the width used in it's container's computation Nit: it's -> its > Source/WebCore/ChangeLog:11 > + of it's intrinsic width. Nit: it's -> its > Source/WebCore/ChangeLog:14 > + the rendertree. Nit: rendertree -> render tree. > Source/WebCore/rendering/RenderFileUploadControl.cpp:175 > + RenderFileUploadControl* renderer = const_cast<RenderFileUploadControl*>(this); > + float minDefaultLabelWidth = defaultWidthNumChars * font.width(constructTextRun(renderer, font, characterAsString, style(), TextRun::AllowTrailingExpansion)); Maybe add a FIXME about this const_cast? I guess we want to make constructTextRun take a const renderer if possible? > LayoutTests/ChangeLog:3 > + intrinsic min-width's don't override width for file upload controls Nit: min-width's -> min-widths 804484 3 182043 ojan 2013-01-10 10:00:41 -0800 Comment on attachment 182043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182043&action=review >> Source/WebCore/rendering/RenderFileUploadControl.cpp:175 >> + float minDefaultLabelWidth = defaultWidthNumChars * font.width(constructTextRun(renderer, font, characterAsString, style(), TextRun::AllowTrailingExpansion)); > > Maybe add a FIXME about this const_cast? I guess we want to make constructTextRun take a const renderer if possible? Added a FIXME. I had taken a stab at this, but it was a deep rabbit hole that it wasn't clear to me how to make work. 804495 4 ojan 2013-01-10 10:09:57 -0800 Committed r139329: <http://trac.webkit.org/changeset/139329> 182043 2013-01-09 18:54:52 -0800 2013-01-10 10:00:41 -0800 Patch bug-106517-20130110025155.patch text/plain 13005 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhlMzEwNDIxYzViNDZm MWM0MmEwMGVhOTk2NzJiM2E2NTcyMGRiNC4uZWViYzJkMzk4YmIwYTJmZmI4ZDhjOWZlNDgyOGQw MjNiNzkzZTc1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAxLTA5ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgaW50cmluc2ljIG1pbi13aWR0 aCdzIGRvbid0IG92ZXJyaWRlIHdpZHRoIGZvciBmaWxlIHVwbG9hZCBjb250cm9scworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NTE3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VwYXJhdGUgb3V0IGNv bXB1dGluZyBpbnRyaW5zaWMgd2lkdGggZnJvbSBwZXJmZXJyZWQgd2lkdGggc28gdGhhdAorICAg ICAgICB3ZSBjYW4gdXNlIHRoZSBpbnRyaW5zaWMgd2lkdGggY29ycmVjdGx5IHdoZW4gYXBwbHlp bmcgbWluLXdpZHRoL21heC13aWR0aC4KKyAgICAgICAgVGhlIHByZWZlcnJlZCB3aWR0aCBpcyB0 aGUgd2lkdGggdXNlZCBpbiBpdCdzIGNvbnRhaW5lcidzIGNvbXB1dGF0aW9uCisgICAgICAgIG9m IGl0J3MgaW50cmluc2ljIHdpZHRoLgorCisgICAgICAgIFRoaXMgaXMgdGhlIGZpcnN0IGluIGEg c2VyaWVzIG9mIHBhdGNoZXMgbWFraW5nIHRoaXMgd29yayBhY3Jvc3MKKyAgICAgICAgdGhlIHJl bmRlcnRyZWUuIAorCisgICAgICAgIFRlc3Q6IGZhc3QvZm9ybXMvZmlsZS9pbnRyaW5zaWMtbWlu LXdpZHRoLW92ZXJyaWRlcy13aWR0aC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6bWluSW50cmluc2ljTG9naWNh bFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 OjptYXhJbnRyaW5zaWNMb2dpY2FsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChSZW5kZXJCb3gpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJGaWxlVXBsb2FkQ29udHJvbDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMpOgorICAg ICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGaWxlVXBsb2FkQ29udHJv bDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5oOgorICAgICAgICAoUmVuZGVyRmlsZVVwbG9hZENvbnRy b2wpOgorCiAyMDEzLTAxLTA5ICBEYW4gV2luc2hpcCAgPGRhbndAZ25vbWUub3JnPgogCiAgICAg ICAgIFtTb3VwXSBIYW5kbGUgcmVkaXJlY3Rpb24gaW5zaWRlIFdlYktpdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBhN2E4YzViOThjNzJlMGE1MmNiYzE1ODNlNWQ4 NDEzNzBmYTIxYjlhLi4xMzc1OWVhMmFiZmYzMTJiYjZhNDM2NjhmOGQ3NTk2ZmVkYTkxMjY5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNzkxLDYgKzc5MSwyOCBA QCB2b2lkIFJlbmRlckJveDo6YXBwbHlDYWNoZWRDbGlwQW5kU2Nyb2xsT2Zmc2V0Rm9yUmVwYWlu dChMYXlvdXRSZWN0JiBwYWludFJlY3QpCiAgICAgcGFpbnRSZWN0ID0gaW50ZXJzZWN0aW9uKHBh aW50UmVjdCwgY2xpcFJlY3QpOwogfQogCitMYXlvdXRVbml0IFJlbmRlckJveDo6bWluSW50cmlu c2ljTG9naWNhbFdpZHRoKCkgY29uc3QKK3sKKyAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0 aCA9IDA7CisgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGggPSAwOworICAgIGNvbXB1dGVJ bnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsK KyAgICByZXR1cm4gbWluTG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0 aCgpOworfQorCitMYXlvdXRVbml0IFJlbmRlckJveDo6bWF4SW50cmluc2ljTG9naWNhbFdpZHRo KCkgY29uc3QKK3sKKyAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aCA9IDA7CisgICAgTGF5 b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGggPSAwOworICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAgICByZXR1cm4gbWF4 TG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpOworfQorCit2b2lk IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWlu TG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0Cit7CisgICAg bWluTG9naWNhbFdpZHRoID0gbWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkgLSBib3JkZXJBbmRQ YWRkaW5nTG9naWNhbFdpZHRoKCk7CisgICAgbWF4TG9naWNhbFdpZHRoID0gbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoKCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7Cit9CisKIExh eW91dFVuaXQgUmVuZGVyQm94OjptaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSBjb25zdAogewog ICAgIGlmIChwcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoKSkKQEAgLTE5OTUsOSArMjAxNyw5 IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb25Vc2lu ZyhTaXplVHlwZSB3aWR0aFR5cGUsIExheW91CiAgICAgfQogCiAgICAgaWYgKGxvZ2ljYWxXaWR0 aC50eXBlKCkgPT0gTWluQ29udGVudCkKLSAgICAgICAgcmV0dXJuIG1pblByZWZlcnJlZExvZ2lj YWxXaWR0aCgpOworICAgICAgICByZXR1cm4gbWluSW50cmluc2ljTG9naWNhbFdpZHRoKCk7CiAg ICAgaWYgKGxvZ2ljYWxXaWR0aC50eXBlKCkgPT0gTWF4Q29udGVudCkKLSAgICAgICAgcmV0dXJu IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOworICAgICAgICByZXR1cm4gbWF4SW50cmluc2lj TG9naWNhbFdpZHRoKCk7CiAKICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdmlldygpOwog ICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQgPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoc3R5bGVU b1VzZS0+bWFyZ2luU3RhcnQoKSwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCByZW5kZXJWaWV3KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCBhYjRiYTZiNDc2NWNhZTI2YTg5 ZTFmMzJjYzk0MmUzYTFhZmNiOThhLi5jZDFjN2FjYThkNjk1ZWI1MjNjZmNjNDQ1NDg3NWVmYzdh NDhiZmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC0yOTQsNiArMjk0 LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwYWludChQYWludEluZm8mLCBjb25zdCBM YXlvdXRQb2ludCYpOwogICAgIHZpcnR1YWwgYm9vbCBub2RlQXRQb2ludChjb25zdCBIaXRUZXN0 UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBIaXRUZXN0TG9jYXRpb24mIGxvY2F0aW9u SW5Db250YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgSGl0VGVz dEFjdGlvbikgT1ZFUlJJREU7CiAKKyAgICBMYXlvdXRVbml0IG1pbkludHJpbnNpY0xvZ2ljYWxX aWR0aCgpIGNvbnN0OworICAgIExheW91dFVuaXQgbWF4SW50cmluc2ljTG9naWNhbFdpZHRoKCkg Y29uc3Q7CisKICAgICB2aXJ0dWFsIExheW91dFVuaXQgbWluUHJlZmVycmVkTG9naWNhbFdpZHRo KCkgY29uc3Q7CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCgpIGNvbnN0OwogCkBAIC02NTAsNiArNjUzLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1 dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZh bHVlcyYpIGNvbnN0OwogICAgIHZvaWQgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhSZXBs YWNlZChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmKSBjb25zdDsKIAorICAgIHZpcnR1YWwg dm9pZCBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2Fs V2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3Q7CisKICAgICAvLyBUaGlz IGZ1bmN0aW9uIGNhbGN1bGF0ZXMgdGhlIG1pbmltdW0gYW5kIG1heGltdW0gcHJlZmVycmVkIHdp ZHRocyBmb3IgYW4gb2JqZWN0LgogICAgIC8vIFRoZXNlIHZhbHVlcyBhcmUgdXNlZCBpbiBzaHJp bmstdG8tZml0IGxheW91dCBzeXN0ZW1zLgogICAgIC8vIFRoZXNlIGluY2x1ZGUgdGFibGVzLCBw b3NpdGlvbmVkIG9iamVjdHMsIGZsb2F0cyBhbmQgZmxleGlibGUgYm94ZXMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZpbGVVcGxvYWRDb250cm9sLmNwcAppbmRl eCBkYTA4NDkzYmZiZGM1ZTkzYTY0NWRjZDI2MjU1ZDgyZDdjYTAyODhkLi5jNjdjNGZhY2E2MmZh N2IwNzA0ZTAyZDkyZTBkYTg4MWQyYzUzNzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5jcHAKQEAgLTE2NCw2ICsxNjQsMjcg QEAgdm9pZCBSZW5kZXJGaWxlVXBsb2FkQ29udHJvbDo6cGFpbnRPYmplY3QoUGFpbnRJbmZvJiBw YWludEluZm8sIGNvbnN0IExheW91dFBvaW4KICAgICBSZW5kZXJCbG9jazo6cGFpbnRPYmplY3Qo cGFpbnRJbmZvLCBwYWludE9mZnNldCk7CiB9CiAKK3ZvaWQgUmVuZGVyRmlsZVVwbG9hZENvbnRy b2w6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxX aWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdAoreworICAgIC8vIEZpZ3Vy ZSBvdXQgaG93IGJpZyB0aGUgZmlsZW5hbWUgc3BhY2UgbmVlZHMgdG8gYmUgZm9yIGEgZ2l2ZW4g bnVtYmVyIG9mIGNoYXJhY3RlcnMKKyAgICAvLyAodXNpbmcgIjAiIGFzIHRoZSBub21pbmFsIGNo YXJhY3RlcikuCisgICAgY29uc3QgVUNoYXIgY2hhcmFjdGVyID0gJzAnOworICAgIGNvbnN0IFN0 cmluZyBjaGFyYWN0ZXJBc1N0cmluZyA9IFN0cmluZygmY2hhcmFjdGVyLCAxKTsKKyAgICBjb25z dCBGb250JiBmb250ID0gc3R5bGUoKS0+Zm9udCgpOworICAgIFJlbmRlckZpbGVVcGxvYWRDb250 cm9sKiByZW5kZXJlciA9IGNvbnN0X2Nhc3Q8UmVuZGVyRmlsZVVwbG9hZENvbnRyb2wqPih0aGlz KTsKKyAgICBmbG9hdCBtaW5EZWZhdWx0TGFiZWxXaWR0aCA9IGRlZmF1bHRXaWR0aE51bUNoYXJz ICogZm9udC53aWR0aChjb25zdHJ1Y3RUZXh0UnVuKHJlbmRlcmVyLCBmb250LCBjaGFyYWN0ZXJB c1N0cmluZywgc3R5bGUoKSwgVGV4dFJ1bjo6QWxsb3dUcmFpbGluZ0V4cGFuc2lvbikpOworCisg ICAgY29uc3QgU3RyaW5nIGxhYmVsID0gdGhlbWUoKS0+ZmlsZUxpc3REZWZhdWx0TGFiZWwobm9k ZSgpLT50b0lucHV0RWxlbWVudCgpLT5tdWx0aXBsZSgpKTsKKyAgICBmbG9hdCBkZWZhdWx0TGFi ZWxXaWR0aCA9IGZvbnQud2lkdGgoY29uc3RydWN0VGV4dFJ1bihyZW5kZXJlciwgZm9udCwgbGFi ZWwsIHN0eWxlKCksIFRleHRSdW46OkFsbG93VHJhaWxpbmdFeHBhbnNpb24pKTsKKyAgICBpZiAo SFRNTElucHV0RWxlbWVudCogYnV0dG9uID0gdXBsb2FkQnV0dG9uKCkpCisgICAgICAgIGlmIChS ZW5kZXJPYmplY3QqIGJ1dHRvblJlbmRlcmVyID0gYnV0dG9uLT5yZW5kZXJlcigpKQorICAgICAg ICAgICAgZGVmYXVsdExhYmVsV2lkdGggKz0gYnV0dG9uUmVuZGVyZXItPm1heFByZWZlcnJlZExv Z2ljYWxXaWR0aCgpICsgYWZ0ZXJCdXR0b25TcGFjaW5nOworICAgIG1heExvZ2ljYWxXaWR0aCA9 IHN0YXRpY19jYXN0PGludD4oY2VpbGYobWF4KG1pbkRlZmF1bHRMYWJlbFdpZHRoLCBkZWZhdWx0 TGFiZWxXaWR0aCkpKTsKKworICAgIGlmICghc3R5bGUoKS0+d2lkdGgoKS5pc1BlcmNlbnQoKSkK KyAgICAgICAgbWluTG9naWNhbFdpZHRoID0gbWF4TG9naWNhbFdpZHRoOworfQorCiB2b2lkIFJl bmRlckZpbGVVcGxvYWRDb250cm9sOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiB7 CiAgICAgQVNTRVJUKHByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKTsKQEAgLTE3MSwzOCAr MTkyLDE5IEBAIHZvaWQgUmVuZGVyRmlsZVVwbG9hZENvbnRyb2w6OmNvbXB1dGVQcmVmZXJyZWRM b2dpY2FsV2lkdGhzKCkKICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IDA7CiAgICAg bV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSAwOwogCi0gICAgUmVuZGVyU3R5bGUqIHN0eWxl ID0gdGhpcy0+c3R5bGUoKTsKLSAgICBBU1NFUlQoc3R5bGUpOwotCi0gICAgY29uc3QgRm9udCYg Zm9udCA9IHN0eWxlLT5mb250KCk7Ci0gICAgaWYgKHN0eWxlLT53aWR0aCgpLmlzRml4ZWQoKSAm JiBzdHlsZS0+d2lkdGgoKS52YWx1ZSgpID4gMCkKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGFkanVzdENvbnRlbnRCb3hM b2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUtPndpZHRoKCkudmFsdWUoKSk7Ci0gICAgZWxz ZSB7Ci0gICAgICAgIC8vIEZpZ3VyZSBvdXQgaG93IGJpZyB0aGUgZmlsZW5hbWUgc3BhY2UgbmVl ZHMgdG8gYmUgZm9yIGEgZ2l2ZW4gbnVtYmVyIG9mIGNoYXJhY3RlcnMKLSAgICAgICAgLy8gKHVz aW5nICIwIiBhcyB0aGUgbm9taW5hbCBjaGFyYWN0ZXIpLgotICAgICAgICBjb25zdCBVQ2hhciBj aGFyYWN0ZXIgPSAnMCc7Ci0gICAgICAgIGNvbnN0IFN0cmluZyBjaGFyYWN0ZXJBc1N0cmluZyA9 IFN0cmluZygmY2hhcmFjdGVyLCAxKTsKLSAgICAgICAgZmxvYXQgbWluRGVmYXVsdExhYmVsV2lk dGggPSBkZWZhdWx0V2lkdGhOdW1DaGFycyAqIGZvbnQud2lkdGgoY29uc3RydWN0VGV4dFJ1bih0 aGlzLCBmb250LCBjaGFyYWN0ZXJBc1N0cmluZywgc3R5bGUsIFRleHRSdW46OkFsbG93VHJhaWxp bmdFeHBhbnNpb24pKTsKLQotICAgICAgICBjb25zdCBTdHJpbmcgbGFiZWwgPSB0aGVtZSgpLT5m aWxlTGlzdERlZmF1bHRMYWJlbChub2RlKCktPnRvSW5wdXRFbGVtZW50KCktPm11bHRpcGxlKCkp OwotICAgICAgICBmbG9hdCBkZWZhdWx0TGFiZWxXaWR0aCA9IGZvbnQud2lkdGgoY29uc3RydWN0 VGV4dFJ1bih0aGlzLCBmb250LCBsYWJlbCwgc3R5bGUsIFRleHRSdW46OkFsbG93VHJhaWxpbmdF eHBhbnNpb24pKTsKLSAgICAgICAgaWYgKEhUTUxJbnB1dEVsZW1lbnQqIGJ1dHRvbiA9IHVwbG9h ZEJ1dHRvbigpKQotICAgICAgICAgICAgaWYgKFJlbmRlck9iamVjdCogYnV0dG9uUmVuZGVyZXIg PSBidXR0b24tPnJlbmRlcmVyKCkpCi0gICAgICAgICAgICAgICAgZGVmYXVsdExhYmVsV2lkdGgg Kz0gYnV0dG9uUmVuZGVyZXItPm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICsgYWZ0ZXJCdXR0 b25TcGFjaW5nOwotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0YXRpY19j YXN0PGludD4oY2VpbGYobWF4KG1pbkRlZmF1bHRMYWJlbFdpZHRoLCBkZWZhdWx0TGFiZWxXaWR0 aCkpKTsKLQotICAgICAgICBpZiAoIXN0eWxlLT53aWR0aCgpLmlzUGVyY2VudCgpKQotICAgICAg ICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxX aWR0aDsKLSAgICB9CisgICAgaWYgKHN0eWxlKCktPndpZHRoKCkuaXNGaXhlZCgpICYmIHN0eWxl KCktPndpZHRoKCkudmFsdWUoKSA+IDApCisgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdp ZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNh bFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlKCktPndpZHRoKCkudmFsdWUoKSk7CisgICAgZWxzZQor ICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJlZExvZ2lj YWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwogCi0gICAgaWYgKHN0eWxlLT5t aW5XaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZS0+bWluV2lkdGgoKS52YWx1ZSgpID4gMCkgewot ICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heChtX21heFByZWZlcnJlZExv Z2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHls ZS0+bWluV2lkdGgoKS52YWx1ZSgpKSk7Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdp ZHRoID0gbWF4KG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9n aWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlLT5taW5XaWR0aCgpLnZhbHVlKCkpKTsKKyAgICBp ZiAoc3R5bGUoKS0+bWluV2lkdGgoKS5pc0ZpeGVkKCkgJiYgc3R5bGUoKS0+bWluV2lkdGgoKS52 YWx1ZSgpID4gMCkgeworICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heCht X21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZv ckJveFNpemluZyhzdHlsZSgpLT5taW5XaWR0aCgpLnZhbHVlKCkpKTsKKyAgICAgICAgbV9taW5Q cmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtYXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFk anVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS0+bWluV2lkdGgo KS52YWx1ZSgpKSk7CiAgICAgfQogCi0gICAgaWYgKHN0eWxlLT5tYXhXaWR0aCgpLmlzRml4ZWQo KSkgewotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1pbihtX21heFByZWZl cnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemlu ZyhzdHlsZS0+bWF4V2lkdGgoKS52YWx1ZSgpKSk7Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9n aWNhbFdpZHRoID0gbWluKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50 Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlLT5tYXhXaWR0aCgpLnZhbHVlKCkpKTsK KyAgICBpZiAoc3R5bGUoKS0+bWF4V2lkdGgoKS5pc0ZpeGVkKCkpIHsKKyAgICAgICAgbV9tYXhQ cmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtaW4obV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFk anVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS0+bWF4V2lkdGgo KS52YWx1ZSgpKSk7CisgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbWluKG1f bWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9y Qm94U2l6aW5nKHN0eWxlKCktPm1heFdpZHRoKCkudmFsdWUoKSkpOwogICAgIH0KIAogICAgIGlu dCB0b0FkZCA9IGJvcmRlckFuZFBhZGRpbmdXaWR0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZpbGVVcGxvYWRDb250cm9sLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuaAppbmRleCAyY2U0Y2E2ZjIyYzdi MmI2NTQwYzk2NWU2ZGU4Mjg2ZjUzMzUxYTk5Li44OTQ1M2Y0NjNjMjlkMTNlMjZhZTgwZjAyZGNk ODExZDE4MzM4ODFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmlsZVVwbG9hZENvbnRyb2wuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmlsZVVwbG9hZENvbnRyb2wuaApAQCAtNDYsNiArNDYsNyBAQCBwcml2YXRlOgogCiAgICAgdmly dHVhbCBib29sIGNhbkJlUmVwbGFjZWRXaXRoSW5saW5lUnVuSW4oKSBjb25zdCBPVkVSUklERTsK ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJvbUVsZW1lbnQoKTsKKyAgICB2aXJ0dWFsIHZvaWQg Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRo LCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpOwogICAgIHZpcnR1YWwgdm9p ZCBwYWludE9iamVjdChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYpOwogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZjA4YTE4MTIwYjBiMjQ0YTE4NzQ3YmY0YmQzYzYzYjA0OWQ4YWUyMS4uNGE3Njk3YjhkZWU5ODlm Y2I4ZGNjMjBkYTY1MzVjZTFlNzcwNjYxNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEzLTAx LTA5ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgaW50cmluc2lj IG1pbi13aWR0aCdzIGRvbid0IG92ZXJyaWRlIHdpZHRoIGZvciBmaWxlIHVwbG9hZCBjb250cm9s cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NTE3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0 L2Zvcm1zL2ZpbGUvaW50cmluc2ljLW1pbi13aWR0aC1vdmVycmlkZXMtd2lkdGgtZXhwZWN0ZWQu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9mb3Jtcy9maWxlL2ludHJpbnNpYy1taW4td2lk dGgtb3ZlcnJpZGVzLXdpZHRoLmh0bWw6IEFkZGVkLgorCisyMDEzLTAxLTA5ICBPamFuIFZhZmFp ICA8b2phbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUHJvcGVyIHZlcnNpb24gb2YgaHR0cDov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTM5MjIxLgogICAgICAgICBUaGUgcHJvYmxlbSB3 YXMgdGhhdCB0aGVyZSB3YXMgbGluZS13cmFwcGluZyBkdWUgdG8gZm9ybSBjb250cm9scwogICAg ICAgICBiZWluZyBkaWZmZXJlbnQgc2l6ZXMgb24gZGlmZmVyZW50IHBsYXRmb3Jtcywgbm90IHRo YXQgZm9ybQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9maWxlL2ludHJpbnNp Yy1taW4td2lkdGgtb3ZlcnJpZGVzLXdpZHRoLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2Zvcm1zL2ZpbGUvaW50cmluc2ljLW1pbi13aWR0aC1vdmVycmlkZXMtd2lkdGgtZXhwZWN0 ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi43MmFlYTZiMTM1ZGUwYTQ5NzQ1NTkyNGZjNDQxOGZiNzNkOWY5 ZjMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9maWxlL2ludHJp bnNpYy1taW4td2lkdGgtb3ZlcnJpZGVzLXdpZHRoLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwx MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+CitpbnB1dCB7CisgICAgYmFja2dyb3VuZC1j b2xvcjogcGluazsKKyAgICBtYXJnaW46IDA7Cit9Cis8L3N0eWxlPgorCis8aW5wdXQgdHlwZT0i ZmlsZSI+Cis8aW5wdXQgdHlwZT0iZmlsZSI+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2Zvcm1zL2ZpbGUvaW50cmluc2ljLW1pbi13aWR0aC1vdmVycmlkZXMtd2lkdGguaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvZm9ybXMvZmlsZS9pbnRyaW5zaWMtbWluLXdpZHRoLW92ZXJyaWRlcy13 aWR0aC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFiYThjZDY1MTdhMzgxYmViYTQyY2YyNzMyOWFmMzg0ZDI1 YzJhMTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2ZpbGUvaW50 cmluc2ljLW1pbi13aWR0aC1vdmVycmlkZXMtd2lkdGguaHRtbApAQCAtMCwwICsxLDIzIEBACis8 IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKy5taW4geworICAgIG1pbi13aWR0aDogLWllLW1pbi1j b250ZW50OworICAgIG1pbi13aWR0aDogLW1vei1taW4tY29udGVudDsKKyAgICBtaW4td2lkdGg6 IC13ZWJraXQtbWluLWNvbnRlbnQ7CisgICAgbWluLXdpZHRoOiBtaW4tY29udGVudDsKK30KKy5t YXggeworICAgIG1pbi13aWR0aDogLWllLW1heC1jb250ZW50OworICAgIG1pbi13aWR0aDogLW1v ei1tYXgtY29udGVudDsKKyAgICBtaW4td2lkdGg6IC13ZWJraXQtbWF4LWNvbnRlbnQ7CisgICAg bWluLXdpZHRoOiBtYXgtY29udGVudDsKK30KK2lucHV0IHsKKyAgICB3aWR0aDogMTBweDsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBwaW5rOworICAgIG1hcmdpbjogMDsKK30KKzwvc3R5bGU+CisK KzxpbnB1dCBjbGFzcz0ibWluIiB0eXBlPSJmaWxlIj4KKzxpbnB1dCBjbGFzcz0ibWF4IiB0eXBl PSJmaWxlIj4K