29332 2009-09-17 08:07:12 -0700 REGRESSION (r48446): While a <select> popup menu is open, the rest of the WebView doesn't respond to mouse move events 2009-09-18 13:52:47 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED data:text/html,%3Cstyle%3Ea:hover%20{%20color:%20green%20}%3C/style%3E%3Cselect%3E%3Coption%3E1%3C/select%3E%3Ca%20href=%22#%22%3Ea%20link%3C/a%3E InRadar, PlatformOnly, Regression P2 Normal --- 1 aroben webkit-unassigned andersca oldest_to_newest 147798 0 aroben 2009-09-17 08:07:12 -0700 To reproduce: 1. Go to data:text/html,%3Cstyle%3Ea:hover%20{%20color:%20green%20}%3C/style%3E%3Cselect%3E%3Coption%3E1%3C/select%3E%3Ca%20href=%22#%22%3Ea%20link%3C/a%3E 2. Click on the <select> to open its popup menu 3. Hover over the link The mouse cursor doesn't change to a pointing hand, and the link doesn't turn green like it should. This only happens in Safari; Firefox and IE behave correctly. 147799 1 aroben 2009-09-17 08:07:41 -0700 <rdar://problem/7231652> 148311 2 39778 andersca 2009-09-18 12:31:37 -0700 Created attachment 39778 Patch v1 148313 3 39778 darin 2009-09-18 12:36:43 -0700 Comment on attachment 39778 Patch v1 > +static void translatePoint(LPARAM& lParam, HWND from, HWND to) { Please put the brace in a second line. > + // Protect the popup menu in case its owner is destroyed while we're running the message pump. > + RefPtr<PopupMenu> protect(this); I hate "protect" -- if there's any other way to make the lifetime work I would prefer it. It's so hard to know when you need to protect something -- once we add one of these it becomes voodoo code you can never remove. But it's better than explicit ref/deref, that's for sure. > + if (event->type == NPCocoaEventMouseUp) { > + NSBeep(); > + } Did you mean to land this? > buildSettings = { > - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; > + ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; > ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64"; > GCC_WARN_ABOUT_RETURN_TYPE = YES; > GCC_WARN_UNUSED_VARIABLE = YES; > + ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; > PREBINDING = NO; > - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; > + SDKROOT = ""; > }; Did you mean to land this? I'm going to say review- because of those example changes, but it's really close to a review+ 148314 4 39778 aroben 2009-09-18 12:40:53 -0700 Comment on attachment 39778 Patch v1 > + pt.x = (short)LOWORD(lParam); > + pt.y = (short)HIWORD(lParam); GET_X_LPARAM and GET_Y_LPARAM would be better here. 148319 5 39778 sam 2009-09-18 12:44:45 -0700 Comment on attachment 39778 Patch v1 > +static void translatePoint(LPARAM& lParam, HWND from, HWND to) { > + POINT pt; > + pt.x = (short)LOWORD(lParam); > + pt.y = (short)HIWORD(lParam); > + ::MapWindowPoints(from, to, &pt, 1); > + lParam = MAKELPARAM(pt.x, pt.y); > +} The { should be on a new line. 148320 6 andersca 2009-09-18 12:46:42 -0700 (In reply to comment #3) > (From update of attachment 39778 [details]) > > +static void translatePoint(LPARAM& lParam, HWND from, HWND to) { > > Please put the brace in a second line. > Whoops, fixed. > > + // Protect the popup menu in case its owner is destroyed while we're running the message pump. > > + RefPtr<PopupMenu> protect(this); > > I hate "protect" -- if there's any other way to make the lifetime work I would > prefer it. It's so hard to know when you need to protect something -- once we > add one of these it becomes voodoo code you can never remove. But it's better > than explicit ref/deref, that's for sure. > I couldn't think of a way to do this without having to redesign a lot of the popup menu API. > Did you mean to land this? > Nope, I blame bugzilla-tool... > Did you mean to land this? > Nope, same here. > I'm going to say review- because of those example changes, but it's really > close to a review+ OK, I'll upload a new patch. Thanks! 148323 7 39780 andersca 2009-09-18 12:57:53 -0700 Created attachment 39780 Patch v1 148373 8 andersca 2009-09-18 13:52:47 -0700 http://trac.webkit.org/changeset/48529 39778 2009-09-18 12:31:37 -0700 2009-09-18 12:56:33 -0700 Patch v1 bug-29332-20090918123135.patch text/plain 6761 andersca SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODUyMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMDktMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkzMzIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzcyMzE2NTI+IAorICAgICAgICBSRUdSRVNTSU9OIChyNDg0NDYpOiBX aGlsZSBhIDxzZWxlY3Q+IHBvcHVwIG1lbnUgaXMgb3BlbiwgdGhlCisgICAgICAgIHJlc3Qgb2Yg dGhlIFdlYlZpZXcgZG9lc24ndCByZXNwb25kIHRvIG1vdXNlIG1vdmUgZXZlbnRzLgorCisgICAg ICAgICogcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0 cmFuc2xhdGVQb2ludCk6CisgICAgICAgIE5ldyBoZWxwZXIgZnVuY3Rpb24gdGhhdCB0cmFuc2xh dGVzIGEgcG9pbnQgYmV0d2VlbiBIV05EIGNvb3JkaW5hdGVzLgorICAgICAgICAKKyAgICAgICAg KFdlYkNvcmU6OlBvcHVwTWVudTo6c2hvdyk6CisgICAgICAgIFByb3RlY3QgdGhlIFBvcHVwTWVu dSBpZiBzb21lb25lIHJlbW92ZXMgdGhlIDxzZWxlY3Q+IGluIHJlc3BvbnNlIHRvIGEgbW91c2UK KyAgICAgICAgZXZlbnQuIEhhbmRsZSBXTV9IT1NUX1dJTkRPV19NT1VTRU1PVkUgZXZlbnRzLgor ICAgICAgICAKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6d25kUHJvYyk6CisgICAgICAg IGluIHRoZSBXTV9NT1VTRU1PVkUgaGFuZGxlciwgaWYgdGhlIG1vdXNlIGlzIG5vdCBvdmVyIHRo ZSBwb3B1cCwgcG9zdCBhIAorICAgICAgICBXTV9IT1NUX1dJTkRPV19NT1VTRU1PVkUgZXZlbnQg c28gdGhhdCB0aGUgaG9zdCB3aW5kb3cgKHRoZSBXZWJWaWV3KSBnZXRzIHRoZQorICAgICAgICBt b3VzZSBtb3ZlIGV2ZW50LgorCiAyMDA5LTA5LTE4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHAJKHJldmlzaW9uIDQ4NTE5KQorKysgV2ViQ29yZS9w bGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsOSArNjIs MTEgQEAgY29uc3QgaW50IHBvcHVwV2luZG93Qm9yZGVyV2lkdGggPSAxOwogc3RhdGljIExQQ1RT VFIga1BvcHVwV2luZG93Q2xhc3NOYW1lID0gX1QoIlBvcHVwV2luZG93Q2xhc3MiKTsKIAogLy8g VGhpcyBpcyB1c2VkIGZyb20gd2l0aGluIG91ciBjdXN0b20gbWVzc2FnZSBwdW1wIHdoZW4gd2Ug d2FudCB0byBzZW5kIGEKLS8vIFdNX0NIQVIgbWVzc2FnZSB0byB0aGUgd2ViIHZpZXcgYW5kIG5v dCBoYXZlIG91ciBtZXNzYWdlIHN0b2xlbiBhbmQgc2VudCB0bworLy8gbWVzc2FnZSB0byB0aGUg d2ViIHZpZXcgYW5kIG5vdCBoYXZlIG91ciBtZXNzYWdlIHN0b2xlbiBhbmQgc2VudCB0bwogLy8g dGhlIHBvcHVwIHdpbmRvdy4KLXN0YXRpYyBjb25zdCBVSU5UIFdNX0hPU1RfV0lORE9XX0NIQVIg PSBXTV9VU0VSOworc3RhdGljIGNvbnN0IFVJTlQgV01fSE9TVF9XSU5ET1dfRklSU1QgPSBXTV9V U0VSOworc3RhdGljIGNvbnN0IFVJTlQgV01fSE9TVF9XSU5ET1dfQ0hBUiA9IFdNX1VTRVIgKyBX TV9DSEFSOyAKK3N0YXRpYyBjb25zdCBVSU5UIFdNX0hPU1RfV0lORE9XX01PVVNFTU9WRSA9IFdN X1VTRVIgKyBXTV9NT1VTRU1PVkU7CiAKIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBhcyBzb29uIGFz IHByYWN0aWNhbC4KIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0FTQ0lJUHJpbnRhYmxlKHVuc2lnbmVk IGMpCkBAIC03Miw2ICs3NCwxNCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBU0NJSVByaW50YWJs ZSh1bnNpCiAgICAgcmV0dXJuIGMgPj0gMHgyMCAmJiBjIDw9IDB4N0U7CiB9CiAKK3N0YXRpYyB2 b2lkIHRyYW5zbGF0ZVBvaW50KExQQVJBTSYgbFBhcmFtLCBIV05EIGZyb20sIEhXTkQgdG8pIHsK KyAgICBQT0lOVCBwdDsKKyAgICBwdC54ID0gKHNob3J0KUxPV09SRChsUGFyYW0pOworICAgIHB0 LnkgPSAoc2hvcnQpSElXT1JEKGxQYXJhbSk7ICAgIAorICAgIDo6TWFwV2luZG93UG9pbnRzKGZy b20sIHRvLCAmcHQsIDEpOworICAgIGxQYXJhbSA9IE1BS0VMUEFSQU0ocHQueCwgcHQueSk7Cit9 CisKIFBvcHVwTWVudTo6UG9wdXBNZW51KFBvcHVwTWVudUNsaWVudCogY2xpZW50KQogICAgIDog bV9wb3B1cENsaWVudChjbGllbnQpCiAgICAgLCBtX3Njcm9sbGJhcigwKQpAQCAtMTY1LDYgKzE3 NSw5IEBAIHZvaWQgUG9wdXBNZW51OjpzaG93KGNvbnN0IEludFJlY3QmIHIsIEYKIAogICAgIG1f c2hvd1BvcHVwID0gdHJ1ZTsKIAorICAgIC8vIFByb3RlY3QgdGhlIHBvcHVwIG1lbnUgaW4gY2Fz ZSBpdHMgb3duZXIgaXMgZGVzdHJveWVkIHdoaWxlIHdlJ3JlIHJ1bm5pbmcgdGhlIG1lc3NhZ2Ug cHVtcC4KKyAgICBSZWZQdHI8UG9wdXBNZW51PiBwcm90ZWN0KHRoaXMpOworCiAgICAgOjpTZXRD YXB0dXJlKGhvc3RXaW5kb3cpOwogCiAgICAgTVNHIG1zZzsKQEAgLTE3MiwxMSArMTg1LDEyIEBA IHZvaWQgUG9wdXBNZW51OjpzaG93KGNvbnN0IEludFJlY3QmIHIsIEYKIAogICAgIHdoaWxlICg6 OkdldE1lc3NhZ2UoJm1zZywgMCwgMCwgMCkpIHsKICAgICAgICAgc3dpdGNoIChtc2cubWVzc2Fn ZSkgeworICAgICAgICAgICAgY2FzZSBXTV9IT1NUX1dJTkRPV19NT1VTRU1PVkU6CiAgICAgICAg ICAgICBjYXNlIFdNX0hPU1RfV0lORE9XX0NIQVI6IAogICAgICAgICAgICAgICAgIGlmIChtc2cu aHduZCA9PSBtX3BvcHVwKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIFRoaXMgbWVzc2FnZSBz aG91bGQgYmUgc2VudCB0byB0aGUgaG9zdCB3aW5kb3cgYXMgYSBXTV9DSEFSLgorICAgICAgICAg ICAgICAgICAgICAvLyBUaGlzIG1lc3NhZ2Ugc2hvdWxkIGJlIHNlbnQgdG8gdGhlIGhvc3Qgd2lu ZG93LgogICAgICAgICAgICAgICAgICAgICBtc2cuaHduZCA9IGhvc3RXaW5kb3c7Ci0gICAgICAg ICAgICAgICAgICAgIG1zZy5tZXNzYWdlID0gV01fQ0hBUjsKKyAgICAgICAgICAgICAgICAgICAg bXNnLm1lc3NhZ2UgLT0gV01fSE9TVF9XSU5ET1dfRklSU1Q7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIGJyZWFrOwogCkBAIC0yMDYsMTEgKzIyMCw5IEBAIHZvaWQgUG9wdXBN ZW51OjpzaG93KGNvbnN0IEludFJlY3QmIHIsIEYKICAgICAgICAgICAgIGNhc2UgV01fTUJVVFRP TkRPV046CiAgICAgICAgICAgICBjYXNlIFdNX01CVVRUT05VUDoKICAgICAgICAgICAgIGNhc2Ug V01fTUJVVFRPTkRCTENMSzogewotICAgICAgICAgICAgICAgIFBPSU5UIHB0OwotICAgICAgICAg ICAgICAgIHB0LnggPSAoc2hvcnQpTE9XT1JEKG1zZy5sUGFyYW0pOwotICAgICAgICAgICAgICAg IHB0LnkgPSAoc2hvcnQpSElXT1JEKG1zZy5sUGFyYW0pOwotICAgICAgICAgICAgICAgIDo6TWFw V2luZG93UG9pbnRzKG1zZy5od25kLCBtX3BvcHVwLCAmcHQsIDEpOwotICAgICAgICAgICAgICAg IG1zZy5sUGFyYW0gPSBNQUtFTFBBUkFNKHB0LngsIHB0LnkpOworICAgICAgICAgICAgICAgIC8v IFRyYW5zbGF0ZSB0aGUgY29vcmRpbmF0ZS4KKyAgICAgICAgICAgICAgICB0cmFuc2xhdGVQb2lu dChtc2cubFBhcmFtLCBtc2cuaHduZCwgbV9wb3B1cCk7CisKICAgICAgICAgICAgICAgICBtc2cu aHduZCA9IG1fcG9wdXA7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CkBA IC0yMzAsNiArMjQyLDkgQEAgdm9pZCBQb3B1cE1lbnU6OnNob3coY29uc3QgSW50UmVjdCYgciwg RgogICAgICAgICA6OlRyYW5zbGF0ZU1lc3NhZ2UoJm1zZyk7CiAgICAgICAgIDo6RGlzcGF0Y2hN ZXNzYWdlKCZtc2cpOwogCisgICAgICAgIGlmICghbV9wb3B1cENsaWVudCkKKyAgICAgICAgICAg IGJyZWFrOworCiAgICAgICAgIGlmICghbV9zaG93UG9wdXApCiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgYWN0aXZlV2luZG93ID0gOjpHZXRBY3RpdmVXaW5kb3coKTsKQEAgLTg4MCw2ICs4 OTUsMTcgQEAgTFJFU1VMVCBQb3B1cE1lbnU6OnduZFByb2MoSFdORCBoV25kLCBVSQogCiAgICAg ICAgICAgICBSRUNUIGJvdW5kczsKICAgICAgICAgICAgIEdldENsaWVudFJlY3QocG9wdXBIYW5k bGUoKSwgJmJvdW5kcyk7CisgICAgICAgICAgICBpZiAoITo6UHRJblJlY3QoJmJvdW5kcywgbW91 c2VQb2ludCkgJiYgISh3UGFyYW0gJiBNS19MQlVUVE9OKSAmJiBjbGllbnQoKSkgeworICAgICAg ICAgICAgICAgIC8vIFdoZW4gdGhlIG1vdXNlIGlzIG5vdCBpbnNpZGUgdGhlIHBvcHVwIG1lbnUg YW5kIHRoZSBsZWZ0IGJ1dHRvbiBpc24ndCBkb3duLCBqdXN0CisgICAgICAgICAgICAgICAgLy8g cmVwb3N0IHRoZSBtZXNzYWdlIHRvIHRoZSB3ZWIgdmlldy4KKworICAgICAgICAgICAgICAgIC8v IFRyYW5zbGF0ZSB0aGUgY29vcmRpbmF0ZS4KKyAgICAgICAgICAgICAgICB0cmFuc2xhdGVQb2lu dChsUGFyYW0sIG1fcG9wdXAsIGNsaWVudCgpLT5ob3N0V2luZG93KCktPnBsYXRmb3JtV2luZG93 KCkpOworCisgICAgICAgICAgICAgICAgOjpQb3N0TWVzc2FnZShtX3BvcHVwLCBXTV9IT1NUX1dJ TkRPV19NT1VTRU1PVkUsIHdQYXJhbSwgbFBhcmFtKTsKKyAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgaWYgKChzaG91bGRIb3RUcmFjayB8fCB3UGFy YW0gJiBNS19MQlVUVE9OKSAmJiA6OlB0SW5SZWN0KCZib3VuZHMsIG1vdXNlUG9pbnQpKQogICAg ICAgICAgICAgICAgIHNldEZvY3VzZWRJbmRleChsaXN0SW5kZXhBdFBvaW50KG1vdXNlUG9pbnQp LCB0cnVlKTsKIApJbmRleDogV2ViS2l0RXhhbXBsZVBsdWdpbnMvTmV0c2NhcGVDb2NvYVBsdWdp bi9tYWluLm0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0RXhhbXBsZVBsdWdpbnMvTmV0c2NhcGVDb2Nv YVBsdWdpbi9tYWluLm0JKHJldmlzaW9uIDQ4NTE5KQorKysgV2ViS2l0RXhhbXBsZVBsdWdpbnMv TmV0c2NhcGVDb2NvYVBsdWdpbi9tYWluLm0JKHdvcmtpbmcgY29weSkKQEAgLTI2Myw2ICsyNjMs MTAgQEAgc3RhdGljIHZvaWQgaW52YWxpZGF0ZVBsdWdpbihQbHVnaW5PYmplYwogCiBzdGF0aWMg dm9pZCBoYW5kbGVNb3VzZUV2ZW50KFBsdWdpbk9iamVjdCAqb2JqLCBOUENvY29hRXZlbnQgKmV2 ZW50KQogeworICAgIGlmIChldmVudC0+dHlwZSA9PSBOUENvY29hRXZlbnRNb3VzZVVwKSB7Cisg ICAgICAgIE5TQmVlcCgpOworICAgIH0KKyAgICAKICAgICBOU1N0cmluZyAqc3RyaW5nID0gW05T U3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJUeXBlOiAlQFxuIgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIk1vZGlmaWVyIGZsYWdzOiAweCV4XG4i CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ29v cmRpbmF0ZXM6ICglZywgJWcpXG4iCkluZGV4OiBXZWJLaXRFeGFtcGxlUGx1Z2lucy9OZXRzY2Fw ZUNvY29hUGx1Z2luL05ldHNjYXBlQ29jb2FQbHVnaW4ueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXRFeGFtcGxlUGx1Z2lucy9OZXRzY2FwZUNvY29hUGx1Z2lu L05ldHNjYXBlQ29jb2FQbHVnaW4ueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24g NDg1MTkpCisrKyBXZWJLaXRFeGFtcGxlUGx1Z2lucy9OZXRzY2FwZUNvY29hUGx1Z2luL05ldHNj YXBlQ29jb2FQbHVnaW4ueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpA QCAtMTkyLDEyICsxOTIsMTMgQEAKIAkJMTQ5QzI5ODgwODkwMkM1MzAwOEE5RUZDIC8qIERlYnVn ICovID0gewogCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQlidWlsZFNldHRpbmdz ID0gewotCQkJCUFSQ0hTID0gIiQoQVJDSFNfU1RBTkRBUkRfMzJfNjRfQklUX1BSRV9YQ09ERV8z XzEpIjsKKwkJCQlBUkNIUyA9ICIkKE9OTFlfQUNUSVZFX0FSQ0hfUFJFX1hDT0RFXzNfMSkiOwog CQkJCUFSQ0hTX1NUQU5EQVJEXzMyXzY0X0JJVF9QUkVfWENPREVfM18xID0gInBwYyBpMzg2IHBw YzY0IHg4Nl82NCI7CiAJCQkJR0NDX1dBUk5fQUJPVVRfUkVUVVJOX1RZUEUgPSBZRVM7CiAJCQkJ R0NDX1dBUk5fVU5VU0VEX1ZBUklBQkxFID0gWUVTOworCQkJCU9OTFlfQUNUSVZFX0FSQ0hfUFJF X1hDT0RFXzNfMSA9ICIkKE5BVElWRV9BUkNIKSI7CiAJCQkJUFJFQklORElORyA9IE5POwotCQkJ CVNES1JPT1QgPSAvRGV2ZWxvcGVyL1NES3MvTWFjT1NYMTAuNS5zZGs7CisJCQkJU0RLUk9PVCA9 ICIiOwogCQkJfTsKIAkJCW5hbWUgPSBEZWJ1ZzsKIAkJfTs= 39780 2009-09-18 12:57:53 -0700 2009-09-18 13:49:36 -0700 Patch v1 bug-29332-20090918125749.patch text/plain 5151 andersca SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODUyMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMDktMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkzMzIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzcyMzE2NTI+IAorICAgICAgICBSRUdSRVNTSU9OIChyNDg0NDYpOiBX aGlsZSBhIDxzZWxlY3Q+IHBvcHVwIG1lbnUgaXMgb3BlbiwgdGhlCisgICAgICAgIHJlc3Qgb2Yg dGhlIFdlYlZpZXcgZG9lc24ndCByZXNwb25kIHRvIG1vdXNlIG1vdmUgZXZlbnRzLgorCisgICAg ICAgICogcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0 cmFuc2xhdGVQb2ludCk6CisgICAgICAgIE5ldyBoZWxwZXIgZnVuY3Rpb24gdGhhdCB0cmFuc2xh dGVzIGEgcG9pbnQgYmV0d2VlbiBIV05EIGNvb3JkaW5hdGVzLgorICAgICAgICAKKyAgICAgICAg KFdlYkNvcmU6OlBvcHVwTWVudTo6c2hvdyk6CisgICAgICAgIFByb3RlY3QgdGhlIFBvcHVwTWVu dSBpZiBzb21lb25lIHJlbW92ZXMgdGhlIDxzZWxlY3Q+IGluIHJlc3BvbnNlIHRvIGEgbW91c2UK KyAgICAgICAgZXZlbnQuIEhhbmRsZSBXTV9IT1NUX1dJTkRPV19NT1VTRU1PVkUgZXZlbnRzLgor ICAgICAgICAKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6d25kUHJvYyk6CisgICAgICAg IGluIHRoZSBXTV9NT1VTRU1PVkUgaGFuZGxlciwgaWYgdGhlIG1vdXNlIGlzIG5vdCBvdmVyIHRo ZSBwb3B1cCwgcG9zdCBhIAorICAgICAgICBXTV9IT1NUX1dJTkRPV19NT1VTRU1PVkUgZXZlbnQg c28gdGhhdCB0aGUgaG9zdCB3aW5kb3cgKHRoZSBXZWJWaWV3KSBnZXRzIHRoZQorICAgICAgICBt b3VzZSBtb3ZlIGV2ZW50LgorCiAyMDA5LTA5LTE4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHAJKHJldmlzaW9uIDQ4NTE5KQorKysgV2ViQ29yZS9w bGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsOSArNjIs MTEgQEAgY29uc3QgaW50IHBvcHVwV2luZG93Qm9yZGVyV2lkdGggPSAxOwogc3RhdGljIExQQ1RT VFIga1BvcHVwV2luZG93Q2xhc3NOYW1lID0gX1QoIlBvcHVwV2luZG93Q2xhc3MiKTsKIAogLy8g VGhpcyBpcyB1c2VkIGZyb20gd2l0aGluIG91ciBjdXN0b20gbWVzc2FnZSBwdW1wIHdoZW4gd2Ug d2FudCB0byBzZW5kIGEKLS8vIFdNX0NIQVIgbWVzc2FnZSB0byB0aGUgd2ViIHZpZXcgYW5kIG5v dCBoYXZlIG91ciBtZXNzYWdlIHN0b2xlbiBhbmQgc2VudCB0bworLy8gbWVzc2FnZSB0byB0aGUg d2ViIHZpZXcgYW5kIG5vdCBoYXZlIG91ciBtZXNzYWdlIHN0b2xlbiBhbmQgc2VudCB0bwogLy8g dGhlIHBvcHVwIHdpbmRvdy4KLXN0YXRpYyBjb25zdCBVSU5UIFdNX0hPU1RfV0lORE9XX0NIQVIg PSBXTV9VU0VSOworc3RhdGljIGNvbnN0IFVJTlQgV01fSE9TVF9XSU5ET1dfRklSU1QgPSBXTV9V U0VSOworc3RhdGljIGNvbnN0IFVJTlQgV01fSE9TVF9XSU5ET1dfQ0hBUiA9IFdNX1VTRVIgKyBX TV9DSEFSOyAKK3N0YXRpYyBjb25zdCBVSU5UIFdNX0hPU1RfV0lORE9XX01PVVNFTU9WRSA9IFdN X1VTRVIgKyBXTV9NT1VTRU1PVkU7CiAKIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBhcyBzb29uIGFz IHByYWN0aWNhbC4KIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0FTQ0lJUHJpbnRhYmxlKHVuc2lnbmVk IGMpCkBAIC03Miw2ICs3NCwxNSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBU0NJSVByaW50YWJs ZSh1bnNpCiAgICAgcmV0dXJuIGMgPj0gMHgyMCAmJiBjIDw9IDB4N0U7CiB9CiAKK3N0YXRpYyB2 b2lkIHRyYW5zbGF0ZVBvaW50KExQQVJBTSYgbFBhcmFtLCBIV05EIGZyb20sIEhXTkQgdG8pCit7 CisgICAgUE9JTlQgcHQ7CisgICAgcHQueCA9IChzaG9ydClHRVRfWF9MUEFSQU0obFBhcmFtKTsK KyAgICBwdC55ID0gKHNob3J0KUdFVF9ZX0xQQVJBTShsUGFyYW0pOyAgICAKKyAgICA6Ok1hcFdp bmRvd1BvaW50cyhmcm9tLCB0bywgJnB0LCAxKTsKKyAgICBsUGFyYW0gPSBNQUtFTFBBUkFNKHB0 LngsIHB0LnkpOworfQorCiBQb3B1cE1lbnU6OlBvcHVwTWVudShQb3B1cE1lbnVDbGllbnQqIGNs aWVudCkKICAgICA6IG1fcG9wdXBDbGllbnQoY2xpZW50KQogICAgICwgbV9zY3JvbGxiYXIoMCkK QEAgLTE2NSw2ICsxNzYsOSBAQCB2b2lkIFBvcHVwTWVudTo6c2hvdyhjb25zdCBJbnRSZWN0JiBy LCBGCiAKICAgICBtX3Nob3dQb3B1cCA9IHRydWU7CiAKKyAgICAvLyBQcm90ZWN0IHRoZSBwb3B1 cCBtZW51IGluIGNhc2UgaXRzIG93bmVyIGlzIGRlc3Ryb3llZCB3aGlsZSB3ZSdyZSBydW5uaW5n IHRoZSBtZXNzYWdlIHB1bXAuCisgICAgUmVmUHRyPFBvcHVwTWVudT4gcHJvdGVjdCh0aGlzKTsK KwogICAgIDo6U2V0Q2FwdHVyZShob3N0V2luZG93KTsKIAogICAgIE1TRyBtc2c7CkBAIC0xNzIs MTEgKzE4NiwxMiBAQCB2b2lkIFBvcHVwTWVudTo6c2hvdyhjb25zdCBJbnRSZWN0JiByLCBGCiAK ICAgICB3aGlsZSAoOjpHZXRNZXNzYWdlKCZtc2csIDAsIDAsIDApKSB7CiAgICAgICAgIHN3aXRj aCAobXNnLm1lc3NhZ2UpIHsKKyAgICAgICAgICAgIGNhc2UgV01fSE9TVF9XSU5ET1dfTU9VU0VN T1ZFOgogICAgICAgICAgICAgY2FzZSBXTV9IT1NUX1dJTkRPV19DSEFSOiAKICAgICAgICAgICAg ICAgICBpZiAobXNnLmh3bmQgPT0gbV9wb3B1cCkgewotICAgICAgICAgICAgICAgICAgICAvLyBU aGlzIG1lc3NhZ2Ugc2hvdWxkIGJlIHNlbnQgdG8gdGhlIGhvc3Qgd2luZG93IGFzIGEgV01fQ0hB Ui4KKyAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBtZXNzYWdlIHNob3VsZCBiZSBzZW50IHRv IHRoZSBob3N0IHdpbmRvdy4KICAgICAgICAgICAgICAgICAgICAgbXNnLmh3bmQgPSBob3N0V2lu ZG93OwotICAgICAgICAgICAgICAgICAgICBtc2cubWVzc2FnZSA9IFdNX0NIQVI7CisgICAgICAg ICAgICAgICAgICAgIG1zZy5tZXNzYWdlIC09IFdNX0hPU1RfV0lORE9XX0ZJUlNUOwogICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBicmVhazsKIApAQCAtMjA2LDExICsyMjEsOSBA QCB2b2lkIFBvcHVwTWVudTo6c2hvdyhjb25zdCBJbnRSZWN0JiByLCBGCiAgICAgICAgICAgICBj YXNlIFdNX01CVVRUT05ET1dOOgogICAgICAgICAgICAgY2FzZSBXTV9NQlVUVE9OVVA6CiAgICAg ICAgICAgICBjYXNlIFdNX01CVVRUT05EQkxDTEs6IHsKLSAgICAgICAgICAgICAgICBQT0lOVCBw dDsKLSAgICAgICAgICAgICAgICBwdC54ID0gKHNob3J0KUxPV09SRChtc2cubFBhcmFtKTsKLSAg ICAgICAgICAgICAgICBwdC55ID0gKHNob3J0KUhJV09SRChtc2cubFBhcmFtKTsKLSAgICAgICAg ICAgICAgICA6Ok1hcFdpbmRvd1BvaW50cyhtc2cuaHduZCwgbV9wb3B1cCwgJnB0LCAxKTsKLSAg ICAgICAgICAgICAgICBtc2cubFBhcmFtID0gTUFLRUxQQVJBTShwdC54LCBwdC55KTsKKyAgICAg ICAgICAgICAgICAvLyBUcmFuc2xhdGUgdGhlIGNvb3JkaW5hdGUuCisgICAgICAgICAgICAgICAg dHJhbnNsYXRlUG9pbnQobXNnLmxQYXJhbSwgbXNnLmh3bmQsIG1fcG9wdXApOworCiAgICAgICAg ICAgICAgICAgbXNnLmh3bmQgPSBtX3BvcHVwOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgfQpAQCAtMjMwLDYgKzI0Myw5IEBAIHZvaWQgUG9wdXBNZW51OjpzaG93KGNvbnN0 IEludFJlY3QmIHIsIEYKICAgICAgICAgOjpUcmFuc2xhdGVNZXNzYWdlKCZtc2cpOwogICAgICAg ICA6OkRpc3BhdGNoTWVzc2FnZSgmbXNnKTsKIAorICAgICAgICBpZiAoIW1fcG9wdXBDbGllbnQp CisgICAgICAgICAgICBicmVhazsKKwogICAgICAgICBpZiAoIW1fc2hvd1BvcHVwKQogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIGFjdGl2ZVdpbmRvdyA9IDo6R2V0QWN0aXZlV2luZG93KCk7 CkBAIC04ODAsNiArODk2LDE3IEBAIExSRVNVTFQgUG9wdXBNZW51Ojp3bmRQcm9jKEhXTkQgaFdu ZCwgVUkKIAogICAgICAgICAgICAgUkVDVCBib3VuZHM7CiAgICAgICAgICAgICBHZXRDbGllbnRS ZWN0KHBvcHVwSGFuZGxlKCksICZib3VuZHMpOworICAgICAgICAgICAgaWYgKCE6OlB0SW5SZWN0 KCZib3VuZHMsIG1vdXNlUG9pbnQpICYmICEod1BhcmFtICYgTUtfTEJVVFRPTikgJiYgY2xpZW50 KCkpIHsKKyAgICAgICAgICAgICAgICAvLyBXaGVuIHRoZSBtb3VzZSBpcyBub3QgaW5zaWRlIHRo ZSBwb3B1cCBtZW51IGFuZCB0aGUgbGVmdCBidXR0b24gaXNuJ3QgZG93biwganVzdAorICAgICAg ICAgICAgICAgIC8vIHJlcG9zdCB0aGUgbWVzc2FnZSB0byB0aGUgd2ViIHZpZXcuCisKKyAgICAg ICAgICAgICAgICAvLyBUcmFuc2xhdGUgdGhlIGNvb3JkaW5hdGUuCisgICAgICAgICAgICAgICAg dHJhbnNsYXRlUG9pbnQobFBhcmFtLCBtX3BvcHVwLCBjbGllbnQoKS0+aG9zdFdpbmRvdygpLT5w bGF0Zm9ybVdpbmRvdygpKTsKKworICAgICAgICAgICAgICAgIDo6UG9zdE1lc3NhZ2UobV9wb3B1 cCwgV01fSE9TVF9XSU5ET1dfTU9VU0VNT1ZFLCB3UGFyYW0sIGxQYXJhbSk7CisgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIGlmICgoc2hvdWxkSG90 VHJhY2sgfHwgd1BhcmFtICYgTUtfTEJVVFRPTikgJiYgOjpQdEluUmVjdCgmYm91bmRzLCBtb3Vz ZVBvaW50KSkKICAgICAgICAgICAgICAgICBzZXRGb2N1c2VkSW5kZXgobGlzdEluZGV4QXRQb2lu dChtb3VzZVBvaW50KSwgdHJ1ZSk7