35449 2010-02-26 14:03:52 -0800 Add ability to hide WebFrame scrollbars and to allow scrollbars to overlap with content. 2010-03-07 15:14:02 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED P2 Normal --- 0 jingidy+wk webkit-unassigned commit-queue eric oldest_to_newest 194274 0 jingidy+wk 2010-02-26 14:03:52 -0800 Add ability to set whether scrollbars overlap WebFrame document, similar to the overflow: overlay style. Added ability to hide scrollbars on the WebFrame regardless of other scrollbar visibility settings. 194282 1 49637 jingidy+wk 2010-02-26 14:08:00 -0800 Created attachment 49637 Patch 194287 2 49637 timothy 2010-02-26 14:16:40 -0800 Comment on attachment 49637 Patch > + frame.size.height = (allowScrollersToOverlapContent ? NSMaxY([[self horizontalScroller] frame]) > + : NSMinY([[self horizontalScroller] frame])); > + frame.size.width = (allowScrollersToOverlapContent ? NSMaxX([[self verticalScroller] frame]) > + : NSMinX([[self verticalScroller] frame])); Just put those on one line. You are not saving much space. > + [[self window] disableFlushWindow]; > + [super tile]; > + [[self contentView] setFrame:[self contentViewFrame]]; > + [[self window] enableFlushWindow]; I don't think you need disableFlushWindow here. I don't think tile will display and flush. > + if (allowScrollersToOverlapContent) > + [self setDrawsBackground:NO]; Does this need set back to the previous value if allowScrollersToOverlapContent becomes NO again? 194311 3 jingidy+wk 2010-02-26 14:35:44 -0800 > > + if (allowScrollersToOverlapContent) > > + [self setDrawsBackground:NO]; > > Does this need set back to the previous value if allowScrollersToOverlapContent > becomes NO again? Nope , drawsBackground gets set else-where before -reflectScrolledClipView is called. 194320 4 49650 jingidy+wk 2010-02-26 14:46:05 -0800 Created attachment 49650 Patch Revised according to Tim's comments. 194468 5 49677 jingidy+wk 2010-02-26 23:44:06 -0800 Created attachment 49677 Move to WebFramePrivate Patch Moved implementation to WebFramePrivate. 194472 6 49677 commit-queue 2010-02-27 00:10:55 -0800 Comment on attachment 49677 Move to WebFramePrivate Patch Clearing flags on attachment: 49677 Committed r55349: <http://trac.webkit.org/changeset/55349> 196634 7 49637 commit-queue 2010-03-05 14:02:28 -0800 Comment on attachment 49637 Patch Cleared Timothy Hatcher's review+ from obsolete attachment 49637 so that this bug does not appear in http://webkit.org/pending-commit. 196797 8 eric 2010-03-05 16:35:38 -0800 Does this still need landing, or can it be closed? 197037 9 jingidy+wk 2010-03-07 15:14:02 -0800 It's landed. 49637 2010-02-26 14:08:00 -0800 2010-03-05 14:02:28 -0800 Patch webkitScrollbar.patch text/plain 10940 jingidy+wk SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NTI5OCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTAtMDItMjYgIEppbmcgSmluICA8amppbkBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkZWQgYWJpbGl0eSB0byBzZXQgd2hldGhlciBzY3JvbGxiYXJzIG92ZXJsYXAgV2ViRnJhbWUg ZG9jdW1lbnQsCisgICAgICAgIHNpbWlsYXIgdG8gdGhlIG92ZXJmbG93OiBvdmVybGF5IHN0eWxl LiBBZGRlZCBhYmlsaXR5IHRvIGhpZGUKKyAgICAgICAgc2Nyb2xsYmFycyBvbiB0aGUgV2ViRnJh bWUgcmVnYXJkbGVzcyBvZiBvdGhlciBzY3JvbGxiYXIgdmlzaWJpbGl0eQorICAgICAgICBzZXR0 aW5ncy4KKworICAgICAgICAqIFdlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3Lmg6Cisg ICAgICAgICogV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcubW06CisgICAgICAgICgt W1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBzZXRBbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRl bnQ6XSk6IEFsbG93cyBzY3JvbGxiYXJzIHRvIAorICAgICAgICBvdmVybGFwIHdpdGggdGhlIGRv Y3VtZW50IGFuZCByZS1sYXlvdXRzIHRoZSBkb2N1bWVudC4KKyAgICAgICAgKC1bV2ViRHluYW1p Y1Njcm9sbEJhcnNWaWV3IHNldEFsd2F5c0hpZGVIb3Jpem9udGFsU2Nyb2xsZXI6XSk6IEhpZGVz IHRoZSBob3Jpem9udGFsIHNjcm9sbGJhci4KKyAgICAgICAgKC1bV2ViRHluYW1pY1Njcm9sbEJh cnNWaWV3IHNldEFsd2F5c0hpZGVWZXJ0aWNhbFNjcm9sbGVyOl0pOiBIaWRlcyB0aGUgdmVydGlj YWwgc2Nyb2xsYmFyLgorICAgICAgICAoLVtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgY29udGVu dFZpZXdGcmFtZV0pOiBDYWxjdWxhdGVzIHRoZSBhcHByb3ByaWF0ZSBmcmFtZSBiYXNlZAorICAg ICAgICBvbiBhbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQuCisgICAgICAgICgtW1dlYkR5 bmFtaWNTY3JvbGxCYXJzVmlldyB0aWxlXSk6IElmIGFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29u dGVudCBpcyBZRVMsIHNldCB0aGUKKyAgICAgICAgY29udGVudFZpZXcncyBmcmFtZSBzbyBpdCBv dmVybGFwcyB3aXRoIHRoZSBzY3JvbGxiYXIuCisgICAgICAgICgtW1dlYkR5bmFtaWNTY3JvbGxC YXJzVmlldyB1cGRhdGVTY3JvbGxlcnNdKTogVGFrZSBpbnRvIGFjY291bnQgaGlkZUhvcml6b250 YWxTY3JvbGxlcgorICAgICAgICBhbmQgaGlkZVZlcnRpY2FsU2Nyb2xsZXIuCisgICAgICAgICgt W1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyByZWZsZWN0U2Nyb2xsZWRDbGlwVmlldzpdKTogc2V0 IGRyYXdzQmFja2dyb3VuZCB0byBOTyB3aGVuCisgICAgICAgIHNjcm9sbGJhcnMgYXJlIG92ZXJs YXBwaW5nIHdpdGggY29udGVudCwgc28gd2UgZG9uJ3QgZ2V0IHRyYWlscyBkdXJpbmcgc2Nyb2xs YmFyIGRyYXcgdXBkYXRlcy4KKyAgICAgICAgKiBXZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJz Vmlld0ludGVybmFsLmg6CisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5oOgorICAgICAgICAq IFdlYlZpZXcvV2ViRnJhbWUubW06CisgICAgICAgICgtW1dlYkZyYW1lIHNldEFsbG93U2Nyb2xs ZXJzVG9PdmVybGFwQ29udGVudDpdKTogSG9vayBmb3IgW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmll dyBzZXRBbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6XQorICAgICAgICAoLVtXZWJGcmFt ZSBzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNjcm9sbGVyOl0pOiBIb29rIGZvciBbV2ViRHluYW1p Y1Njcm9sbEJhcnNWaWV3IHNldEFsd2F5c0hpZGVIb3Jpem9udGFsU2Nyb2xsZXI6XQorICAgICAg ICAoLVtXZWJGcmFtZSBzZXRBbHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjpdKTogSG9vayBmb3Ig W1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBzZXRBbHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjpd CisKIDIwMTAtMDItMjUgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZp ZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9X ZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5oCShyZXZpc2lvbiA1NTI2MSkKKysrIFdl YktpdC9tYWMvV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcuaAkod29ya2luZyBjb3B5 KQpAQCAtMjksOCArMjksNiBAQAogLy8gVGhpcyBpcyBhIFByaXZhdGUgaGVhZGVyIChjb250YWlu aW5nIFNQSSksIGRlc3BpdGUgdGhlIGZhY3QgdGhhdCBpdHMgbmFtZQogLy8gZG9lcyBub3QgY29u dGFpbiB0aGUgd29yZCBQcml2YXRlLgogCi0vLyBUaGlzIHdhcyBvbmNlIHVzZWQgYnkgU2FmYXJp LCBidXQgaGFzIG5vdCBiZWVuIGZvciBhIGxvbmcgdGltZS4KLQogLy8gRklYTUU6IDxyZGFyOi8v cHJvYmxlbS81ODk4OTg1PiBNYWlsIGN1cnJlbnRseSBleHBlY3RzIHRoaXMgaGVhZGVyIHRvIGRl ZmluZSBXZWJDb3JlU2Nyb2xsYmFyQWx3YXlzT24uCiBleHRlcm4gY29uc3QgaW50IFdlYkNvcmVT Y3JvbGxiYXJBbHdheXNPbjsKIApAQCAtNDUsOSArNDMsMTcgQEAgZXh0ZXJuIGNvbnN0IGludCBX ZWJDb3JlU2Nyb2xsYmFyQWx3YXlzTwogICAgIEJPT0wgdmVydGljYWxseVBpbm5lZEJ5UHJldmlv dXNXaGVlbEV2ZW50OwogICAgIEJPT0wgaG9yaXpvbnRhbGx5UGlubmVkQnlQcmV2aW91c1doZWVs RXZlbnQ7CiAgICAgdW5zaWduZWQgaW5VcGRhdGVTY3JvbGxlcnNMYXlvdXRQYXNzOworCisgICAg Qk9PTCBhbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ7CisgICAgQk9PTCBoaWRlSG9yaXpv bnRhbFNjcm9sbGVyOworICAgIEJPT0wgaGlkZVZlcnRpY2FsU2Nyb2xsZXI7CiB9CiAKIC8vIFRo aXMgd2FzIG9yaWdpbmFsbHkgYWRkZWQgZm9yIFNhZmFyaSdzIGJlbmVmaXQsIGJ1dCBTYWZhcmkg aGFzIG5vdCB1c2VkIGl0IGZvciBhIGxvbmcgdGltZS4KIC8vIFBlcmhhcHMgaXQgY2FuIGJlIHJl bW92ZWQuCiAtICh2b2lkKXNldEFsbG93c0hvcml6b250YWxTY3JvbGxpbmc6KEJPT0wpZmxhZzsK KworLSAodm9pZClzZXRBbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6KEJPT0wpZmxhZzsK Ky0gKHZvaWQpc2V0QWx3YXlzSGlkZUhvcml6b250YWxTY3JvbGxlcjooQk9PTClmbGFnOworLSAo dm9pZClzZXRBbHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjooQk9PTClmbGFnOwogQGVuZApJbmRl eDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3Lm1tCShy ZXZpc2lvbiA1NTI2MSkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFy c1ZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTU0LDEwICs1NCw2OCBAQCBjb25zdCBpbnQgV2Vi Q29yZVNjcm9sbGJhckFsd2F5c09uID0gU2NyCiAgICAgW3NlbGYgdXBkYXRlU2Nyb2xsZXJzXTsK IH0KIAorLSAodm9pZClzZXRBbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6KEJPT0wpZmxh ZworeworICAgIGlmIChhbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQgPT0gZmxhZykKKyAg ICAgICAgcmV0dXJuOworICAgICAgICAKKyAgICBhbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRl bnQgPSBmbGFnOworICAgIAorICAgIFtbc2VsZiBjb250ZW50Vmlld10gc2V0RnJhbWU6W3NlbGYg Y29udGVudFZpZXdGcmFtZV1dOworICAgIFtbc2VsZiBkb2N1bWVudFZpZXddIHNldE5lZWRzTGF5 b3V0OllFU107CisgICAgW1tzZWxmIGRvY3VtZW50Vmlld10gbGF5b3V0XTsKK30KKworLSAodm9p ZClzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNjcm9sbGVyOihCT09MKXNob3VsZEJlVmlzaWJsZQor eworICAgIGlmIChoaWRlSG9yaXpvbnRhbFNjcm9sbGVyID09IHNob3VsZEJlVmlzaWJsZSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgaGlkZUhvcml6b250YWxTY3JvbGxlciA9IHNob3VsZEJlVmlz aWJsZTsKKyAgICBbc2VsZiB1cGRhdGVTY3JvbGxlcnNdOworfQorCistICh2b2lkKXNldEFsd2F5 c0hpZGVWZXJ0aWNhbFNjcm9sbGVyOihCT09MKXNob3VsZEJlVmlzaWJsZQoreworICAgIGlmICho aWRlVmVydGljYWxTY3JvbGxlciA9PSBzaG91bGRCZVZpc2libGUpCisgICAgICAgIHJldHVybjsK KyAgICAgICAgCisgICAgaGlkZVZlcnRpY2FsU2Nyb2xsZXIgPSBzaG91bGRCZVZpc2libGU7Cisg ICAgW3NlbGYgdXBkYXRlU2Nyb2xsZXJzXTsKK30KKwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24g V2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3IChXZWJJbnRlcm5hbCkKIAorLSAoTlNSZWN0KWNvbnRl bnRWaWV3RnJhbWUKK3sKKyAgICBOU1JlY3QgZnJhbWUgPSBbW3NlbGYgY29udGVudFZpZXddIGZy YW1lXTsKKyAgICAKKyAgICBpZiAoW3NlbGYgaGFzSG9yaXpvbnRhbFNjcm9sbGVyXSkKKyAgICAg ICAgZnJhbWUuc2l6ZS5oZWlnaHQgPSAoYWxsb3dTY3JvbGxlcnNUb092ZXJsYXBDb250ZW50ID8g TlNNYXhZKFtbc2VsZiBob3Jpem9udGFsU2Nyb2xsZXJdIGZyYW1lXSkgCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgOiBOU01pblkoW1tzZWxmIGhvcml6b250YWxTY3JvbGxlcl0gZnJhbWVdKSk7CisgICAgaWYg KFtzZWxmIGhhc1ZlcnRpY2FsU2Nyb2xsZXJdKQorICAgICAgICBmcmFtZS5zaXplLndpZHRoID0g KGFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudCA/IE5TTWF4WChbW3NlbGYgdmVydGljYWxT Y3JvbGxlcl0gZnJhbWVdKSAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogTlNNaW5YKFtbc2VsZiB2ZXJ0aWNh bFNjcm9sbGVyXSBmcmFtZV0pKTsKKyAgICByZXR1cm4gZnJhbWU7Cit9CisKKy0gKHZvaWQpdGls ZQoreworICAgIGlmICghYWxsb3dTY3JvbGxlcnNUb092ZXJsYXBDb250ZW50KSB7CisgICAgICAg IFtzdXBlciB0aWxlXTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICAKKyAgICAvLyBbc3Vw ZXIgdGlsZV0gc2V0cyB0aGUgY29udGVudFZpZXcgc2l6ZSBzbyB0aGF0IGl0IGRvZXMgbm90IG92 ZXJsYXAgd2l0aCB0aGUgc2Nyb2xsZXJzLAorICAgIC8vIHdlIHdhbnQgdG8gcmUtc2V0IHRoZSBj b250ZW50VmlldyB0byBvdmVybGFwIHNjcm9sbGVycyBiZWZvcmUgZGlzcGxheWluZy4KKyAgICBb W3NlbGYgd2luZG93XSBkaXNhYmxlRmx1c2hXaW5kb3ddOworICAgIFtzdXBlciB0aWxlXTsKKyAg ICBbW3NlbGYgY29udGVudFZpZXddIHNldEZyYW1lOltzZWxmIGNvbnRlbnRWaWV3RnJhbWVdXTsK KyAgICBbW3NlbGYgd2luZG93XSBlbmFibGVGbHVzaFdpbmRvd107Cit9CisKIC0gKHZvaWQpc2V0 U3VwcHJlc3NMYXlvdXQ6KEJPT0wpZmxhZzsKIHsKICAgICBzdXBwcmVzc0xheW91dCA9IGZsYWc7 CkBAIC0xMTIsMTIgKzE3MCwxNSBAQCBzdGF0aWMgY29uc3QgdW5zaWduZWQgY01heFVwZGF0ZVNj cm9sbGJhCiAgICAgaWYgKCFkb2N1bWVudFZpZXcpIHsKICAgICAgICAgbmV3SGFzSG9yaXpvbnRh bFNjcm9sbGVyID0gTk87CiAgICAgICAgIG5ld0hhc1ZlcnRpY2FsU2Nyb2xsZXIgPSBOTzsKLSAg ICB9IAorICAgIH0KIAogICAgIGlmIChoU2Nyb2xsICE9IFNjcm9sbGJhckF1dG8pCiAgICAgICAg IG5ld0hhc0hvcml6b250YWxTY3JvbGxlciA9IChoU2Nyb2xsID09IFNjcm9sbGJhckFsd2F5c09u KTsKICAgICBpZiAodlNjcm9sbCAhPSBTY3JvbGxiYXJBdXRvKQogICAgICAgICBuZXdIYXNWZXJ0 aWNhbFNjcm9sbGVyID0gKHZTY3JvbGwgPT0gU2Nyb2xsYmFyQWx3YXlzT24pOworICAgICAgICAK KyAgICBuZXdIYXNIb3Jpem9udGFsU2Nyb2xsZXIgJj0gIWhpZGVIb3Jpem9udGFsU2Nyb2xsZXI7 CisgICAgbmV3SGFzVmVydGljYWxTY3JvbGxlciAmPSAhaGlkZVZlcnRpY2FsU2Nyb2xsZXI7CiAg ICAgCiAgICAgaWYgKCFkb2N1bWVudFZpZXcgfHwgc3VwcHJlc3NMYXlvdXQgfHwgc3VwcHJlc3NT Y3JvbGxlcnMgfHwgKGhTY3JvbGwgIT0gU2Nyb2xsYmFyQXV0byAmJiB2U2Nyb2xsICE9IFNjcm9s bGJhckF1dG8pKSB7CiAgICAgICAgIGluVXBkYXRlU2Nyb2xsZXJzID0gWUVTOwpAQCAtMTU4LDYg KzIxOSw5IEBAIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBjTWF4VXBkYXRlU2Nyb2xsYmEKICAgICBp ZiAoIW5ld0hhc1ZlcnRpY2FsU2Nyb2xsZXIgJiYgaGFzVmVydGljYWxTY3JvbGxlciAmJiBoU2Ny b2xsICE9IFNjcm9sbGJhckFsd2F5c09uKQogICAgICAgICBuZXdIYXNIb3Jpem9udGFsU2Nyb2xs ZXIgPSBOTzsKIAorICAgIG5ld0hhc0hvcml6b250YWxTY3JvbGxlciAmPSAhaGlkZUhvcml6b250 YWxTY3JvbGxlcjsKKyAgICBuZXdIYXNWZXJ0aWNhbFNjcm9sbGVyICY9ICFoaWRlVmVydGljYWxT Y3JvbGxlcjsKKwogICAgIGlmIChoYXNIb3Jpem9udGFsU2Nyb2xsZXIgIT0gbmV3SGFzSG9yaXpv bnRhbFNjcm9sbGVyKSB7CiAgICAgICAgIGluVXBkYXRlU2Nyb2xsZXJzID0gWUVTOwogICAgICAg ICBbc2VsZiBzZXRIYXNIb3Jpem9udGFsU2Nyb2xsZXI6bmV3SGFzSG9yaXpvbnRhbFNjcm9sbGVy XTsKQEAgLTE5Miw2ICsyNTYsMTAgQEAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGNNYXhVcGRhdGVT Y3JvbGxiYQogLSAodm9pZClyZWZsZWN0U2Nyb2xsZWRDbGlwVmlldzooTlNDbGlwVmlldyAqKWNs aXBWaWV3CiB7CiAgICAgaWYgKGNsaXBWaWV3ID09IFtzZWxmIGNvbnRlbnRWaWV3XSkgeworICAg ICAgICAvLyBQcmV2ZW50IGFwcGVhcmFuY2Ugb2YgdHJhaWxzIGJlY2F1c2Ugb2Ygb3ZlcmxhcHBp bmcgdmlld3MKKyAgICAgICAgaWYgKGFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudCkKKyAg ICAgICAgICAgIFtzZWxmIHNldERyYXdzQmFja2dyb3VuZDpOT107CisgICAgCiAgICAgICAgIC8v IEZJWE1FOiBUaGlzIGhhY2sgaGVyZSBwcmV2ZW50cyBpbmZpbml0ZSByZWN1cnNpb24gdGhhdCB0 YWtlcyBwbGFjZSB3aGVuIHdlCiAgICAgICAgIC8vIGd5cmF0ZSBiZXR3ZWVuIGhhdmluZyBhIHZl cnRpY2FsIHNjcm9sbGVyIGFuZCBub3QgaGF2aW5nIG9uZS4gQSByZXByb2R1Y2libGUKICAgICAg ICAgLy8gY2FzZSBpcyBjbGlja2luZyBvbiB0aGUgInRoZSBQb2xpY3kgUm91dGluZyB0ZXh0IiBs aW5rIGF0CkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3 SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Nj cm9sbEJhcnNWaWV3SW50ZXJuYWwuaAkocmV2aXNpb24gNTUyNjEpCisrKyBXZWJLaXQvbWFjL1dl YlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3SW50ZXJuYWwuaAkod29ya2luZyBjb3B5KQpA QCAtNTMsNCArNTMsNiBAQAogLSAodm9pZCl1cGRhdGVTY3JvbGxlcnM7CiAtICh2b2lkKXNldFN1 cHByZXNzTGF5b3V0OihCT09MKWZsYWc7CiAKKy8vIENhbGN1bGF0ZSB0aGUgYXBwcm9wcmlhdGUg ZnJhbWUgZm9yIHRoZSBjb250ZW50VmlldyBiYXNlZCBvbiBhbGxvd3NTY3JvbGxlcnNUb092ZXJs YXBDb250ZW50LgorLSAoTlNSZWN0KWNvbnRlbnRWaWV3RnJhbWU7CiBAZW5kCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZp ZXcvV2ViRnJhbWUuaAkocmV2aXNpb24gNTUyNjEpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2Vi RnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMjE0LDQgKzIxNCwyOSBAQAogKi8KIC0gKEpTR2xv YmFsQ29udGV4dFJlZilnbG9iYWxDb250ZXh0OwogCisvKiEKKyAgICBAbWV0aG9kIHNldEFsbG93 U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDoKKyAgICBAZGlzY3Vzc2lvbiBUaGlzIG1ldGhvZCBz ZXRzIHdoZXRoZXIgdGhlIHNjcm9sbGJhcnMsIGlmIGFueSwgc2hvdWxkIGJlIHNob3duIGluc2lk ZQorICAgIHRoZSBkb2N1bWVudCdzIGJvcmRlciAodGh1cyBvdmVybGFwcGluZyBzb21lIGNvbnRl bnQpIG9yIG91dHNpZGUgdGhlIHdlYlZpZXcncyBib3JkZXIgCisgICAgKGRlZmF1bHQgYmVoYXZp b3IpLiBDaGFuZ2luZyB0aGlzIGZsYWcgY2hhbmdlcyB0aGUgc2l6ZSBvZiB0aGUgY29udGVudFZp ZXcgYW5kIG1haW50YWlucworICAgIHRoZSBzaXplIG9mIHRoZSBmcmFtZVZpZXcuCisgICAgQHBh cmFtIGZsYWcgWUVTIHRvIGFsbG93IHNjcm9sbGVycyB0byBvdmVybGFwIGNvbnRlbnQsIE5PIG90 aGVyd2lzZS4KKyovCistICh2b2lkKXNldEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDoo Qk9PTClmbGFnOworCisvKiEKKyAgICBAbWV0aG9kIHNldEFsd2F5c0hpZGVIb3Jpem9udGFsU2Ny b2xsZXI6CisgICAgQGRpc2N1c3Npb24gVGhpcyBtZXRob2Qgc2V0cyBpZiB0aGUgaG9yaXpvbnRh bCBzY3JvbGxiYXIgaXMgYWx3YXlzIGhpZGRlbiwgcmVnYXJkbGVzcyBvZgorICAgIG90aGVyIHNj cm9sbGJhciB2aXNpYmlsaXR5IHNldHRpbmdzLiBUaGlzIGRvZXMgbm90IGFmZmVjdCB0aGUgc2Ny b2xsYWJpbGl0eSBvZiB0aGUgZG9jdW1lbnQuCisgICAgQHBhcmFtIGZsYWcgWUVTIHRvIGFsd2F5 cyBoaWRlIHRoZSBob3Jpem9udGFsIHNjcm9sbGVyLCBOTyBvdGhlcndpc2UuCisqLworLSAodm9p ZClzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNjcm9sbGVyOihCT09MKWZsYWc7CisKKy8qIQorICAg IEBtZXRob2Qgc2V0QWx3YXlzSGlkZVZlcnRpY2FsU2Nyb2xsZXI6CisgICAgQGRpc2N1c3Npb24g VGhpcyBtZXRob2Qgc2V0cyBpZiB0aGUgdmVydGljYWwgc2Nyb2xsYmFyIGlzIGFsd2F5cyBoaWRk ZW4sIHJlZ2FyZGxlc3Mgb2YKKyAgICBvdGhlciBzY3JvbGxiYXIgdmlzaWJpbGl0eSBzZXR0aW5n cy4gVGhpcyBkb2VzIG5vdCBhZmZlY3QgdGhlIHNjcm9sbGFiaWxpdHkgb2YgdGhlIGRvY3VtZW50 LgorICAgIEBwYXJhbSBmbGFnIFlFUyB0byBhbHdheXMgaGlkZSB0aGUgdmVydGljYWwgc2Nyb2xs ZXIsIE5PIG90aGVyd2lzZS4KKyovCistICh2b2lkKXNldEFsd2F5c0hpZGVWZXJ0aWNhbFNjcm9s bGVyOihCT09MKWZsYWc7CiBAZW5kCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCShyZXZpc2lv biA1NTI2MSkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQkod29ya2luZyBjb3B5 KQpAQCAtMzksNiArMzksNyBAQAogI2ltcG9ydCAiV2ViQ2hyb21lQ2xpZW50LmgiCiAjaW1wb3J0 ICJXZWJEYXRhU291cmNlSW50ZXJuYWwuaCIKICNpbXBvcnQgIldlYkRvY3VtZW50TG9hZGVyTWFj LmgiCisjaW1wb3J0ICJXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcuaCIKICNpbXBvcnQgIldlYkZy YW1lTG9hZGVyQ2xpZW50LmgiCiAjaW1wb3J0ICJXZWJGcmFtZVZpZXdJbnRlcm5hbC5oIgogI2lt cG9ydCAiV2ViSFRNTFZpZXcuaCIKQEAgLTE1MjMsNCArMTUyNCwyMSBAQCBzdGF0aWMgTlNVUkwg KmNyZWF0ZVVuaXF1ZVdlYkRhdGFVUkwoKQogICAgIHJldHVybiB0b0dsb2JhbFJlZihjb3JlRnJh bWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QobWFpblRocmVhZE5vcm1hbFdvcmxkKCkpLT5nbG9i YWxFeGVjKCkpOwogfQogCistICh2b2lkKXNldEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVu dDooQk9PTClmbGFnCit7CisgICAgQVNTRVJUKFtbW3NlbGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmll d10gaXNLaW5kT2ZDbGFzczpbV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3IGNsYXNzXV0pOworICAg IFsoV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3ICopW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZp ZXddIHNldEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDpmbGFnXTsKK30KKworLSAodm9p ZClzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNjcm9sbGVyOihCT09MKWZsYWcKK3sKKyAgICBBU1NF UlQoW1tbc2VsZiBmcmFtZVZpZXddIF9zY3JvbGxWaWV3XSBpc0tpbmRPZkNsYXNzOltXZWJEeW5h bWljU2Nyb2xsQmFyc1ZpZXcgY2xhc3NdXSk7CisgICAgWyhXZWJEeW5hbWljU2Nyb2xsQmFyc1Zp ZXcgKilbW3NlbGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gc2V0QWx3YXlzSGlkZUhvcml6b250 YWxTY3JvbGxlcjpmbGFnXTsKK30KKy0gKHZvaWQpc2V0QWx3YXlzSGlkZVZlcnRpY2FsU2Nyb2xs ZXI6KEJPT0wpZmxhZworeworICAgIEFTU0VSVChbW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZp ZXddIGlzS2luZE9mQ2xhc3M6W1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBjbGFzc11dKTsKKyAg ICBbKFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyAqKVtbc2VsZiBmcmFtZVZpZXddIF9zY3JvbGxW aWV3XSBzZXRBbHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjpmbGFnXTsKK30KKwogQGVuZAo= 49650 2010-02-26 14:46:05 -0800 2010-02-26 16:29:42 -0800 Patch webkitScrollbar.patch text/plain 10571 jingidy+wk SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NTI5OCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTAtMDItMjYgIEppbmcgSmluICA8amppbkBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTQ0OQorICAgICAgICBB ZGQgYWJpbGl0eSB0byBoaWRlIFdlYkZyYW1lIHNjcm9sbGJhcnMgYW5kIHRvIGFsbG93IHNjcm9s bGJhcnMgdG8gb3ZlcmxhcCB3aXRoIGNvbnRlbnQuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkR5 bmFtaWNTY3JvbGxCYXJzVmlldy5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViRHluYW1pY1Njcm9s bEJhcnNWaWV3Lm1tOgorICAgICAgICAoLVtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgc2V0QWxs b3dTY3JvbGxlcnNUb092ZXJsYXBDb250ZW50Ol0pOiBBbGxvd3Mgc2Nyb2xsYmFycyB0byAKKyAg ICAgICAgb3ZlcmxhcCB3aXRoIHRoZSBkb2N1bWVudCBhbmQgcmUtbGF5b3V0cyB0aGUgZG9jdW1l bnQuCisgICAgICAgICgtW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBzZXRBbHdheXNIaWRlSG9y aXpvbnRhbFNjcm9sbGVyOl0pOiBIaWRlcyB0aGUgaG9yaXpvbnRhbCBzY3JvbGxiYXIuCisgICAg ICAgICgtW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBzZXRBbHdheXNIaWRlVmVydGljYWxTY3Jv bGxlcjpdKTogSGlkZXMgdGhlIHZlcnRpY2FsIHNjcm9sbGJhci4KKyAgICAgICAgKC1bV2ViRHlu YW1pY1Njcm9sbEJhcnNWaWV3IGNvbnRlbnRWaWV3RnJhbWVdKTogQ2FsY3VsYXRlcyB0aGUgYXBw cm9wcmlhdGUgZnJhbWUgYmFzZWQKKyAgICAgICAgb24gYWxsb3dTY3JvbGxlcnNUb092ZXJsYXBD b250ZW50LgorICAgICAgICAoLVtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgdGlsZV0pOiBJZiBh bGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQgaXMgWUVTLCBzZXQgdGhlCisgICAgICAgIGNv bnRlbnRWaWV3J3MgZnJhbWUgc28gaXQgb3ZlcmxhcHMgd2l0aCB0aGUgc2Nyb2xsYmFyLgorICAg ICAgICAoLVtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgdXBkYXRlU2Nyb2xsZXJzXSk6IFRha2Ug aW50byBhY2NvdW50IGhpZGVIb3Jpem9udGFsU2Nyb2xsZXIKKyAgICAgICAgYW5kIGhpZGVWZXJ0 aWNhbFNjcm9sbGVyLgorICAgICAgICAoLVtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgcmVmbGVj dFNjcm9sbGVkQ2xpcFZpZXc6XSk6IHNldCBkcmF3c0JhY2tncm91bmQgdG8gTk8gd2hlbgorICAg ICAgICBzY3JvbGxiYXJzIGFyZSBvdmVybGFwcGluZyB3aXRoIGNvbnRlbnQsIHNvIHdlIGRvbid0 IGdldCB0cmFpbHMgZHVyaW5nIHNjcm9sbGJhciBkcmF3IHVwZGF0ZXMuCisgICAgICAgICogV2Vi Vmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXdJbnRlcm5hbC5oOgorICAgICAgICAqIFdlYlZp ZXcvV2ViRnJhbWUuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lLm1tOgorICAgICAgICAo LVtXZWJGcmFtZSBzZXRBbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6XSk6IEhvb2sgZm9y IFtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgc2V0QWxsb3dTY3JvbGxlcnNUb092ZXJsYXBDb250 ZW50Ol0KKyAgICAgICAgKC1bV2ViRnJhbWUgc2V0QWx3YXlzSGlkZUhvcml6b250YWxTY3JvbGxl cjpdKTogSG9vayBmb3IgW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBzZXRBbHdheXNIaWRlSG9y aXpvbnRhbFNjcm9sbGVyOl0KKyAgICAgICAgKC1bV2ViRnJhbWUgc2V0QWx3YXlzSGlkZVZlcnRp Y2FsU2Nyb2xsZXI6XSk6IEhvb2sgZm9yIFtXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgc2V0QWx3 YXlzSGlkZVZlcnRpY2FsU2Nyb2xsZXI6XQorCiAyMDEwLTAyLTI1ICBBbGV4ZXkgUHJvc2t1cnlh a292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVu LgpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcu aAkocmV2aXNpb24gNTUyNjEpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9s bEJhcnNWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDggKzI5LDYgQEAKIC8vIFRoaXMgaXMg YSBQcml2YXRlIGhlYWRlciAoY29udGFpbmluZyBTUEkpLCBkZXNwaXRlIHRoZSBmYWN0IHRoYXQg aXRzIG5hbWUKIC8vIGRvZXMgbm90IGNvbnRhaW4gdGhlIHdvcmQgUHJpdmF0ZS4KIAotLy8gVGhp cyB3YXMgb25jZSB1c2VkIGJ5IFNhZmFyaSwgYnV0IGhhcyBub3QgYmVlbiBmb3IgYSBsb25nIHRp bWUuCi0KIC8vIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vNTg5ODk4NT4gTWFpbCBjdXJyZW50bHkg ZXhwZWN0cyB0aGlzIGhlYWRlciB0byBkZWZpbmUgV2ViQ29yZVNjcm9sbGJhckFsd2F5c09uLgog ZXh0ZXJuIGNvbnN0IGludCBXZWJDb3JlU2Nyb2xsYmFyQWx3YXlzT247CiAKQEAgLTQ1LDkgKzQz LDE3IEBAIGV4dGVybiBjb25zdCBpbnQgV2ViQ29yZVNjcm9sbGJhckFsd2F5c08KICAgICBCT09M IHZlcnRpY2FsbHlQaW5uZWRCeVByZXZpb3VzV2hlZWxFdmVudDsKICAgICBCT09MIGhvcml6b250 YWxseVBpbm5lZEJ5UHJldmlvdXNXaGVlbEV2ZW50OwogICAgIHVuc2lnbmVkIGluVXBkYXRlU2Ny b2xsZXJzTGF5b3V0UGFzczsKKworICAgIEJPT0wgYWxsb3dTY3JvbGxlcnNUb092ZXJsYXBDb250 ZW50OworICAgIEJPT0wgaGlkZUhvcml6b250YWxTY3JvbGxlcjsKKyAgICBCT09MIGhpZGVWZXJ0 aWNhbFNjcm9sbGVyOwogfQogCiAvLyBUaGlzIHdhcyBvcmlnaW5hbGx5IGFkZGVkIGZvciBTYWZh cmkncyBiZW5lZml0LCBidXQgU2FmYXJpIGhhcyBub3QgdXNlZCBpdCBmb3IgYSBsb25nIHRpbWUu CiAvLyBQZXJoYXBzIGl0IGNhbiBiZSByZW1vdmVkLgogLSAodm9pZClzZXRBbGxvd3NIb3Jpem9u dGFsU2Nyb2xsaW5nOihCT09MKWZsYWc7CisKKy0gKHZvaWQpc2V0QWxsb3dTY3JvbGxlcnNUb092 ZXJsYXBDb250ZW50OihCT09MKWZsYWc7CistICh2b2lkKXNldEFsd2F5c0hpZGVIb3Jpem9udGFs U2Nyb2xsZXI6KEJPT0wpZmxhZzsKKy0gKHZvaWQpc2V0QWx3YXlzSGlkZVZlcnRpY2FsU2Nyb2xs ZXI6KEJPT0wpZmxhZzsKIEBlbmQKSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJEeW5hbWlj U2Nyb2xsQmFyc1ZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYkR5 bmFtaWNTY3JvbGxCYXJzVmlldy5tbQkocmV2aXNpb24gNTUyNjEpCisrKyBXZWJLaXQvbWFjL1dl YlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01NCwx MCArNTQsNjEgQEAgY29uc3QgaW50IFdlYkNvcmVTY3JvbGxiYXJBbHdheXNPbiA9IFNjcgogICAg IFtzZWxmIHVwZGF0ZVNjcm9sbGVyc107CiB9CiAKKy0gKHZvaWQpc2V0QWxsb3dTY3JvbGxlcnNU b092ZXJsYXBDb250ZW50OihCT09MKWZsYWcKK3sKKyAgICBpZiAoYWxsb3dTY3JvbGxlcnNUb092 ZXJsYXBDb250ZW50ID09IGZsYWcpCisgICAgICAgIHJldHVybjsKKyAgICAgICAgCisgICAgYWxs b3dTY3JvbGxlcnNUb092ZXJsYXBDb250ZW50ID0gZmxhZzsKKyAgICAKKyAgICBbW3NlbGYgY29u dGVudFZpZXddIHNldEZyYW1lOltzZWxmIGNvbnRlbnRWaWV3RnJhbWVdXTsKKyAgICBbW3NlbGYg ZG9jdW1lbnRWaWV3XSBzZXROZWVkc0xheW91dDpZRVNdOworICAgIFtbc2VsZiBkb2N1bWVudFZp ZXddIGxheW91dF07Cit9CisKKy0gKHZvaWQpc2V0QWx3YXlzSGlkZUhvcml6b250YWxTY3JvbGxl cjooQk9PTClzaG91bGRCZVZpc2libGUKK3sKKyAgICBpZiAoaGlkZUhvcml6b250YWxTY3JvbGxl ciA9PSBzaG91bGRCZVZpc2libGUpCisgICAgICAgIHJldHVybjsKKworICAgIGhpZGVIb3Jpem9u dGFsU2Nyb2xsZXIgPSBzaG91bGRCZVZpc2libGU7CisgICAgW3NlbGYgdXBkYXRlU2Nyb2xsZXJz XTsKK30KKworLSAodm9pZClzZXRBbHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjooQk9PTClzaG91 bGRCZVZpc2libGUKK3sKKyAgICBpZiAoaGlkZVZlcnRpY2FsU2Nyb2xsZXIgPT0gc2hvdWxkQmVW aXNpYmxlKQorICAgICAgICByZXR1cm47CisgICAgICAgIAorICAgIGhpZGVWZXJ0aWNhbFNjcm9s bGVyID0gc2hvdWxkQmVWaXNpYmxlOworICAgIFtzZWxmIHVwZGF0ZVNjcm9sbGVyc107Cit9CisK IEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyAoV2ViSW50 ZXJuYWwpCiAKKy0gKE5TUmVjdCljb250ZW50Vmlld0ZyYW1lCit7CisgICAgTlNSZWN0IGZyYW1l ID0gW1tzZWxmIGNvbnRlbnRWaWV3XSBmcmFtZV07CisgICAgCisgICAgaWYgKFtzZWxmIGhhc0hv cml6b250YWxTY3JvbGxlcl0pCisgICAgICAgIGZyYW1lLnNpemUuaGVpZ2h0ID0gKGFsbG93U2Ny b2xsZXJzVG9PdmVybGFwQ29udGVudCA/IE5TTWF4WShbW3NlbGYgaG9yaXpvbnRhbFNjcm9sbGVy XSBmcmFtZV0pIDogTlNNaW5ZKFtbc2VsZiBob3Jpem9udGFsU2Nyb2xsZXJdIGZyYW1lXSkpOwor ICAgIGlmIChbc2VsZiBoYXNWZXJ0aWNhbFNjcm9sbGVyXSkKKyAgICAgICAgZnJhbWUuc2l6ZS53 aWR0aCA9IChhbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQgPyBOU01heFgoW1tzZWxmIHZl cnRpY2FsU2Nyb2xsZXJdIGZyYW1lXSkgOiBOU01pblgoW1tzZWxmIHZlcnRpY2FsU2Nyb2xsZXJd IGZyYW1lXSkpOworICAgIHJldHVybiBmcmFtZTsKK30KKworLSAodm9pZCl0aWxlCit7CisgICAg W3N1cGVyIHRpbGVdOworCisgICAgLy8gW3N1cGVyIHRpbGVdIHNldHMgdGhlIGNvbnRlbnRWaWV3 IHNpemUgc28gdGhhdCBpdCBkb2VzIG5vdCBvdmVybGFwIHdpdGggdGhlIHNjcm9sbGVycywKKyAg ICAvLyB3ZSB3YW50IHRvIHJlLXNldCB0aGUgY29udGVudFZpZXcgdG8gb3ZlcmxhcCBzY3JvbGxl cnMgYmVmb3JlIGRpc3BsYXlpbmcuCisgICAgaWYgKGFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29u dGVudCkKKyAgICAgICAgW1tzZWxmIGNvbnRlbnRWaWV3XSBzZXRGcmFtZTpbc2VsZiBjb250ZW50 Vmlld0ZyYW1lXV07Cit9CisKIC0gKHZvaWQpc2V0U3VwcHJlc3NMYXlvdXQ6KEJPT0wpZmxhZzsK IHsKICAgICBzdXBwcmVzc0xheW91dCA9IGZsYWc7CkBAIC0xMTIsMTIgKzE2MywxNSBAQCBzdGF0 aWMgY29uc3QgdW5zaWduZWQgY01heFVwZGF0ZVNjcm9sbGJhCiAgICAgaWYgKCFkb2N1bWVudFZp ZXcpIHsKICAgICAgICAgbmV3SGFzSG9yaXpvbnRhbFNjcm9sbGVyID0gTk87CiAgICAgICAgIG5l d0hhc1ZlcnRpY2FsU2Nyb2xsZXIgPSBOTzsKLSAgICB9IAorICAgIH0KIAogICAgIGlmIChoU2Ny b2xsICE9IFNjcm9sbGJhckF1dG8pCiAgICAgICAgIG5ld0hhc0hvcml6b250YWxTY3JvbGxlciA9 IChoU2Nyb2xsID09IFNjcm9sbGJhckFsd2F5c09uKTsKICAgICBpZiAodlNjcm9sbCAhPSBTY3Jv bGxiYXJBdXRvKQogICAgICAgICBuZXdIYXNWZXJ0aWNhbFNjcm9sbGVyID0gKHZTY3JvbGwgPT0g U2Nyb2xsYmFyQWx3YXlzT24pOworICAgICAgICAKKyAgICBuZXdIYXNIb3Jpem9udGFsU2Nyb2xs ZXIgJj0gIWhpZGVIb3Jpem9udGFsU2Nyb2xsZXI7CisgICAgbmV3SGFzVmVydGljYWxTY3JvbGxl ciAmPSAhaGlkZVZlcnRpY2FsU2Nyb2xsZXI7CiAgICAgCiAgICAgaWYgKCFkb2N1bWVudFZpZXcg fHwgc3VwcHJlc3NMYXlvdXQgfHwgc3VwcHJlc3NTY3JvbGxlcnMgfHwgKGhTY3JvbGwgIT0gU2Ny b2xsYmFyQXV0byAmJiB2U2Nyb2xsICE9IFNjcm9sbGJhckF1dG8pKSB7CiAgICAgICAgIGluVXBk YXRlU2Nyb2xsZXJzID0gWUVTOwpAQCAtMTU4LDYgKzIxMiw5IEBAIHN0YXRpYyBjb25zdCB1bnNp Z25lZCBjTWF4VXBkYXRlU2Nyb2xsYmEKICAgICBpZiAoIW5ld0hhc1ZlcnRpY2FsU2Nyb2xsZXIg JiYgaGFzVmVydGljYWxTY3JvbGxlciAmJiBoU2Nyb2xsICE9IFNjcm9sbGJhckFsd2F5c09uKQog ICAgICAgICBuZXdIYXNIb3Jpem9udGFsU2Nyb2xsZXIgPSBOTzsKIAorICAgIG5ld0hhc0hvcml6 b250YWxTY3JvbGxlciAmPSAhaGlkZUhvcml6b250YWxTY3JvbGxlcjsKKyAgICBuZXdIYXNWZXJ0 aWNhbFNjcm9sbGVyICY9ICFoaWRlVmVydGljYWxTY3JvbGxlcjsKKwogICAgIGlmIChoYXNIb3Jp em9udGFsU2Nyb2xsZXIgIT0gbmV3SGFzSG9yaXpvbnRhbFNjcm9sbGVyKSB7CiAgICAgICAgIGlu VXBkYXRlU2Nyb2xsZXJzID0gWUVTOwogICAgICAgICBbc2VsZiBzZXRIYXNIb3Jpem9udGFsU2Ny b2xsZXI6bmV3SGFzSG9yaXpvbnRhbFNjcm9sbGVyXTsKQEAgLTE5Miw2ICsyNDksMTAgQEAgc3Rh dGljIGNvbnN0IHVuc2lnbmVkIGNNYXhVcGRhdGVTY3JvbGxiYQogLSAodm9pZClyZWZsZWN0U2Ny b2xsZWRDbGlwVmlldzooTlNDbGlwVmlldyAqKWNsaXBWaWV3CiB7CiAgICAgaWYgKGNsaXBWaWV3 ID09IFtzZWxmIGNvbnRlbnRWaWV3XSkgeworICAgICAgICAvLyBQcmV2ZW50IGFwcGVhcmFuY2Ug b2YgdHJhaWxzIGJlY2F1c2Ugb2Ygb3ZlcmxhcHBpbmcgdmlld3MKKyAgICAgICAgaWYgKGFsbG93 U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudCkKKyAgICAgICAgICAgIFtzZWxmIHNldERyYXdzQmFj a2dyb3VuZDpOT107CisgICAgCiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGhhY2sgaGVyZSBwcmV2 ZW50cyBpbmZpbml0ZSByZWN1cnNpb24gdGhhdCB0YWtlcyBwbGFjZSB3aGVuIHdlCiAgICAgICAg IC8vIGd5cmF0ZSBiZXR3ZWVuIGhhdmluZyBhIHZlcnRpY2FsIHNjcm9sbGVyIGFuZCBub3QgaGF2 aW5nIG9uZS4gQSByZXByb2R1Y2libGUKICAgICAgICAgLy8gY2FzZSBpcyBjbGlja2luZyBvbiB0 aGUgInRoZSBQb2xpY3kgUm91dGluZyB0ZXh0IiBsaW5rIGF0CkluZGV4OiBXZWJLaXQvbWFjL1dl YlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3SW50ZXJuYWwuaAkocmV2 aXNpb24gNTUyNjEpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNW aWV3SW50ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtNTMsNCArNTMsNiBAQAogLSAodm9pZCl1 cGRhdGVTY3JvbGxlcnM7CiAtICh2b2lkKXNldFN1cHByZXNzTGF5b3V0OihCT09MKWZsYWc7CiAK Ky8vIENhbGN1bGF0ZSB0aGUgYXBwcm9wcmlhdGUgZnJhbWUgZm9yIHRoZSBjb250ZW50VmlldyBi YXNlZCBvbiBhbGxvd3NTY3JvbGxlcnNUb092ZXJsYXBDb250ZW50LgorLSAoTlNSZWN0KWNvbnRl bnRWaWV3RnJhbWU7CiBAZW5kCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUuaAkocmV2aXNpb24gNTUy NjEpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAt MjE0LDQgKzIxNCwyOSBAQAogKi8KIC0gKEpTR2xvYmFsQ29udGV4dFJlZilnbG9iYWxDb250ZXh0 OwogCisvKiEKKyAgICBAbWV0aG9kIHNldEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDoK KyAgICBAZGlzY3Vzc2lvbiBUaGlzIG1ldGhvZCBzZXRzIHdoZXRoZXIgdGhlIHNjcm9sbGJhcnMs IGlmIGFueSwgc2hvdWxkIGJlIHNob3duIGluc2lkZQorICAgIHRoZSBkb2N1bWVudCdzIGJvcmRl ciAodGh1cyBvdmVybGFwcGluZyBzb21lIGNvbnRlbnQpIG9yIG91dHNpZGUgdGhlIHdlYlZpZXcn cyBib3JkZXIgCisgICAgKGRlZmF1bHQgYmVoYXZpb3IpLiBDaGFuZ2luZyB0aGlzIGZsYWcgY2hh bmdlcyB0aGUgc2l6ZSBvZiB0aGUgY29udGVudFZpZXcgYW5kIG1haW50YWlucworICAgIHRoZSBz aXplIG9mIHRoZSBmcmFtZVZpZXcuCisgICAgQHBhcmFtIGZsYWcgWUVTIHRvIGFsbG93IHNjcm9s bGVycyB0byBvdmVybGFwIGNvbnRlbnQsIE5PIG90aGVyd2lzZS4KKyovCistICh2b2lkKXNldEFs bG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDooQk9PTClmbGFnOworCisvKiEKKyAgICBAbWV0 aG9kIHNldEFsd2F5c0hpZGVIb3Jpem9udGFsU2Nyb2xsZXI6CisgICAgQGRpc2N1c3Npb24gVGhp cyBtZXRob2Qgc2V0cyBpZiB0aGUgaG9yaXpvbnRhbCBzY3JvbGxiYXIgaXMgYWx3YXlzIGhpZGRl biwgcmVnYXJkbGVzcyBvZgorICAgIG90aGVyIHNjcm9sbGJhciB2aXNpYmlsaXR5IHNldHRpbmdz LiBUaGlzIGRvZXMgbm90IGFmZmVjdCB0aGUgc2Nyb2xsYWJpbGl0eSBvZiB0aGUgZG9jdW1lbnQu CisgICAgQHBhcmFtIGZsYWcgWUVTIHRvIGFsd2F5cyBoaWRlIHRoZSBob3Jpem9udGFsIHNjcm9s bGVyLCBOTyBvdGhlcndpc2UuCisqLworLSAodm9pZClzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNj cm9sbGVyOihCT09MKWZsYWc7CisKKy8qIQorICAgIEBtZXRob2Qgc2V0QWx3YXlzSGlkZVZlcnRp Y2FsU2Nyb2xsZXI6CisgICAgQGRpc2N1c3Npb24gVGhpcyBtZXRob2Qgc2V0cyBpZiB0aGUgdmVy dGljYWwgc2Nyb2xsYmFyIGlzIGFsd2F5cyBoaWRkZW4sIHJlZ2FyZGxlc3Mgb2YKKyAgICBvdGhl ciBzY3JvbGxiYXIgdmlzaWJpbGl0eSBzZXR0aW5ncy4gVGhpcyBkb2VzIG5vdCBhZmZlY3QgdGhl IHNjcm9sbGFiaWxpdHkgb2YgdGhlIGRvY3VtZW50LgorICAgIEBwYXJhbSBmbGFnIFlFUyB0byBh bHdheXMgaGlkZSB0aGUgdmVydGljYWwgc2Nyb2xsZXIsIE5PIG90aGVyd2lzZS4KKyovCistICh2 b2lkKXNldEFsd2F5c0hpZGVWZXJ0aWNhbFNjcm9sbGVyOihCT09MKWZsYWc7CiBAZW5kCkluZGV4 OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9XZWJWaWV3L1dlYkZyYW1lLm1tCShyZXZpc2lvbiA1NTI2MSkKKysrIFdlYktpdC9tYWMvV2Vi Vmlldy9XZWJGcmFtZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQAogI2ltcG9y dCAiV2ViQ2hyb21lQ2xpZW50LmgiCiAjaW1wb3J0ICJXZWJEYXRhU291cmNlSW50ZXJuYWwuaCIK ICNpbXBvcnQgIldlYkRvY3VtZW50TG9hZGVyTWFjLmgiCisjaW1wb3J0ICJXZWJEeW5hbWljU2Ny b2xsQmFyc1ZpZXcuaCIKICNpbXBvcnQgIldlYkZyYW1lTG9hZGVyQ2xpZW50LmgiCiAjaW1wb3J0 ICJXZWJGcmFtZVZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViSFRNTFZpZXcuaCIKQEAgLTE1 MjMsNCArMTUyNCwyMSBAQCBzdGF0aWMgTlNVUkwgKmNyZWF0ZVVuaXF1ZVdlYkRhdGFVUkwoKQog ICAgIHJldHVybiB0b0dsb2JhbFJlZihjb3JlRnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3Qo bWFpblRocmVhZE5vcm1hbFdvcmxkKCkpLT5nbG9iYWxFeGVjKCkpOwogfQogCistICh2b2lkKXNl dEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDooQk9PTClmbGFnCit7CisgICAgQVNTRVJU KFtbW3NlbGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gaXNLaW5kT2ZDbGFzczpbV2ViRHluYW1p Y1Njcm9sbEJhcnNWaWV3IGNsYXNzXV0pOworICAgIFsoV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3 ICopW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIHNldEFsbG93U2Nyb2xsZXJzVG9PdmVy bGFwQ29udGVudDpmbGFnXTsKK30KKworLSAodm9pZClzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNj cm9sbGVyOihCT09MKWZsYWcKK3sKKyAgICBBU1NFUlQoW1tbc2VsZiBmcmFtZVZpZXddIF9zY3Jv bGxWaWV3XSBpc0tpbmRPZkNsYXNzOltXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgY2xhc3NdXSk7 CisgICAgWyhXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgKilbW3NlbGYgZnJhbWVWaWV3XSBfc2Ny b2xsVmlld10gc2V0QWx3YXlzSGlkZUhvcml6b250YWxTY3JvbGxlcjpmbGFnXTsKK30KKy0gKHZv aWQpc2V0QWx3YXlzSGlkZVZlcnRpY2FsU2Nyb2xsZXI6KEJPT0wpZmxhZworeworICAgIEFTU0VS VChbW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIGlzS2luZE9mQ2xhc3M6W1dlYkR5bmFt aWNTY3JvbGxCYXJzVmlldyBjbGFzc11dKTsKKyAgICBbKFdlYkR5bmFtaWNTY3JvbGxCYXJzVmll dyAqKVtbc2VsZiBmcmFtZVZpZXddIF9zY3JvbGxWaWV3XSBzZXRBbHdheXNIaWRlVmVydGljYWxT Y3JvbGxlcjpmbGFnXTsKK30KKwogQGVuZAo= 49677 2010-02-26 23:44:06 -0800 2010-02-27 00:10:55 -0800 Move to WebFramePrivate Patch webkitScrollbar.patch text/plain 5337 jingidy+wk SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NTM0NykKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDItMjYgIEppbmcgSmluICA8amppbkBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TW92ZSBpbXBsZW1lbnRhdGlvbiBvZiBCdWcgMzU0NDkgaW50byBXZWJGcmFtZVByaXZhdGUuCisK KyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lLmg6CisgICAgICAgICogV2ViVmlldy9XZWJGcmFt ZS5tbToKKyAgICAgICAgKC1bV2ViRnJhbWUgc2V0QWxsb3dTY3JvbGxlcnNUb092ZXJsYXBDb250 ZW50Ol0pOgorICAgICAgICAoLVtXZWJGcmFtZSBzZXRBbHdheXNIaWRlSG9yaXpvbnRhbFNjcm9s bGVyOl0pOgorICAgICAgICAoLVtXZWJGcmFtZSBzZXRBbHdheXNIaWRlVmVydGljYWxTY3JvbGxl cjpdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5oOgorCiAyMDEwLTAyLTI2 ICBKaW5nIEppbiAgPGpqaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90 aHkgSGF0Y2hlci4KSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5oCShyZXZpc2lvbiA1NTM0NykKKysr IFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTMsMzAg KzIxMyw0IEBACiAgICAgYnJpZGdlIGJldHdlZW4gdGhlIFdlYktpdCBhbmQgSmF2YVNjcmlwdENv cmUgQVBJcy4KICovCiAtIChKU0dsb2JhbENvbnRleHRSZWYpZ2xvYmFsQ29udGV4dDsKLQotLyoh Ci0gICAgQG1ldGhvZCBzZXRBbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6Ci0gICAgQGRp c2N1c3Npb24gVGhpcyBtZXRob2Qgc2V0cyB3aGV0aGVyIHRoZSBzY3JvbGxiYXJzLCBpZiBhbnks IHNob3VsZCBiZSBzaG93biBpbnNpZGUKLSAgICB0aGUgZG9jdW1lbnQncyBib3JkZXIgKHRodXMg b3ZlcmxhcHBpbmcgc29tZSBjb250ZW50KSBvciBvdXRzaWRlIHRoZSB3ZWJWaWV3J3MgYm9yZGVy IAotICAgIChkZWZhdWx0IGJlaGF2aW9yKS4gQ2hhbmdpbmcgdGhpcyBmbGFnIGNoYW5nZXMgdGhl IHNpemUgb2YgdGhlIGNvbnRlbnRWaWV3IGFuZCBtYWludGFpbnMKLSAgICB0aGUgc2l6ZSBvZiB0 aGUgZnJhbWVWaWV3LgotICAgIEBwYXJhbSBmbGFnIFlFUyB0byBhbGxvdyBzY3JvbGxlcnMgdG8g b3ZlcmxhcCBjb250ZW50LCBOTyBvdGhlcndpc2UuCi0qLwotLSAodm9pZClzZXRBbGxvd1Njcm9s bGVyc1RvT3ZlcmxhcENvbnRlbnQ6KEJPT0wpZmxhZzsKLQotLyohCi0gICAgQG1ldGhvZCBzZXRB bHdheXNIaWRlSG9yaXpvbnRhbFNjcm9sbGVyOgotICAgIEBkaXNjdXNzaW9uIFRoaXMgbWV0aG9k IHNldHMgaWYgdGhlIGhvcml6b250YWwgc2Nyb2xsYmFyIGlzIGFsd2F5cyBoaWRkZW4sIHJlZ2Fy ZGxlc3Mgb2YKLSAgICBvdGhlciBzY3JvbGxiYXIgdmlzaWJpbGl0eSBzZXR0aW5ncy4gVGhpcyBk b2VzIG5vdCBhZmZlY3QgdGhlIHNjcm9sbGFiaWxpdHkgb2YgdGhlIGRvY3VtZW50LgotICAgIEBw YXJhbSBmbGFnIFlFUyB0byBhbHdheXMgaGlkZSB0aGUgaG9yaXpvbnRhbCBzY3JvbGxlciwgTk8g b3RoZXJ3aXNlLgotKi8KLS0gKHZvaWQpc2V0QWx3YXlzSGlkZUhvcml6b250YWxTY3JvbGxlcjoo Qk9PTClmbGFnOwotCi0vKiEKLSAgICBAbWV0aG9kIHNldEFsd2F5c0hpZGVWZXJ0aWNhbFNjcm9s bGVyOgotICAgIEBkaXNjdXNzaW9uIFRoaXMgbWV0aG9kIHNldHMgaWYgdGhlIHZlcnRpY2FsIHNj cm9sbGJhciBpcyBhbHdheXMgaGlkZGVuLCByZWdhcmRsZXNzIG9mCi0gICAgb3RoZXIgc2Nyb2xs YmFyIHZpc2liaWxpdHkgc2V0dGluZ3MuIFRoaXMgZG9lcyBub3QgYWZmZWN0IHRoZSBzY3JvbGxh YmlsaXR5IG9mIHRoZSBkb2N1bWVudC4KLSAgICBAcGFyYW0gZmxhZyBZRVMgdG8gYWx3YXlzIGhp ZGUgdGhlIHZlcnRpY2FsIHNjcm9sbGVyLCBOTyBvdGhlcndpc2UuCi0qLwotLSAodm9pZClzZXRB bHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjooQk9PTClmbGFnOwogQGVuZApJbmRleDogV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmll dy9XZWJGcmFtZS5tbQkocmV2aXNpb24gNTUzNDcpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2Vi RnJhbWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyODIsNiArMTI4MiwyMiBAQCBzdGF0aWMgaW5s aW5lIFdlYkRhdGFTb3VyY2UgKmRhdGFTb3VyY2UoCiAgICAgcmV0dXJuIHRvR2xvYmFsUmVmKGNv cmVGcmFtZS0+c2NyaXB0KCktPmdsb2JhbE9iamVjdChjb3JlV29ybGQpLT5nbG9iYWxFeGVjKCkp OwogfQogCistICh2b2lkKXNldEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDooQk9PTClm bGFnCit7CisgICAgQVNTRVJUKFtbW3NlbGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gaXNLaW5k T2ZDbGFzczpbV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3IGNsYXNzXV0pOworICAgIFsoV2ViRHlu YW1pY1Njcm9sbEJhcnNWaWV3ICopW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIHNldEFs bG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDpmbGFnXTsKK30KKworLSAodm9pZClzZXRBbHdh eXNIaWRlSG9yaXpvbnRhbFNjcm9sbGVyOihCT09MKWZsYWcKK3sKKyAgICBBU1NFUlQoW1tbc2Vs ZiBmcmFtZVZpZXddIF9zY3JvbGxWaWV3XSBpc0tpbmRPZkNsYXNzOltXZWJEeW5hbWljU2Nyb2xs QmFyc1ZpZXcgY2xhc3NdXSk7CisgICAgWyhXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgKilbW3Nl bGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gc2V0QWx3YXlzSGlkZUhvcml6b250YWxTY3JvbGxl cjpmbGFnXTsKK30KKy0gKHZvaWQpc2V0QWx3YXlzSGlkZVZlcnRpY2FsU2Nyb2xsZXI6KEJPT0wp ZmxhZworeworICAgIEFTU0VSVChbW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIGlzS2lu ZE9mQ2xhc3M6W1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBjbGFzc11dKTsKKyAgICBbKFdlYkR5 bmFtaWNTY3JvbGxCYXJzVmlldyAqKVtbc2VsZiBmcmFtZVZpZXddIF9zY3JvbGxWaWV3XSBzZXRB bHdheXNIaWRlVmVydGljYWxTY3JvbGxlcjpmbGFnXTsKK30KIEBlbmQKIAogQGltcGxlbWVudGF0 aW9uIFdlYkZyYW1lCkBAIC0xNTI0LDIxICsxNTQwLDQgQEAgc3RhdGljIE5TVVJMICpjcmVhdGVV bmlxdWVXZWJEYXRhVVJMKCkKICAgICByZXR1cm4gdG9HbG9iYWxSZWYoY29yZUZyYW1lLT5zY3Jp cHQoKS0+Z2xvYmFsT2JqZWN0KG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKS0+Z2xvYmFsRXhlYygp KTsKIH0KIAotLSAodm9pZClzZXRBbGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6KEJPT0wp ZmxhZwotewotICAgIEFTU0VSVChbW1tzZWxmIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIGlzS2lu ZE9mQ2xhc3M6W1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBjbGFzc11dKTsKLSAgICBbKFdlYkR5 bmFtaWNTY3JvbGxCYXJzVmlldyAqKVtbc2VsZiBmcmFtZVZpZXddIF9zY3JvbGxWaWV3XSBzZXRB bGxvd1Njcm9sbGVyc1RvT3ZlcmxhcENvbnRlbnQ6ZmxhZ107Ci19Ci0KLS0gKHZvaWQpc2V0QWx3 YXlzSGlkZUhvcml6b250YWxTY3JvbGxlcjooQk9PTClmbGFnCi17Ci0gICAgQVNTRVJUKFtbW3Nl bGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gaXNLaW5kT2ZDbGFzczpbV2ViRHluYW1pY1Njcm9s bEJhcnNWaWV3IGNsYXNzXV0pOwotICAgIFsoV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3ICopW1tz ZWxmIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIHNldEFsd2F5c0hpZGVIb3Jpem9udGFsU2Nyb2xs ZXI6ZmxhZ107Ci19Ci0tICh2b2lkKXNldEFsd2F5c0hpZGVWZXJ0aWNhbFNjcm9sbGVyOihCT09M KWZsYWcKLXsKLSAgICBBU1NFUlQoW1tbc2VsZiBmcmFtZVZpZXddIF9zY3JvbGxWaWV3XSBpc0tp bmRPZkNsYXNzOltXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcgY2xhc3NdXSk7Ci0gICAgWyhXZWJE eW5hbWljU2Nyb2xsQmFyc1ZpZXcgKilbW3NlbGYgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gc2V0 QWx3YXlzSGlkZVZlcnRpY2FsU2Nyb2xsZXI6ZmxhZ107Ci19Ci0KIEBlbmQKSW5kZXg6IFdlYktp dC9tYWMvV2ViVmlldy9XZWJGcmFtZVByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFj L1dlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmgJKHJldmlzaW9uIDU1MzQ3KQorKysgV2ViS2l0L21h Yy9XZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNCArMTIw LDE0IEBAIHR5cGVkZWYgZW51bSB7CiAtIChOU011dGFibGVEaWN0aW9uYXJ5ICopX2NhY2hlYWJp bGl0eURpY3Rpb25hcnk7CiAKIC0gKEJPT0wpX2FsbG93c0ZvbGxvd2luZ0xpbms6KE5TVVJMICop VVJMOworCisvLyBTZXRzIHdoZXRoZXIgdGhlIHNjcm9sbGJhcnMsIGlmIGFueSwgc2hvdWxkIGJl IHNob3duIGluc2lkZSB0aGUgZG9jdW1lbnQncyBib3JkZXIgCisvLyAodGh1cyBvdmVybGFwcGlu ZyBzb21lIGNvbnRlbnQpIG9yIG91dHNpZGUgdGhlIHdlYlZpZXcncyBib3JkZXIgKGRlZmF1bHQg YmVoYXZpb3IpLiAKKy8vIENoYW5naW5nIHRoaXMgZmxhZyBjaGFuZ2VzIHRoZSBzaXplIG9mIHRo ZSBjb250ZW50VmlldyBhbmQgbWFpbnRhaW5zIHRoZSBzaXplIG9mIHRoZSBmcmFtZVZpZXcuCist ICh2b2lkKXNldEFsbG93U2Nyb2xsZXJzVG9PdmVybGFwQ29udGVudDooQk9PTClmbGFnOworCisv LyBTZXRzIGlmIHRoZSBzY3JvbGxiYXIgaXMgYWx3YXlzIGhpZGRlbiwgcmVnYXJkbGVzcyBvZiBv dGhlciBzY3JvbGxiYXIgdmlzaWJpbGl0eSBzZXR0aW5ncy4gCisvLyBUaGlzIGRvZXMgbm90IGFm ZmVjdCB0aGUgc2Nyb2xsYWJpbGl0eSBvZiB0aGUgZG9jdW1lbnQuCistICh2b2lkKXNldEFsd2F5 c0hpZGVIb3Jpem9udGFsU2Nyb2xsZXI6KEJPT0wpZmxhZzsKKy0gKHZvaWQpc2V0QWx3YXlzSGlk ZVZlcnRpY2FsU2Nyb2xsZXI6KEJPT0wpZmxhZzsKIEBlbmQK