119030 2013-07-23 17:04:38 -0700 Move platform-specific implementation of the color picker 2013-07-25 09:25:35 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Other Unspecified RESOLVED WORKSFORME InRadar P2 Normal --- 61276 0 ruthiecftg webkit-unassigned beidson gyuyoung.kim jonlee ky0.choi ruthiecftg ryuan.choi webkit-bug-importer oldest_to_newest 911180 0 ruthiecftg 2013-07-23 17:04:38 -0700 In bug 95058, a first WK2 implementation for <input type='color'> was outlined. However, in bug 61276, there will be some architectural changes that require changing the assumptions of the previous implementation. Most notably, bug 61276 does not assume that WebPageProxy::showColorChooser is only called when m_colorChooser is null. showColorChooser will be called anytime an <input type='color'> element is activated (in ColorInputType.cpp). To keep WebPageProxy cross-platform and to continue supporting the implementation put in place in bug 95058 as best as possible, parts of showColorChooser will be refactored into new private function like boolean useLegacyColorPicker() that will return false in WebPageProxy. A platform-specific WebPageProxySamsung will be created and the refactored useLegacyColorPicker() will be moved here. 911181 1 webkit-bug-importer 2013-07-23 17:06:01 -0700 <rdar://problem/14528215> 911479 2 207425 ruthiecftg 2013-07-24 18:22:03 -0700 Created attachment 207425 Patch 911486 3 207425 ap 2013-07-24 18:58:32 -0700 Comment on attachment 207425 Patch Adding the new file to xcodeproj is not right - I think that it would need be added to Source/WebKit2/PlatformEfl.cmake if we agreed that it's platform specific. But I don't think that the code is platform specific. It just does things in a way that's either different or plain incorrect. In the former case, we should some up with a better way to describe and conditionalize it. In the latter way, it should be replaced with correct code (this is WebKit2). 911487 4 ap 2013-07-24 18:58:53 -0700 latter *case* 911508 5 ruthiecftg 2013-07-24 21:43:36 -0700 (In reply to comment #3) > (From update of attachment 207425 [details]) > Adding the new file to xcodeproj is not right - I think that it would need be added to Source/WebKit2/PlatformEfl.cmake if we agreed that it's platform specific. > > But I don't think that the code is platform specific. It just does things in a way that's either different or plain incorrect. In the former case, we should some up with a better way to describe and conditionalize it. In the latter way, it should be replaced with correct code (this is WebKit2). The current implementation assumes that only one <input type='color'> is on a page, which is not a sustainable model (look at WebPageProxy::showColorChooser. This assumes that m_colorPicker is null when it's called. However, showColorChooser is called whenever an <input type='color'> object is activated (in ColorInputType::handleDOMActivateEvent). If there are two <input type='color'> elements and one is first clicked on and then the second, then showColorChooser will be called for the second, but m_colorPicker will not be null. This should be changed to be able to handle multiple <input type='color'> elements, and another patch is tracking that (bug 61276). Also, it's unnecessary to use the WebColorPickerResultListenerProxy object and m_uiClient. Once m_colorPicker is created and set properly, it should be able to handle receiving user input of color selection and communicating back down to the WebPageProxy level (see the proposed patch for bug 61276). 911520 6 ryuan.choi 2013-07-25 00:12:01 -0700 (In reply to comment #5) > (In reply to comment #3) > > (From update of attachment 207425 [details] [details]) > > Adding the new file to xcodeproj is not right - I think that it would need be added to Source/WebKit2/PlatformEfl.cmake if we agreed that it's platform specific. > > > > But I don't think that the code is platform specific. It just does things in a way that's either different or plain incorrect. In the former case, we should some up with a better way to describe and conditionalize it. In the latter way, it should be replaced with correct code (this is WebKit2). > > The current implementation assumes that only one <input type='color'> is on a page, which is not a sustainable model (look at WebPageProxy::showColorChooser. This assumes that m_colorPicker is null when it's called. > > However, showColorChooser is called whenever an <input type='color'> object is activated (in ColorInputType::handleDOMActivateEvent). If there are two <input type='color'> elements and one is first clicked on and then the second, then showColorChooser will be called for the second, but m_colorPicker will not be null. > > This should be changed to be able to handle multiple <input type='color'> elements, and another patch is tracking that (bug 61276). > > Also, it's unnecessary to use the WebColorPickerResultListenerProxy object and m_uiClient. Once m_colorPicker is created and set properly, it should be able to handle receiving user input of color selection and communicating back down to the WebPageProxy level (see the proposed patch for bug 61276). If current logic is bad (I think so), probably I can refactor EFL side like bug 61276 within 1~2 days. Anyway, "Samsung" in folder/file name looks not good to me. :) Samsung is not a platform. 911641 7 ruthiecftg 2013-07-25 09:25:35 -0700 (In reply to comment #6) > > If current logic is bad (I think so), probably I can refactor EFL side like bug 61276 within 1~2 days. > > Anyway, "Samsung" in folder/file name looks not good to me. :) > Samsung is not a platform. Sounds good. I'll close this bug then and go ahead with 61276. :) 207425 2013-07-24 18:22:03 -0700 2013-07-24 18:58:32 -0700 Patch bug-119030-20130724182202.patch text/plain 9125 ruthiecftg SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzEwOCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA3LTI0ICBSdXRoIEZv bmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgcGxhdGZvcm0tc3BlY2lm aWMgaW1wbGVtZW50YXRpb24gb2YgdGhlIGNvbG9yIHBpY2tlcgorICAgICAgICA8cmRhcjovL3By b2JsZW0vMTQ1MjgyMTU+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE5MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW92ZSBhIGJsb2NrIG9mIHBsYXRmb3JtLXNwZWNpZmljIGNvZGUgZm9yIDxpbnB1dCB0eXBl PSdjb2xvcic+IGZyb20gV2ViUGFnZVByb3h5OjpzaG93Q29sb3JDaG9vc2VyCisgICAgICAgIHRv IGEgbmV3IG1ldGhvZCBjYWxsZWQgV2ViUGFnZVByb3h5Ojp1c2VMZWdhY3lDb2xvclBpY2tlci4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OnNob3dDb2xvckNob29zZXIpOiBEZWxldGVkIHBsYXRmb3JtLXNwZWNp ZmljIGNvZGUgYW5kIGluc3RlYWQKKyAgICAgICAgICBjYWxsIHVzZUxlZ2FjeUNvbG9yUGlja2Vy IHRvIHRha2UgY2FyZSBvZiBleGVjdXRpbmcgcGxhdGZvcm0tc3BlY2lmaWMgY29kZS4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6dXNlTGVnYWN5Q29sb3JQaWNrZXIpOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv c2Ftc3VuZzogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNzL3NhbXN1bmcvV2ViUGFnZVByb3h5 U2Ftc3VuZy5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnVzZUxl Z2FjeUNvbG9yUGlja2VyKTogTW92ZWQgcGxhdGZvcm0tc3BlY2lmaWMgY29kZSBoZXJlLgorICAg ICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxMy0wNy0yNCAg UnV0aCBGb25nICA8cnV0aF9mb25nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgV2ViQ29s b3JDaG9vc2VyUHJveHkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCShyZXZpc2lvbiAxNTMxMDgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjkyMCwxNyArMjkyMCwxMiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6bmVlZFRvdWNoRXZlbnRzKGJvb2wgCiAjaWYgRU5BQkxFKElOUFVUX1RZ UEVfQ09MT1IpCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd0NvbG9yQ2hvb3Nlcihjb25zdCBXZWJD b3JlOjpDb2xvciYgaW5pdGlhbENvbG9yLCBjb25zdCBJbnRSZWN0JiBlbGVtZW50UmVjdCkKIHsK LSAgICBBU1NFUlQoIW1fY29sb3JQaWNrZXIpOwotCiAgICAgaWYgKG1fY29sb3JQaWNrZXJSZXN1 bHRMaXN0ZW5lcikgewogICAgICAgICBtX2NvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXItPmludmFs aWRhdGUoKTsKICAgICAgICAgbV9jb2xvclBpY2tlclJlc3VsdExpc3RlbmVyID0gbnVsbHB0cjsK ICAgICB9CiAKLSAgICBtX2NvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXIgPSBXZWJDb2xvclBpY2tl clJlc3VsdExpc3RlbmVyUHJveHk6OmNyZWF0ZSh0aGlzKTsKLSAgICBtX2NvbG9yUGlja2VyID0g V2ViQ29sb3JQaWNrZXI6OmNyZWF0ZSh0aGlzKTsKLQotICAgIGlmIChtX3VpQ2xpZW50LnNob3dD b2xvclBpY2tlcih0aGlzLCBpbml0aWFsQ29sb3Iuc2VyaWFsaXplZCgpLCBtX2NvbG9yUGlja2Vy UmVzdWx0TGlzdGVuZXIuZ2V0KCkpKQorICAgIGlmICh1c2VMZWdhY3lDb2xvclBpY2tlcigpKQog ICAgICAgICByZXR1cm47CiAKICAgICBtX2NvbG9yUGlja2VyID0gbV9wYWdlQ2xpZW50LT5jcmVh dGVDb2xvclBpY2tlcih0aGlzLCBpbml0aWFsQ29sb3IsIGVsZW1lbnRSZWN0KTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE1MzEwOCkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpA QCAtODk4LDYgKzg5OCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzaG93Q29sb3JDaG9vc2VyKGNv bnN0IFdlYkNvcmU6OkNvbG9yJiBpbml0aWFsQ29sb3IsIGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm KTsKICAgICB2b2lkIGRpZENob29zZUNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7CiAgICAg dm9pZCBkaWRFbmRDb2xvckNob29zZXIoKTsKKyAgICBib29sIHVzZUxlZ2FjeUNvbG9yUGlja2Vy KCkgeyByZXR1cm4gZmFsc2U7IH0KICNlbmRpZgogCiAgICAgdm9pZCBlZGl0b3JTdGF0ZUNoYW5n ZWQoY29uc3QgRWRpdG9yU3RhdGUmKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9z YW1zdW5nL1dlYlBhZ2VQcm94eVNhbXN1bmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9zYW1zdW5nL1dlYlBhZ2VQcm94eVNhbXN1bmcuY3BwCShyZXZpc2lvbiAw KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NhbXN1bmcvV2ViUGFnZVByb3h5U2Ftc3Vu Zy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0NCBAQAorLyoKKyAqIENvcHlyaWdodCAo QykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291 cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICog Mi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICog VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVU T1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBD T05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1Ig QlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVP UlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBv cnQgImNvbmZpZy5oIgorI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCisKK25hbWVzcGFjZSBXZWJL aXQgeworCisjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCitib29sIFdlYlBhZ2VQcm94eTo6 dXNlTGVnYWN5Q29sb3JQaWNrZXIoKQoreworICAgIG1fY29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5l ciA9IFdlYkNvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXJQcm94eTo6Y3JlYXRlKHRoaXMpOworICAg IG1fY29sb3JQaWNrZXIgPSBXZWJDb2xvclBpY2tlcjo6Y3JlYXRlKHRoaXMpOworICAgIAorICAg IGlmIChtX3VpQ2xpZW50LnNob3dDb2xvclBpY2tlcih0aGlzLCBpbml0aWFsQ29sb3Iuc2VyaWFs aXplZCgpLCBtX2NvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXIuZ2V0KCkpKQorICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICAKKyAgICByZXR1cm4gZmFsc2U7Cit9CisjZW5kaWYgLy8gRU5BQkxFKElO UFVUX1RZUEVfQ09MT1IpCisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dl YktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24g MTUzMTA4KQorKysgU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCSh3b3JraW5nIGNvcHkpCkBAIC03MjAsNiArNzIwLDcgQEAKIAkJQkMxREQ3QjIxMTREQzM5 NjAwNUFEQUYzIC8qIFdlYkNvcmVBcmd1bWVudENvZGVycy5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMxREQ3QjExMTREQzM5NjAwNUFEQUYzIC8qIFdl YkNvcmVBcmd1bWVudENvZGVycy5oICovOyB9OwogCQlCQzFERkU4RjEyQjMxQ0E4MDA1REY3MzAg LyogV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gQkMxREZFOEQxMkIzMUNBODAwNURGNzMwIC8qIFdLT3BlblBh bmVsUmVzdWx0TGlzdGVuZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OwogCQlCQzFERkVBNDEyQjMxRjg3MDA1REY3MzAgLyogV2ViT3BlblBhbmVsUmVz dWx0TGlzdGVuZXJQcm94eS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQkMxREZFQTIxMkIzMUY4NzAwNURGNzMwIC8qIFdlYk9wZW5QYW5lbFJlc3VsdExp c3RlbmVyUHJveHkuaCAqLzsgfTsKKwkJQkMxRkMyRDcxN0EwQTVGQTAwOURBMUU3IC8qIFdlYlBh Z2VQcm94eVNhbXN1bmcuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQkMxRkMyRDUxN0EwQTVGQTAwOURBMUU3IC8qIFdlYlBhZ2VQcm94eVNhbXN1bmcu Y3BwICovOyB9OwogCQlCQzIwNEVFMjExQzgzRTk4MDA4RjMzNzUgLyogSW5qZWN0ZWRCdW5kbGUu Y3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMyMDRF RTAxMUM4M0U5ODAwOEYzMzc1IC8qIEluamVjdGVkQnVuZGxlLmNwcCAqLzsgfTsKIAkJQkMyMDRF RTMxMUM4M0U5ODAwOEYzMzc1IC8qIEluamVjdGVkQnVuZGxlLmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzIwNEVFMTExQzgzRTk4MDA4RjMzNzUgLyog SW5qZWN0ZWRCdW5kbGUuaCAqLzsgfTsKIAkJQkMyMDRFRTYxMUM4M0VBOTAwOEYzMzc1IC8qIElu amVjdGVkQnVuZGxlTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQkMyMDRFRTUxMUM4M0VBOTAwOEYzMzc1IC8qIEluamVjdGVkQnVuZGxlTWFjLm1t ICovOyB9OwpAQCAtMjIxNCw2ICsyMjE1LDcgQEAKIAkJQkMxREZFOEUxMkIzMUNBODAwNURGNzMw IC8qIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lci5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCUJDMURGRUEyMTJCMzFGODcwMDVERjczMCAvKiBXZWJPcGVuUGFu ZWxSZXN1bHRMaXN0ZW5lclByb3h5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFdlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJveHkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJQkMxREZFQTMxMkIzMUY4NzAwNURGNzMwIC8qIFdlYk9wZW5QYW5lbFJlc3VsdExp c3RlbmVyUHJveHkuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2Vi T3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CisJCUJDMUZDMkQ1MTdBMEE1RkEwMDlEQTFFNyAvKiBXZWJQYWdlUHJveHlTYW1zdW5nLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBleHBsaWNpdEZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBmaWxlRW5jb2RpbmcgPSA0OyBwYXRoID0gV2ViUGFnZVByb3h5U2Ftc3Vu Zy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDMjA0RUUwMTFDODNFOTgwMDhG MzM3NSAvKiBJbmplY3RlZEJ1bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBJbmplY3RlZEJ1bmRsZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CUJDMjA0RUUxMTFDODNFOTgwMDhGMzM3NSAvKiBJbmplY3RlZEJ1bmRsZS5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBJbmplY3RlZEJ1bmRsZS5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlCQzIwNEVFNTExQzgzRUE5MDA4RjMzNzUgLyogSW5qZWN0ZWRCdW5kbGVN YWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBJbmplY3RlZEJ1 bmRsZU1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQwMDUsNiArNDAwNyw3 IEBACiAJCUJDMDMyREMzMTBGNDM4MjYwMDU4QzE1QSAvKiBVSVByb2Nlc3MgKi8gPSB7CiAJCQlp c2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCUJDMUZDMkQzMTdBMEE1QzEwMDlE QTFFNyAvKiBzYW1zdW5nICovLAogCQkJCUJDMDMyREM0MTBGNDM4N0MwMDU4QzE1QSAvKiBBUEkg Ki8sCiAJCQkJNTEyRjU4OEQxMkE4ODM2RjAwNjI5NTMwIC8qIEF1dGhlbnRpY2F0aW9uICovLAog CQkJCTUxQjMwMDREMTI1MjlDRjUwMDBCNUNBMCAvKiBjZiAqLywKQEAgLTQzODMsNiArNDM4Niwx NCBAQAogCQkJcGF0aCA9IENvcmVJUENTdXBwb3J0OwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsKIAkJfTsKKwkJQkMxRkMyRDMxN0EwQTVDMTAwOURBMUU3IC8qIHNhbXN1bmcgKi8gPSB7CisJ CQlpc2EgPSBQQlhHcm91cDsKKwkJCWNoaWxkcmVuID0gKAorCQkJCUJDMUZDMkQ1MTdBMEE1RkEw MDlEQTFFNyAvKiBXZWJQYWdlUHJveHlTYW1zdW5nLmNwcCAqLywKKwkJCSk7CisJCQlwYXRoID0g c2Ftc3VuZzsKKwkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CisJCX07CiAJCUJDMjA0RURGMTFD ODNFNzIwMDhGMzM3NSAvKiBJbmplY3RlZEJ1bmRsZSAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3Vw OwogCQkJY2hpbGRyZW4gPSAoCkBAIC02NzE3LDYgKzY3MjgsNyBAQAogCQkJCTMxQTY3RTBDMTY1 QjJBOTkwMDZDQkE2NiAvKiBQbHVnSW5BdXRvU3RhcnRQcm92aWRlci5jcHAgaW4gU291cmNlcyAq LywKIAkJCQkxQThFRjRDQzEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5 LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBMkQ5MUE2MTI4MUQ3MzkwMDFFQjk2MiAvKiBQbHVn aW5Db250cm9sbGVyUHJveHlNYWMubW0gaW4gU291cmNlcyAqLywKKwkJCQlCQzFGQzJENzE3QTBB NUZBMDA5REExRTcgLyogV2ViUGFnZVByb3h5U2Ftc3VuZy5jcHAgaW4gU291cmNlcyAqLywKIAkJ CQkxQThFRjk2RTEyNTJBRjZCMDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2Fn ZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBMTc5NzdGMTM3RUU4MkMwMEY5N0Q0 NSAvKiBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJN0Mz RjhDOTAxNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbkluZm9ybWF0aW9uLmNwcCBpbiBTb3VyY2Vz ICovLAo=