60456 2011-05-08 22:09:21 -0700 Implement expanding CSS border properties in CSSStyleApplyProperty. 2011-05-09 02:19:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned commit-queue dglazkov eric macpherson oldest_to_newest 400343 0 macpherson 2011-05-08 22:09:21 -0700 Implement expanding CSS border properties in CSSStyleApplyProperty. 400345 1 92758 macpherson 2011-05-08 22:25:14 -0700 Created attachment 92758 Patch 400374 2 92758 eric 2011-05-09 00:36:11 -0700 Comment on attachment 92758 Patch OK. 400403 3 commit-queue 2011-05-09 02:16:39 -0700 The commit-queue encountered the following flaky tests while processing attachment 92758: http/tests/xmlhttprequest/failed-auth.html bug 51835 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 400405 4 92758 commit-queue 2011-05-09 02:19:36 -0700 Comment on attachment 92758 Patch Clearing flags on attachment: 92758 Committed r86044: <http://trac.webkit.org/changeset/86044> 400406 5 commit-queue 2011-05-09 02:19:39 -0700 All reviewed patches have been landed. Closing bug. 92758 2011-05-08 22:25:14 -0700 2011-05-09 02:19:36 -0700 Patch bug-60456-20110509152511.patch text/plain 9666 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MDQzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDggIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgZXhwYW5kaW5nIENTUyBib3Jk ZXIgcHJvcGVydGllcyBpbiBDU1NTdHlsZUFwcGx5UHJvcGVydHkuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDQ1NgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBhZGRlZCBhcyBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuCisKKyAgICAgICAgKiBjc3Mv Q1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBw bHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgQ3JlYXRlIENTUyBi b3JkZXIgZXhwYW5kaW5nIHByb3BlcnR5IGhhbmRsZXJzLgorICAgICAgICAqIGNzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5 UHJvcGVydHkpOgorICAgICAgICBSZW1vdmUgcHJvcGVydHkgaGFuZGxlcnMgdGhhdCBhcmUgbm8g bG9uZ2VyIG5lZWRlZC4KKwogMjAxMS0wNS0wOCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCShyZXZpc2lvbiA4NjAzOCkK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00NjUsNiArNDY1LDE2IEBAIENTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5 bGVBcHBseVByb3AKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlPdXRsaW5lV2lk dGgsIG5ldyBBcHBseVByb3BlcnR5V2lkdGgoJlJlbmRlclN0eWxlOjpvdXRsaW5lV2lkdGgsICZS ZW5kZXJTdHlsZTo6c2V0T3V0bGluZVdpZHRoLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJX aWR0aCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblJ1 bGVXaWR0aCwgbmV3IEFwcGx5UHJvcGVydHlXaWR0aCgmUmVuZGVyU3R5bGU6OmNvbHVtblJ1bGVX aWR0aCwgJlJlbmRlclN0eWxlOjpzZXRDb2x1bW5SdWxlV2lkdGgsICZSZW5kZXJTdHlsZTo6aW5p dGlhbEJvcmRlcldpZHRoKSk7CiAKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlC b3JkZXJUb3AsIG5ldyBBcHBseVByb3BlcnR5RXhwYW5kaW5nU3VwcHJlc3NWYWx1ZShwcm9wZXJ0 eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJUb3BDb2xvciksIHByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eUJvcmRlclRvcFN0eWxlKSwgcHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVy VG9wV2lkdGgpKSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyUmln aHQsIG5ldyBBcHBseVByb3BlcnR5RXhwYW5kaW5nU3VwcHJlc3NWYWx1ZShwcm9wZXJ0eUhhbmRs ZXIoQ1NTUHJvcGVydHlCb3JkZXJSaWdodENvbG9yKSwgcHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5Qm9yZGVyUmlnaHRTdHlsZSksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlclJp Z2h0V2lkdGgpKSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyQm90 dG9tLCBuZXcgQXBwbHlQcm9wZXJ0eUV4cGFuZGluZ1N1cHByZXNzVmFsdWUocHJvcGVydHlIYW5k bGVyKENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tQ29sb3IpLCBwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlCb3JkZXJCb3R0b21TdHlsZSksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRl ckJvdHRvbVdpZHRoKSkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRl ckxlZnQsIG5ldyBBcHBseVByb3BlcnR5RXhwYW5kaW5nU3VwcHJlc3NWYWx1ZShwcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJMZWZ0Q29sb3IpLCBwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlCb3JkZXJMZWZ0U3R5bGUpLCBwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJM ZWZ0V2lkdGgpKSk7CisKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJT dHlsZSwgbmV3IEFwcGx5UHJvcGVydHlFeHBhbmRpbmdTdXBwcmVzc1ZhbHVlKHByb3BlcnR5SGFu ZGxlcihDU1NQcm9wZXJ0eUJvcmRlclRvcFN0eWxlKSwgcHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5Qm9yZGVyUmlnaHRTdHlsZSksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckJv dHRvbVN0eWxlKSwgcHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyTGVmdFN0eWxlKSkp OworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlcldpZHRoLCBuZXcgQXBw bHlQcm9wZXJ0eUV4cGFuZGluZ1N1cHByZXNzVmFsdWUocHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5Qm9yZGVyVG9wV2lkdGgpLCBwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJSaWdo dFdpZHRoKSwgcHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tV2lkdGgpLCBw cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJMZWZ0V2lkdGgpKSk7CisgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyQ29sb3IsIG5ldyBBcHBseVByb3BlcnR5RXhw YW5kaW5nU3VwcHJlc3NWYWx1ZShwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJUb3BD b2xvciksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlclJpZ2h0Q29sb3IpLCBwcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJCb3R0b21Db2xvciksIHByb3BlcnR5SGFuZGxl cihDU1NQcm9wZXJ0eUJvcmRlckxlZnRDb2xvcikpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIo Q1NTUHJvcGVydHlCb3JkZXIsIG5ldyBBcHBseVByb3BlcnR5RXhwYW5kaW5nU3VwcHJlc3NWYWx1 ZShwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJTdHlsZSksIHByb3BlcnR5SGFuZGxl cihDU1NQcm9wZXJ0eUJvcmRlcldpZHRoKSwgcHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9y ZGVyQ29sb3IpKSk7CisKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlPdXRsaW5l Q29sb3IsIG5ldyBBcHBseVByb3BlcnR5Q29sb3I8SW5oZXJpdEZyb21QYXJlbnQ+KCZSZW5kZXJT dHlsZTo6b3V0bGluZUNvbG9yLCAmUmVuZGVyU3R5bGU6OnNldE91dGxpbmVDb2xvciwgJlJlbmRl clN0eWxlOjpjb2xvcikpOwogCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5T3Zl cmZsb3dYLCBuZXcgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RU92ZXJmbG93PigmUmVuZGVyU3R5bGU6 Om92ZXJmbG93WCwgJlJlbmRlclN0eWxlOjpzZXRPdmVyZmxvd1gsICZSZW5kZXJTdHlsZTo6aW5p dGlhbE92ZXJmbG93WCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9y LmNwcAkocmV2aXNpb24gODYwMzgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0NjksOTMgKzQ0NjksNiBAQCB2b2lkIENTU1N0 eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIGVsc2UgaWYgKGlzSW5oZXJp dCkKICAgICAgICAgICAgIG1fc3R5bGUtPmluaGVyaXRNYXNrTGF5ZXJzKCptX3BhcmVudFN0eWxl LT5tYXNrTGF5ZXJzKCkpOwogICAgICAgICByZXR1cm47Ci0KLSAgICBjYXNlIENTU1Byb3BlcnR5 Qm9yZGVyOgotICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJTdHlsZToKLSAgICBjYXNlIENTU1By b3BlcnR5Qm9yZGVyV2lkdGg6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckNvbG9yOgotICAg ICAgICBpZiAoaWQgPT0gQ1NTUHJvcGVydHlCb3JkZXIgfHwgaWQgPT0gQ1NTUHJvcGVydHlCb3Jk ZXJDb2xvcikKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKGlzSW5oZXJpdCkgewotICAgICAg ICAgICAgICAgIG1fc3R5bGUtPnNldEJvcmRlclRvcENvbG9yKG1fcGFyZW50U3R5bGUtPmJvcmRl clRvcENvbG9yKCkuaXNWYWxpZCgpID8gbV9wYXJlbnRTdHlsZS0+Ym9yZGVyVG9wQ29sb3IoKSA6 IG1fcGFyZW50U3R5bGUtPmNvbG9yKCkpOwotICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEJv cmRlckJvdHRvbUNvbG9yKG1fcGFyZW50U3R5bGUtPmJvcmRlckJvdHRvbUNvbG9yKCkuaXNWYWxp ZCgpID8gbV9wYXJlbnRTdHlsZS0+Ym9yZGVyQm90dG9tQ29sb3IoKSA6IG1fcGFyZW50U3R5bGUt PmNvbG9yKCkpOwotICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEJvcmRlckxlZnRDb2xvciht X3BhcmVudFN0eWxlLT5ib3JkZXJMZWZ0Q29sb3IoKS5pc1ZhbGlkKCkgPyBtX3BhcmVudFN0eWxl LT5ib3JkZXJMZWZ0Q29sb3IoKSA6IG1fcGFyZW50U3R5bGUtPmNvbG9yKCkpOwotICAgICAgICAg ICAgICAgIG1fc3R5bGUtPnNldEJvcmRlclJpZ2h0Q29sb3IobV9wYXJlbnRTdHlsZS0+Ym9yZGVy UmlnaHRDb2xvcigpLmlzVmFsaWQoKSA/IG1fcGFyZW50U3R5bGUtPmJvcmRlclJpZ2h0Q29sb3Io KTogbV9wYXJlbnRTdHlsZS0+Y29sb3IoKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBl bHNlIGlmIChpc0luaXRpYWwpIHsKLSAgICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJU b3BDb2xvcihDb2xvcigpKTsgLy8gUmVzZXQgdG8gaW52YWxpZCBjb2xvciBzbyBjdXJyZW50Q29s b3IgaXMgdXNlZCBpbnN0ZWFkLgotICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEJvcmRlckJv dHRvbUNvbG9yKENvbG9yKCkpOwotICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEJvcmRlckxl ZnRDb2xvcihDb2xvcigpKTsKLSAgICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJSaWdo dENvbG9yKENvbG9yKCkpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIGlmIChp ZCA9PSBDU1NQcm9wZXJ0eUJvcmRlciB8fCBpZCA9PSBDU1NQcm9wZXJ0eUJvcmRlclN0eWxlKQot ICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoaXNJbmhlcml0KSB7Ci0gICAgICAgICAgICAgICAg bV9zdHlsZS0+c2V0Qm9yZGVyVG9wU3R5bGUobV9wYXJlbnRTdHlsZS0+Ym9yZGVyVG9wU3R5bGUo KSk7Ci0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyQm90dG9tU3R5bGUobV9wYXJl bnRTdHlsZS0+Ym9yZGVyQm90dG9tU3R5bGUoKSk7Ci0gICAgICAgICAgICAgICAgbV9zdHlsZS0+ c2V0Qm9yZGVyTGVmdFN0eWxlKG1fcGFyZW50U3R5bGUtPmJvcmRlckxlZnRTdHlsZSgpKTsKLSAg ICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJSaWdodFN0eWxlKG1fcGFyZW50U3R5bGUt PmJvcmRlclJpZ2h0U3R5bGUoKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBlbHNlIGlm IChpc0luaXRpYWwpIHsKLSAgICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJUb3BTdHls ZShSZW5kZXJTdHlsZTo6aW5pdGlhbEJvcmRlclN0eWxlKCkpOwotICAgICAgICAgICAgICAgIG1f c3R5bGUtPnNldEJvcmRlckJvdHRvbVN0eWxlKFJlbmRlclN0eWxlOjppbml0aWFsQm9yZGVyU3R5 bGUoKSk7Ci0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyTGVmdFN0eWxlKFJlbmRl clN0eWxlOjppbml0aWFsQm9yZGVyU3R5bGUoKSk7Ci0gICAgICAgICAgICAgICAgbV9zdHlsZS0+ c2V0Qm9yZGVyUmlnaHRTdHlsZShSZW5kZXJTdHlsZTo6aW5pdGlhbEJvcmRlclN0eWxlKCkpOwot ICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIGlmIChpZCA9PSBDU1NQcm9wZXJ0eUJv cmRlciB8fCBpZCA9PSBDU1NQcm9wZXJ0eUJvcmRlcldpZHRoKQotICAgICAgICB7Ci0gICAgICAg ICAgICBpZiAoaXNJbmhlcml0KSB7Ci0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVy VG9wV2lkdGgobV9wYXJlbnRTdHlsZS0+Ym9yZGVyVG9wV2lkdGgoKSk7Ci0gICAgICAgICAgICAg ICAgbV9zdHlsZS0+c2V0Qm9yZGVyQm90dG9tV2lkdGgobV9wYXJlbnRTdHlsZS0+Ym9yZGVyQm90 dG9tV2lkdGgoKSk7Ci0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyTGVmdFdpZHRo KG1fcGFyZW50U3R5bGUtPmJvcmRlckxlZnRXaWR0aCgpKTsKLSAgICAgICAgICAgICAgICBtX3N0 eWxlLT5zZXRCb3JkZXJSaWdodFdpZHRoKG1fcGFyZW50U3R5bGUtPmJvcmRlclJpZ2h0V2lkdGgo KSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBlbHNlIGlmIChpc0luaXRpYWwpIHsKLSAg ICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJUb3BXaWR0aChSZW5kZXJTdHlsZTo6aW5p dGlhbEJvcmRlcldpZHRoKCkpOwotICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEJvcmRlckJv dHRvbVdpZHRoKFJlbmRlclN0eWxlOjppbml0aWFsQm9yZGVyV2lkdGgoKSk7Ci0gICAgICAgICAg ICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyTGVmdFdpZHRoKFJlbmRlclN0eWxlOjppbml0aWFsQm9y ZGVyV2lkdGgoKSk7Ci0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyUmlnaHRXaWR0 aChSZW5kZXJTdHlsZTo6aW5pdGlhbEJvcmRlcldpZHRoKCkpOwotICAgICAgICAgICAgfQotICAg ICAgICB9Ci0gICAgICAgIHJldHVybjsKLSAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyVG9wOgot ICAgICAgICBpZiAoaXNJbmhlcml0KSB7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJU b3BDb2xvcihtX3BhcmVudFN0eWxlLT5ib3JkZXJUb3BDb2xvcigpLmlzVmFsaWQoKSA/IG1fcGFy ZW50U3R5bGUtPmJvcmRlclRvcENvbG9yKCkgOiBtX3BhcmVudFN0eWxlLT5jb2xvcigpKTsKLSAg ICAgICAgICAgIG1fc3R5bGUtPnNldEJvcmRlclRvcFN0eWxlKG1fcGFyZW50U3R5bGUtPmJvcmRl clRvcFN0eWxlKCkpOwotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyVG9wV2lkdGgobV9w YXJlbnRTdHlsZS0+Ym9yZGVyVG9wV2lkdGgoKSk7Ci0gICAgICAgIH0KLSAgICAgICAgZWxzZSBp ZiAoaXNJbml0aWFsKQotICAgICAgICAgICAgbV9zdHlsZS0+cmVzZXRCb3JkZXJUb3AoKTsKLSAg ICAgICAgcmV0dXJuOwotICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJSaWdodDoKLSAgICAgICAg aWYgKGlzSW5oZXJpdCkgewotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyUmlnaHRDb2xv cihtX3BhcmVudFN0eWxlLT5ib3JkZXJSaWdodENvbG9yKCkuaXNWYWxpZCgpID8gbV9wYXJlbnRT dHlsZS0+Ym9yZGVyUmlnaHRDb2xvcigpIDogbV9wYXJlbnRTdHlsZS0+Y29sb3IoKSk7Ci0gICAg ICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJSaWdodFN0eWxlKG1fcGFyZW50U3R5bGUtPmJvcmRl clJpZ2h0U3R5bGUoKSk7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJSaWdodFdpZHRo KG1fcGFyZW50U3R5bGUtPmJvcmRlclJpZ2h0V2lkdGgoKSk7Ci0gICAgICAgIH0KLSAgICAgICAg ZWxzZSBpZiAoaXNJbml0aWFsKQotICAgICAgICAgICAgbV9zdHlsZS0+cmVzZXRCb3JkZXJSaWdo dCgpOwotICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbToK LSAgICAgICAgaWYgKGlzSW5oZXJpdCkgewotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVy Qm90dG9tQ29sb3IobV9wYXJlbnRTdHlsZS0+Ym9yZGVyQm90dG9tQ29sb3IoKS5pc1ZhbGlkKCkg PyBtX3BhcmVudFN0eWxlLT5ib3JkZXJCb3R0b21Db2xvcigpIDogbV9wYXJlbnRTdHlsZS0+Y29s b3IoKSk7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJCb3R0b21TdHlsZShtX3BhcmVu dFN0eWxlLT5ib3JkZXJCb3R0b21TdHlsZSgpKTsKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEJv cmRlckJvdHRvbVdpZHRoKG1fcGFyZW50U3R5bGUtPmJvcmRlckJvdHRvbVdpZHRoKCkpOwotICAg ICAgICB9Ci0gICAgICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkKLSAgICAgICAgICAgIG1fc3R5bGUt PnJlc2V0Qm9yZGVyQm90dG9tKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICBjYXNlIENTU1Byb3Bl cnR5Qm9yZGVyTGVmdDoKLSAgICAgICAgaWYgKGlzSW5oZXJpdCkgewotICAgICAgICAgICAgbV9z dHlsZS0+c2V0Qm9yZGVyTGVmdENvbG9yKG1fcGFyZW50U3R5bGUtPmJvcmRlckxlZnRDb2xvcigp LmlzVmFsaWQoKSA/IG1fcGFyZW50U3R5bGUtPmJvcmRlckxlZnRDb2xvcigpIDogbV9wYXJlbnRT dHlsZS0+Y29sb3IoKSk7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJMZWZ0U3R5bGUo bV9wYXJlbnRTdHlsZS0+Ym9yZGVyTGVmdFN0eWxlKCkpOwotICAgICAgICAgICAgbV9zdHlsZS0+ c2V0Qm9yZGVyTGVmdFdpZHRoKG1fcGFyZW50U3R5bGUtPmJvcmRlckxlZnRXaWR0aCgpKTsKLSAg ICAgICAgfQotICAgICAgICBlbHNlIGlmIChpc0luaXRpYWwpCi0gICAgICAgICAgICBtX3N0eWxl LT5yZXNldEJvcmRlckxlZnQoKTsKLSAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgQ1NTUHJvcGVy dHlNYXJnaW46CiAgICAgICAgIGlmIChpc0luaGVyaXQpIHsKICAgICAgICAgICAgIG1fc3R5bGUt PnNldE1hcmdpblRvcChtX3BhcmVudFN0eWxlLT5tYXJnaW5Ub3AoKSk7CkBAIC01NjE2LDYgKzU1 MjksMTQgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNh c2UgQ1NTUHJvcGVydHlCb3JkZXJSaWdodFdpZHRoOgogICAgIGNhc2UgQ1NTUHJvcGVydHlCb3Jk ZXJCb3R0b21XaWR0aDoKICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyTGVmdFdpZHRoOgorICAg IGNhc2UgQ1NTUHJvcGVydHlCb3JkZXI6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlclN0eWxl OgorICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJXaWR0aDoKKyAgICBjYXNlIENTU1Byb3BlcnR5 Qm9yZGVyQ29sb3I6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlclRvcDoKKyAgICBjYXNlIENT U1Byb3BlcnR5Qm9yZGVyUmlnaHQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbToK KyAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyTGVmdDoKICAgICBjYXNlIENTU1Byb3BlcnR5T3V0 bGluZVdpZHRoOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5SdWxlV2lkdGg6CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eU91dGxpbmVDb2xvcjoK