67289 2011-08-31 07:28:08 -0700 Chromium Mac: Tweak rubber banding overhang shadows. Add a drop shadow from the browser's toolbar. 2011-08-31 14:24:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 asvitkine webkit-unassigned dglazkov mark sail thakis webkit.review.bot oldest_to_newest 459609 0 asvitkine 2011-08-31 07:28:08 -0700 Chromium Mac: Tweak rubber banding overhang shadows. Add a drop shadow from the browser's toolbar. 459612 1 105775 asvitkine 2011-08-31 07:30:30 -0700 Created attachment 105775 Patch 459633 2 105775 thakis 2011-08-31 07:59:07 -0700 Comment on attachment 105775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105775&action=review LGTM > Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm:783 > + shadowRect.setHeight(kShadowSize); I guess the reason you have two calls for the toolbar gradient is because the vertical overhang shadow is always full-height while the horizontal overhang shadow might be smaller. > Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm:791 > // If both rectangles present, draw a radial gradient for the corner. I assume you checked that it doesn't look weird that this gets drawn on top of the toolbar shadow :-) 459642 3 asvitkine 2011-08-31 08:11:59 -0700 > > Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm:783 > > + shadowRect.setHeight(kShadowSize); > > I guess the reason you have two calls for the toolbar gradient is because the vertical overhang shadow is always full-height while the horizontal overhang shadow might be smaller. Correct. > > Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm:791 > > // If both rectangles present, draw a radial gradient for the corner. > > I assume you checked that it doesn't look weird that this gets drawn on top of the toolbar shadow :-) When there's a vertical overhang, the implementation degrades to using additive shadows since it's not really possible to have non-additive shadows in the presence of the corner radial gradient. So when the radial gradient is shown, it implies there's a vertical overhang and thus we use additive shadows - so it looks consistent with the horizontal overhang shadows which will also be additive in that case. 459921 4 105775 webkit.review.bot 2011-08-31 14:23:56 -0700 Comment on attachment 105775 Patch Clearing flags on attachment: 105775 Committed r94234: <http://trac.webkit.org/changeset/94234> 459922 5 webkit.review.bot 2011-08-31 14:24:01 -0700 All reviewed patches have been landed. Closing bug. 105775 2011-08-31 07:30:30 -0700 2011-08-31 14:23:56 -0700 Patch bug-67289-20110831103029.patch text/plain 9106 asvitkine SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MTg1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDgtMzEgIEFsZXhlaSBT dml0a2luZSAgPGFzdml0a2luZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ2hyb21pdW0gTWFj OiBUd2VhayBydWJiZXIgYmFuZGluZyBvdmVyaGFuZyBzaGFkb3dzLiBBZGQgYSBkcm9wIHNoYWRv dyBmcm9tIHRoZSBicm93c2VyJ3MgdG9vbGJhci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY3Mjg5CisKKyAgICAgICAgQ2hyb21pdW0gYnVnOiBodHRw Oi8vY3JidWcuY29tLzkzMjI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBzaW5jZSB0aGlzIG1lcmVseSB0d2Vha3MgQ2hyb21p dW0gb3ZlcmhhbmcgYXJlYSBhcHBlYXJhbmNlLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21p dW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50R2l2ZW5UaWNrbWFya3MpOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRPdmVyaGFuZ0FyZWFzKToKKwog MjAxMS0wOC0zMSAgTWlrZSBSZWVkICA8cmVlZEBnb29nbGUuY29tPgogCiAgICAgICAgIFtza2lh XSBhbnRpYWxpYXMgaW1hZ2VzIGlmIHdlJ3JlIHJvdGF0ZWQKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYy5tbQkocmV2aXNpb24gOTQxODQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02 NTUsNyArNjU1LDcgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWludEdpdgog ICAgIGlmICghdGlja21hcmtzLnNpemUoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY29udGV4 dC0+c2F2ZSgpOworICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqY29u dGV4dCk7CiAgICAgY29udGV4dC0+c2V0U2hvdWxkQW50aWFsaWFzKGZhbHNlKTsKICAgICBjb250 ZXh0LT5zZXRTdHJva2VDb2xvcihDb2xvcigweENDLCAweEFBLCAweDAwLCAweEZGKSwgQ29sb3JT cGFjZURldmljZVJHQik7CiAgICAgY29udGV4dC0+c2V0RmlsbENvbG9yKENvbG9yKDB4RkYsIDB4 REQsIDB4MDAsIDB4RkYpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKQEAgLTY3NCwyOCArNjc0LDMz IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRHaXYKICAgICAgICAgY29u dGV4dC0+ZmlsbFJlY3QodGlja1JlY3QpOwogICAgICAgICBjb250ZXh0LT5zdHJva2VSZWN0KHRp Y2tSZWN0LCAxKTsKICAgICB9Ci0KLSAgICBjb250ZXh0LT5yZXN0b3JlKCk7CiB9CiAKIHZvaWQg U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRPdmVyaGFuZ0FyZWFzKFNjcm9sbFZpZXcq IHZpZXcsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgaG9yaXpvbnRh bE92ZXJoYW5nUmVjdCwgY29uc3QgSW50UmVjdCYgdmVydGljYWxPdmVyaGFuZ1JlY3QsIGNvbnN0 IEludFJlY3QmIGRpcnR5UmVjdCkKIHsKLSAgICBjb25zdCBpbnQga1NoYWRvd1NpemUgPSA1Owor ICAgIC8vIFRoZSBleHRlbnQgb2YgZWFjaCBzaGFkb3cgaW4gcGl4ZWxzLgorICAgIGNvbnN0IGlu dCBrU2hhZG93U2l6ZSA9IDQ7CisgICAgLy8gT2Zmc2V0IG9mIG5lZ2F0aXZlIG9uZSBwaXhlbCB0 byBtYWtlIHRoZSBncmFkaWVudCBibGVuZCB3aXRoIHRoZSB0b29sYmFyJ3MgYm90dG9tIGJvcmRl ci4KKyAgICBjb25zdCBpbnQga1Rvb2xiYXJTaGFkb3dPZmZzZXQgPSAtMTsKICAgICBjb25zdCBz dHJ1Y3QgewogICAgICAgICBmbG9hdCBzdG9wOwogICAgICAgICBDb2xvciBjb2xvcjsKICAgICB9 IGtTaGFkb3dDb2xvcnNbXSA9IHsKLSAgICAgICAgeyAwLjAsIENvbG9yKDAsIDAsIDAsIDE0MSkg fSwKLSAgICAgICAgeyAwLjIsIENvbG9yKDAsIDAsIDAsIDg5KSB9LAotICAgICAgICB7IDAuNiwg Q29sb3IoMCwgMCwgMCwgMzApIH0sCi0gICAgICAgIHsgMS4wLCBDb2xvcigwLCAwLCAwLCAwKSB9 CisgICAgICAgIHsgMC4wMDAsIENvbG9yKDAsIDAsIDAsIDI1NSkgfSwKKyAgICAgICAgeyAwLjEy NSwgQ29sb3IoMCwgMCwgMCwgNTcpIH0sCisgICAgICAgIHsgMC4zNzUsIENvbG9yKDAsIDAsIDAs IDQxKSB9LAorICAgICAgICB7IDAuNjI1LCBDb2xvcigwLCAwLCAwLCAxOCkgfSwKKyAgICAgICAg eyAwLjg3NSwgQ29sb3IoMCwgMCwgMCwgNikgfSwKKyAgICAgICAgeyAxLjAwMCwgQ29sb3IoMCwg MCwgMCwgMCkgfQogICAgIH07CiAgICAgY29uc3QgdW5zaWduZWQga051bVNoYWRvd0NvbG9ycyA9 IHNpemVvZihrU2hhZG93Q29sb3JzKS9zaXplb2Yoa1NoYWRvd0NvbG9yc1swXSk7CiAKLSAgICBi b29sIGhhc0hvcml6b250YWxPdmVyaGFuZyA9ICFob3Jpem9udGFsT3ZlcmhhbmdSZWN0LmlzRW1w dHkoKTsKLSAgICBib29sIGhhc1ZlcnRpY2FsT3ZlcmhhbmcgPSAhdmVydGljYWxPdmVyaGFuZ1Jl Y3QuaXNFbXB0eSgpOworICAgIGNvbnN0IGJvb2wgaGFzSG9yaXpvbnRhbE92ZXJoYW5nID0gIWhv cml6b250YWxPdmVyaGFuZ1JlY3QuaXNFbXB0eSgpOworICAgIGNvbnN0IGJvb2wgaGFzVmVydGlj YWxPdmVyaGFuZyA9ICF2ZXJ0aWNhbE92ZXJoYW5nUmVjdC5pc0VtcHR5KCk7CisgICAgLy8gUHJl ZmVyIG5vbi1hZGRpdGl2ZSBzaGFkb3dzLCBidXQgZGVncmFkZSB0byBhZGRpdGl2ZSBzaGFkb3dz IGlmIHRoZXJlIGlzIHZlcnRpY2FsIG92ZXJoYW5nLgorICAgIGNvbnN0IGJvb2wgdXNlQWRkaXRp dmVTaGFkb3dzID0gaGFzVmVydGljYWxPdmVyaGFuZzsKIAotICAgIGNvbnRleHQtPnNhdmUoKTsK KyAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKmNvbnRleHQpOwogCiAg ICAgY29udGV4dC0+c2V0RmlsbFBhdHRlcm4obV9vdmVyaGFuZ1BhdHRlcm4pOwogICAgIGlmICho YXNIb3Jpem9udGFsT3ZlcmhhbmcpCkBAIC03MDksMjAgKzcxNCwyNyBAQCB2b2lkIFNjcm9sbGJh clRoZW1lQ2hyb21pdW1NYWM6OnBhaW50T3ZlCiAKICAgICAvLyBEcmF3IHRoZSBzaGFkb3cgZm9y IHRoZSBob3Jpem9udGFsIG92ZXJoYW5nLgogICAgIGlmIChoYXNIb3Jpem9udGFsT3Zlcmhhbmcp IHsKKyAgICAgICAgaW50IHRvb2xiYXJTaGFkb3dIZWlnaHQgPSBrU2hhZG93U2l6ZTsKICAgICAg ICAgUmVmUHRyPEdyYWRpZW50PiBncmFkaWVudDsKICAgICAgICAgSW50UmVjdCBzaGFkb3dSZWN0 ID0gaG9yaXpvbnRhbE92ZXJoYW5nUmVjdDsKKyAgICAgICAgc2hhZG93UmVjdC5zZXRIZWlnaHQo a1NoYWRvd1NpemUpOwogICAgICAgICBpZiAoc2Nyb2xsT2Zmc2V0LmhlaWdodCgpIDwgMCkgewot ICAgICAgICAgICAgc2hhZG93UmVjdC5zZXRZKHNoYWRvd1JlY3QubWF4WSgpIC0ga1NoYWRvd1Np emUpOwotICAgICAgICAgICAgc2hhZG93UmVjdC5zZXRIZWlnaHQoa1NoYWRvd1NpemUpOwotICAg ICAgICAgICAgZ3JhZGllbnQgPSBHcmFkaWVudDo6Y3JlYXRlKEZsb2F0UG9pbnQoMCwgc2hhZG93 UmVjdC5tYXhZKCkpLCBGbG9hdFBvaW50KDAsIHNoYWRvd1JlY3QueSgpKSk7CisgICAgICAgICAg ICBpZiAodXNlQWRkaXRpdmVTaGFkb3dzKSB7CisgICAgICAgICAgICAgICAgdG9vbGJhclNoYWRv d0hlaWdodCA9IHN0ZDo6bWluKGhvcml6b250YWxPdmVyaGFuZ1JlY3QuaGVpZ2h0KCksIGtTaGFk b3dTaXplKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5o ZWlnaHQoKSA8IDIgKiBrU2hhZG93U2l6ZSArIGtUb29sYmFyU2hhZG93T2Zmc2V0KSB7CisgICAg ICAgICAgICAgICAgLy8gU3BsaXQgdGhlIG92ZXJoYW5nIGFyZWEgYmV0d2VlbiB0aGUgd2ViIGNv bnRlbnQgc2hhZG93IGFuZCB0b29sYmFyIHNoYWRvdyBpZiBpdCdzIHRvbyBzbWFsbC4KKyAgICAg ICAgICAgICAgICBzaGFkb3dSZWN0LnNldEhlaWdodCgoaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5o ZWlnaHQoKSArIDEpIC8gMik7CisgICAgICAgICAgICAgICAgdG9vbGJhclNoYWRvd0hlaWdodCA9 IGhvcml6b250YWxPdmVyaGFuZ1JlY3QuaGVpZ2h0KCkgLSBzaGFkb3dSZWN0LmhlaWdodCgpIC0g a1Rvb2xiYXJTaGFkb3dPZmZzZXQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBzaGFkb3dS ZWN0LnNldFkoaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5tYXhZKCkgLSBzaGFkb3dSZWN0LmhlaWdo dCgpKTsKKyAgICAgICAgICAgIGdyYWRpZW50ID0gR3JhZGllbnQ6OmNyZWF0ZShGbG9hdFBvaW50 KDAsIHNoYWRvd1JlY3QubWF4WSgpKSwgRmxvYXRQb2ludCgwLCBzaGFkb3dSZWN0Lm1heFkoKSAt IGtTaGFkb3dTaXplKSk7CiAgICAgICAgICAgICBzaGFkb3dDb3JuZXJPcmlnaW4uc2V0WShzaGFk b3dSZWN0Lm1heFkoKSk7CiAgICAgICAgICAgICBzaGFkb3dDb3JuZXJPZmZzZXQuc2V0WSgta1No YWRvd1NpemUpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgc2hhZG93UmVjdC5zZXRI ZWlnaHQoa1NoYWRvd1NpemUpOwogICAgICAgICAgICAgZ3JhZGllbnQgPSBHcmFkaWVudDo6Y3Jl YXRlKEZsb2F0UG9pbnQoMCwgc2hhZG93UmVjdC55KCkpLCBGbG9hdFBvaW50KDAsIHNoYWRvd1Jl Y3QubWF4WSgpKSk7CiAgICAgICAgICAgICBzaGFkb3dDb3JuZXJPcmlnaW4uc2V0WShzaGFkb3dS ZWN0LnkoKSk7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKGhhc0hvcml6b250YWxPdmVyaGFuZykg eworICAgICAgICBpZiAoaGFzVmVydGljYWxPdmVyaGFuZykgewogICAgICAgICAgICAgc2hhZG93 UmVjdC5zZXRXaWR0aChzaGFkb3dSZWN0LndpZHRoKCkgLSB2ZXJ0aWNhbE92ZXJoYW5nUmVjdC53 aWR0aCgpKTsKICAgICAgICAgICAgIGlmIChzY3JvbGxPZmZzZXQud2lkdGgoKSA8IDApIHsKICAg ICAgICAgICAgICAgICBzaGFkb3dSZWN0LnNldFgoc2hhZG93UmVjdC54KCkgKyB2ZXJ0aWNhbE92 ZXJoYW5nUmVjdC53aWR0aCgpKTsKQEAgLTczMywzOSArNzQ1LDU3IEBAIHZvaWQgU2Nyb2xsYmFy VGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRPdmUKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAg ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwga051bVNoYWRvd0NvbG9yczsgaSsrKQotICAg ICAgICAgIGdyYWRpZW50LT5hZGRDb2xvclN0b3Aoa1NoYWRvd0NvbG9yc1tpXS5zdG9wLCBrU2hh ZG93Q29sb3JzW2ldLmNvbG9yKTsKKyAgICAgICAgICAgIGdyYWRpZW50LT5hZGRDb2xvclN0b3Ao a1NoYWRvd0NvbG9yc1tpXS5zdG9wLCBrU2hhZG93Q29sb3JzW2ldLmNvbG9yKTsKICAgICAgICAg Y29udGV4dC0+c2V0RmlsbEdyYWRpZW50KGdyYWRpZW50KTsKICAgICAgICAgY29udGV4dC0+Zmls bFJlY3QoaW50ZXJzZWN0aW9uKHNoYWRvd1JlY3QsIGRpcnR5UmVjdCkpOworCisgICAgICAgIC8v IERyYXcgYSBkcm9wLXNoYWRvdyBmcm9tIHRoZSB0b29sYmFyLgorICAgICAgICBpZiAoc2Nyb2xs T2Zmc2V0LmhlaWdodCgpIDwgMCkgeworICAgICAgICAgICAgc2hhZG93UmVjdC5zZXRZKGtUb29s YmFyU2hhZG93T2Zmc2V0KTsKKyAgICAgICAgICAgIHNoYWRvd1JlY3Quc2V0SGVpZ2h0KHRvb2xi YXJTaGFkb3dIZWlnaHQpOworICAgICAgICAgICAgZ3JhZGllbnQgPSBHcmFkaWVudDo6Y3JlYXRl KEZsb2F0UG9pbnQoMCwgc2hhZG93UmVjdC55KCkpLCBGbG9hdFBvaW50KDAsIHNoYWRvd1JlY3Qu eSgpICsga1NoYWRvd1NpemUpKTsKKyAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBrTnVtU2hhZG93Q29sb3JzOyBpKyspCisgICAgICAgICAgICAgICAgZ3JhZGllbnQtPmFkZENv bG9yU3RvcChrU2hhZG93Q29sb3JzW2ldLnN0b3AsIGtTaGFkb3dDb2xvcnNbaV0uY29sb3IpOwor ICAgICAgICAgICAgY29udGV4dC0+c2V0RmlsbEdyYWRpZW50KGdyYWRpZW50KTsKKyAgICAgICAg ICAgIGNvbnRleHQtPmZpbGxSZWN0KGludGVyc2VjdGlvbihzaGFkb3dSZWN0LCBkaXJ0eVJlY3Qp KTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIERyYXcgdGhlIHNoYWRvdyBmb3IgdGhlIHZl cnRpY2FsIG92ZXJoYW5nLgogICAgIGlmIChoYXNWZXJ0aWNhbE92ZXJoYW5nKSB7CiAgICAgICAg IFJlZlB0cjxHcmFkaWVudD4gZ3JhZGllbnQ7CiAgICAgICAgIEludFJlY3Qgc2hhZG93UmVjdCA9 IHZlcnRpY2FsT3ZlcmhhbmdSZWN0OworICAgICAgICBzaGFkb3dSZWN0LnNldFdpZHRoKGtTaGFk b3dTaXplKTsKICAgICAgICAgaWYgKHNjcm9sbE9mZnNldC53aWR0aCgpIDwgMCkgewotICAgICAg ICAgICAgc2hhZG93UmVjdC5zZXRYKHNoYWRvd1JlY3QubWF4WCgpIC0ga1NoYWRvd1NpemUpOwot ICAgICAgICAgICAgc2hhZG93UmVjdC5zZXRXaWR0aChrU2hhZG93U2l6ZSk7CisgICAgICAgICAg ICBzaGFkb3dSZWN0LnNldFgodmVydGljYWxPdmVyaGFuZ1JlY3QubWF4WCgpIC0gc2hhZG93UmVj dC53aWR0aCgpKTsKICAgICAgICAgICAgIGdyYWRpZW50ID0gR3JhZGllbnQ6OmNyZWF0ZShGbG9h dFBvaW50KHNoYWRvd1JlY3QubWF4WCgpLCAwKSwgRmxvYXRQb2ludChzaGFkb3dSZWN0LngoKSwg MCkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgc2hhZG93UmVjdC5zZXRXaWR0aChr U2hhZG93U2l6ZSk7CiAgICAgICAgICAgICBncmFkaWVudCA9IEdyYWRpZW50OjpjcmVhdGUoRmxv YXRQb2ludChzaGFkb3dSZWN0LngoKSwgMCksIEZsb2F0UG9pbnQoc2hhZG93UmVjdC5tYXhYKCks IDApKTsKICAgICAgICAgfQogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwga051bVNo YWRvd0NvbG9yczsgaSsrKQotICAgICAgICAgIGdyYWRpZW50LT5hZGRDb2xvclN0b3Aoa1NoYWRv d0NvbG9yc1tpXS5zdG9wLCBrU2hhZG93Q29sb3JzW2ldLmNvbG9yKTsKKyAgICAgICAgICAgIGdy YWRpZW50LT5hZGRDb2xvclN0b3Aoa1NoYWRvd0NvbG9yc1tpXS5zdG9wLCBrU2hhZG93Q29sb3Jz W2ldLmNvbG9yKTsKKyAgICAgICAgY29udGV4dC0+c2V0RmlsbEdyYWRpZW50KGdyYWRpZW50KTsK KyAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QoaW50ZXJzZWN0aW9uKHNoYWRvd1JlY3QsIGRpcnR5 UmVjdCkpOworCisgICAgICAgIC8vIERyYXcgYSBkcm9wLXNoYWRvdyBmcm9tIHRoZSB0b29sYmFy LgorICAgICAgICBzaGFkb3dSZWN0ID0gdmVydGljYWxPdmVyaGFuZ1JlY3Q7CisgICAgICAgIHNo YWRvd1JlY3Quc2V0WShrVG9vbGJhclNoYWRvd09mZnNldCk7CisgICAgICAgIHNoYWRvd1JlY3Qu c2V0SGVpZ2h0KGtTaGFkb3dTaXplKTsKKyAgICAgICAgZ3JhZGllbnQgPSBHcmFkaWVudDo6Y3Jl YXRlKEZsb2F0UG9pbnQoMCwgc2hhZG93UmVjdC55KCkpLCBGbG9hdFBvaW50KDAsIHNoYWRvd1Jl Y3QubWF4WSgpKSk7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBrTnVtU2hhZG93 Q29sb3JzOyBpKyspCisgICAgICAgICAgICBncmFkaWVudC0+YWRkQ29sb3JTdG9wKGtTaGFkb3dD b2xvcnNbaV0uc3RvcCwga1NoYWRvd0NvbG9yc1tpXS5jb2xvcik7CiAgICAgICAgIGNvbnRleHQt PnNldEZpbGxHcmFkaWVudChncmFkaWVudCk7CiAgICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KGlu dGVyc2VjdGlvbihzaGFkb3dSZWN0LCBkaXJ0eVJlY3QpKTsKICAgICB9CiAKICAgICAvLyBJZiBi b3RoIHJlY3RhbmdsZXMgcHJlc2VudCwgZHJhdyBhIHJhZGlhbCBncmFkaWVudCBmb3IgdGhlIGNv cm5lci4KICAgICBpZiAoaGFzSG9yaXpvbnRhbE92ZXJoYW5nICYmIGhhc1ZlcnRpY2FsT3Zlcmhh bmcpIHsKLSAgICAgIFJlZlB0cjxHcmFkaWVudD4gZ3JhZGllbnQgPSBHcmFkaWVudDo6Y3JlYXRl KHNoYWRvd0Nvcm5lck9yaWdpbiwgMCwgc2hhZG93Q29ybmVyT3JpZ2luLCBrU2hhZG93U2l6ZSk7 Ci0gICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwga051bVNoYWRvd0NvbG9yczsgaSsrKQot ICAgICAgICBncmFkaWVudC0+YWRkQ29sb3JTdG9wKGtTaGFkb3dDb2xvcnNbaV0uc3RvcCwga1No YWRvd0NvbG9yc1tpXS5jb2xvcik7Ci0gICAgICBjb250ZXh0LT5zZXRGaWxsR3JhZGllbnQoZ3Jh ZGllbnQpOwotICAgICAgY29udGV4dC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHNoYWRvd0Nvcm5lck9y aWdpbi54KCkgKyBzaGFkb3dDb3JuZXJPZmZzZXQueCgpLCBzaGFkb3dDb3JuZXJPcmlnaW4ueSgp ICsgc2hhZG93Q29ybmVyT2Zmc2V0LnkoKSwga1NoYWRvd1NpemUsIGtTaGFkb3dTaXplKSk7Cisg ICAgICAgIFJlZlB0cjxHcmFkaWVudD4gZ3JhZGllbnQgPSBHcmFkaWVudDo6Y3JlYXRlKHNoYWRv d0Nvcm5lck9yaWdpbiwgMCwgc2hhZG93Q29ybmVyT3JpZ2luLCBrU2hhZG93U2l6ZSk7CisgICAg ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBrTnVtU2hhZG93Q29sb3JzOyBpKyspCisgICAg ICAgICAgICBncmFkaWVudC0+YWRkQ29sb3JTdG9wKGtTaGFkb3dDb2xvcnNbaV0uc3RvcCwga1No YWRvd0NvbG9yc1tpXS5jb2xvcik7CisgICAgICAgIGNvbnRleHQtPnNldEZpbGxHcmFkaWVudChn cmFkaWVudCk7CisgICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KEZsb2F0UmVjdChzaGFkb3dDb3Ju ZXJPcmlnaW4ueCgpICsgc2hhZG93Q29ybmVyT2Zmc2V0LngoKSwgc2hhZG93Q29ybmVyT3JpZ2lu LnkoKSArIHNoYWRvd0Nvcm5lck9mZnNldC55KCksIGtTaGFkb3dTaXplLCBrU2hhZG93U2l6ZSkp OwogICAgIH0KLQotICAgIGNvbnRleHQtPnJlc3RvcmUoKTsKIH0KIAogCg==