54375 2011-02-13 23:26:51 -0800 [Chromium] REGRESSION(r77370): Wrong right offset for RTL popup 2011-02-14 05:12:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 honten webkit-unassigned commit-queue honten tkent oldest_to_newest 350530 0 honten 2011-02-13 23:26:51 -0800 [Chromium] Fix wrong popup position for RTL(again) 350532 1 82288 honten 2011-02-13 23:31:25 -0800 Created attachment 82288 Patch 350533 2 honten 2011-02-13 23:33:13 -0800 Could you review again? As I wrote ChangeLog, the bug is introduced by previous RTL fix and not good for the fix http://codereview.chromium.org/6024008/. 350537 3 82288 tkent 2011-02-13 23:48:08 -0800 Comment on attachment 82288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82288&action=review > Source/WebCore/ChangeLog:8 > + No new tests. (OOPS!) Please remove this line. > Source/WebCore/ChangeLog:15 > + (WebCore::PopupContainer::layoutAndCalculateWidgetRect): Change the input parameter to take |popupInitialCoordinate| again. And calculate correct right position with returned right offset from layoutAndRightOffset(). We don't use the || notation in WebKit. Please remove it. > Source/WebCore/ChangeLog:17 > + (WebCore::PopupContainer::layoutAndRightOffset): Change the name from layout() and to return |rightOffset| value. ditto. > Source/WebCore/platform/chromium/PopupMenuChromium.cpp:351 > + // Use |popupInitialCoordinate.x()| + |rightOffset| because RTL position ditto. > Source/WebCore/platform/chromium/PopupMenuChromium.cpp:415 > +int PopupContainer::layoutAndRightOffset() The name layoutAndRightOffset() looks curious. Maybe layoutAndGetRightOffset() is better? 350547 4 82293 honten 2011-02-14 00:23:47 -0800 Created attachment 82293 Patch 350548 5 82293 honten 2011-02-14 00:24:09 -0800 Comment on attachment 82293 Patch Please review again. 350549 6 honten 2011-02-14 00:24:34 -0800 Oops, just a moment. (In reply to comment #5) > (From update of attachment 82293 [details]) > Please review again. 350550 7 82293 tkent 2011-02-14 00:25:54 -0800 Comment on attachment 82293 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82293&action=review > Source/WebCore/platform/chromium/PopupMenuChromium.cpp:351 > + // Use |popupInitialCoordinate.x()| + |rightOffset| because RTL position Please remove ||||. 350552 8 82294 honten 2011-02-14 00:27:35 -0800 Created attachment 82294 Patch 350553 9 82294 honten 2011-02-14 00:28:04 -0800 Comment on attachment 82294 Patch Deleted || notation. Please review. 350600 10 82294 commit-queue 2011-02-14 05:12:11 -0800 Comment on attachment 82294 Patch Clearing flags on attachment: 82294 Committed r78467: <http://trac.webkit.org/changeset/78467> 350601 11 commit-queue 2011-02-14 05:12:16 -0800 All reviewed patches have been landed. Closing bug. 82288 2011-02-13 23:31:25 -0800 2011-02-14 00:23:44 -0800 Patch bug-54375-20110213233124.patch text/plain 7601 honten ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YWZiZjE5NzFiOTY5ZWVkYTUwMzYwMjM1M2Y1OGQ5ZTZjZTExYjNiLi44 YmNlOTg1YzRlOWY0MDI4MjBlYmVkOWExOTQwMGI1ZDBlMDc5YTYzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTEtMDItMTMgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBGaXggd3JvbmcgcG9wdXAgcG9zaXRpb24gZm9yIFJUTChhZ2FpbikKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzc1CisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgRml4IHJpZ2h0IHBvc2l0aW9uIGJ1 ZyBpbnRyb2R1Y2UgYnkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUz NTY3LCBiZWNhdXNlIHRoZSBwcmV2aW91cyBmaXggd2FzIGNvcnJlY3QgZm9yIHRoZSBjdXJyZW50 IGJlaGF2aW91ciwgYnV0IG5vdCBnb29kIGZvciBodHRwOi8vY3JidWcuY29tLzYwNDI3LiBUbyBj YWxjdWxhdGUgdGhlIGNvcnJlY3QgcmlnaHQgb2Zmc2V0IHZhbHVlIGFuZCBhcHBseSB0byB0aGUg cG9zaXRpb24sIGNoYW5nZSBXZWJDb3JlOjpQb3B1cENvbnRhaW5lcjo6bGF5b3V0KCkgdG8gcmV0 dXJuIHJpZ2h0IG9mZnNldCB2YWx1ZSBhbmQgdXNlIHRoZSByZXR1cm5lZCB2YWx1ZSB0byBjYWxj dWxhdGUgcG9zaXRpb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBIb3dldmVyIHdlIGNhbiBj aGVjayBtYW51YWxseSB3aXRoIHNlbGVjdF9kcm9wZG93bl9ib3hfYWxpZ25tZW50Lmh0bWwsIGF1 dG9maWxsX2FsaWdubWVudC5odG1sLCBzZWxlY3RfYWxpZ25tZW50Lmh0bWwsIHNlbGVjdF9kcm9w ZG93bl9ib3hfYWxpZ25tZW50Lmh0bWwsIGF1dG9maWxsLXBvcHVwLXdpZHRoLWFuZC1pdGVtLWRp cmVjdGlvbi5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJv bWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2Fs Y3VsYXRlV2lkZ2V0UmVjdCk6IENoYW5nZSB0aGUgaW5wdXQgcGFyYW1ldGVyIHRvIHRha2UgfHBv cHVwSW5pdGlhbENvb3JkaW5hdGV8IGFnYWluLiBBbmQgY2FsY3VsYXRlIGNvcnJlY3QgcmlnaHQg cG9zaXRpb24gd2l0aCByZXR1cm5lZCByaWdodCBvZmZzZXQgZnJvbSBsYXlvdXRBbmRSaWdodE9m ZnNldCgpLgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBDb250YWluZXI6OnNob3dQb3B1cCk6IENo YW5nZSB0aGUgcGFzc2luZyBwYXJhbWV0ZXIgdG8gbGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVj dCgpLgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBDb250YWluZXI6OmxheW91dEFuZFJpZ2h0T2Zm c2V0KTogQ2hhbmdlIHRoZSBuYW1lIGZyb20gbGF5b3V0KCkgYW5kIHRvIHJldHVybiB8cmlnaHRP ZmZzZXR8IHZhbHVlLgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBDb250YWluZXI6OnJlZnJlc2gp OiBDaGFuZ2UgdGhlIHBhc3NpbmcgcGFyYW1ldGVyIHRvIGxheW91dEFuZENhbGN1bGF0ZVdpZGdl dFJlY3QoKS4KKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5o OiBDaGFuZ2UgdGhlIGZ1bmN0aW9uIG5hbWUgYW5kIHBhcmFtZXRlcnMuCisKIDIwMTEtMDItMTMg IEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1BvcHVwTWVudUNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAppbmRleCA1OTQ0MWQwYmU0YThiYTkwOWE1MzQyZTYy M2RkZDYzM2U4M2JkZTY3Li41NThjNzU2YTU2YmJmOTZiZGMzNTgxYjliN2U5MTdmYTdlZTNkOTAw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVD aHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBN ZW51Q2hyb21pdW0uY3BwCkBAIC0zMjgsNyArMzI4LDcgQEAgUG9wdXBDb250YWluZXI6On5Qb3B1 cENvbnRhaW5lcigpCiAgICAgICAgIHJlbW92ZUNoaWxkKG1fbGlzdEJveC5nZXQoKSk7CiB9CiAK LUludFJlY3QgUG9wdXBDb250YWluZXI6OmxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50 IHRhcmdldENvbnRyb2xIZWlnaHQsIGludCBwb3B1cEluaXRpYWxZKQorSW50UmVjdCBQb3B1cENv bnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhl aWdodCwgY29uc3QgSW50UG9pbnQmIHBvcHVwSW5pdGlhbENvb3JkaW5hdGUpCiB7CiAgICAgLy8g UmVzZXQgdGhlIG1heCBoZWlnaHQgdG8gaXRzIGRlZmF1bHQgdmFsdWUsIGl0IHdpbGwgYmUgcmVj b21wdXRlZCBiZWxvdwogICAgIC8vIGlmIG5lY2Vzc2FyeS4KQEAgLTMzNiw4ICszMzYsOCBAQCBJ bnRSZWN0IFBvcHVwQ29udGFpbmVyOjpsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KGludCB0 YXJnZXRDb250cm9sSGVpZ2h0LCBpbgogCiAgICAgLy8gTGF5IGV2ZXJ5dGhpbmcgb3V0IHRvIGZp Z3VyZSBvdXQgb3VyIHByZWZlcnJlZCBzaXplLCB0aGVuIHRlbGwgdGhlIHZpZXcncwogICAgIC8v IFdpZGdldENsaWVudCBhYm91dCBpdC4gIEl0IHNob3VsZCBhc3NpZ24gdXMgYSBjbGllbnQuCi0g ICAgbGF5b3V0KCk7Ci0gIAorICAgIGludCByaWdodE9mZnNldCA9IGxheW91dEFuZFJpZ2h0T2Zm c2V0KCk7CisKICAgICAvLyBBc3N1bWUgbV9saXN0Qm94IHNpemUgaXMgYWxyZWFkeSBjYWxjdWxh dGVkLgogICAgIEludFNpemUgdGFyZ2V0U2l6ZShtX2xpc3RCb3gtPndpZHRoKCkgKyBrQm9yZGVy U2l6ZSAqIDIsCiAgICAgICAgICAgICAgICAgICAgICAgIG1fbGlzdEJveC0+aGVpZ2h0KCkgKyBr Qm9yZGVyU2l6ZSAqIDIpOwpAQCAtMzQ4LDkgKzM0OCw5IEBAIEludFJlY3QgUG9wdXBDb250YWlu ZXI6OmxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50IHRhcmdldENvbnRyb2xIZWlnaHQs IGluCiAgICAgICAgIC8vIElmIHRoZSBwb3B1cCB3b3VsZCBleHRlbmQgcGFzdCB0aGUgYm90dG9t IG9mIHRoZSBzY3JlZW4sIG9wZW4gdXB3YXJkcwogICAgICAgICAvLyBpbnN0ZWFkLgogICAgICAg ICBGbG9hdFJlY3Qgc2NyZWVuID0gc2NyZWVuQXZhaWxhYmxlUmVjdChtX2ZyYW1lVmlldy5nZXQo KSk7Ci0gICAgICAgIC8vIFVzZSB0aGlzOjp4KCkgZm9yIGxvY2F0aW9uIGJlY2F1c2UgUlRMIHBv c2l0aW9uIGlzIGNvbnNpZGVyZWQKLSAgICAgICAgLy8gaW4gbGF5b3V0KCkuCi0gICAgICAgIHdp ZGdldFJlY3QgPSBjaHJvbWVDbGllbnQtPndpbmRvd1RvU2NyZWVuKEludFJlY3QoeCgpLCBwb3B1 cEluaXRpYWxZLCB0YXJnZXRTaXplLndpZHRoKCksIHRhcmdldFNpemUuaGVpZ2h0KCkpKTsKKyAg ICAgICAgLy8gVXNlIHxwb3B1cEluaXRpYWxDb29yZGluYXRlLngoKXwgKyB8cmlnaHRPZmZzZXR8 IGJlY2F1c2UgUlRMIHBvc2l0aW9uCisgICAgICAgIC8vIG5lZWRzIHRvIGJlIGNvbnNpZGVyZWQu CisgICAgICAgIHdpZGdldFJlY3QgPSBjaHJvbWVDbGllbnQtPndpbmRvd1RvU2NyZWVuKEludFJl Y3QocG9wdXBJbml0aWFsQ29vcmRpbmF0ZS54KCkgKyByaWdodE9mZnNldCwgcG9wdXBJbml0aWFs Q29vcmRpbmF0ZS55KCksIHRhcmdldFNpemUud2lkdGgoKSwgdGFyZ2V0U2l6ZS5oZWlnaHQoKSkp OwogICAgICAgICBpZiAod2lkZ2V0UmVjdC5tYXhZKCkgPiBzdGF0aWNfY2FzdDxpbnQ+KHNjcmVl bi5tYXhZKCkpKSB7CiAgICAgICAgICAgICBpZiAod2lkZ2V0UmVjdC55KCkgLSB3aWRnZXRSZWN0 LmhlaWdodCgpIC0gdGFyZ2V0Q29udHJvbEhlaWdodCA+IDApIHsKICAgICAgICAgICAgICAgICAv LyBUaGVyZSBpcyBlbm91Z2ggcm9vbSB0byBvcGVuIHVwd2FyZHMuCkBAIC0zNjQsNyArMzY0LDcg QEAgSW50UmVjdCBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChp bnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgaW4KICAgICAgICAgICAgICAgICAgICAgbV9saXN0Qm94 LT5zZXRNYXhIZWlnaHQoc3BhY2VBYm92ZSk7CiAgICAgICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgICAgICBtX2xpc3RCb3gtPnNldE1heEhlaWdodChzcGFjZUJlbG93KTsKLSAgICAg ICAgICAgICAgICBsYXlvdXQoKTsKKyAgICAgICAgICAgICAgICBsYXlvdXRBbmRSaWdodE9mZnNl dCgpOwogICAgICAgICAgICAgICAgIC8vIE91ciBzaXplIGhhcyBjaGFuZ2VkLCByZWNvbXB1dGUg dGhlIHdpZGdldFJlY3QuCiAgICAgICAgICAgICAgICAgd2lkZ2V0UmVjdCA9IGNocm9tZUNsaWVu dC0+d2luZG93VG9TY3JlZW4oZnJhbWVSZWN0KCkpOwogICAgICAgICAgICAgICAgIC8vIEFuZCBt b3ZlIHVwd2FyZHMgaWYgbmVjZXNzYXJ5LgpAQCAtMzgzLDcgKzM4Myw3IEBAIHZvaWQgUG9wdXBD b250YWluZXI6OnNob3dQb3B1cChGcmFtZVZpZXcqIHZpZXcpCiAgICAgQ2hyb21lQ2xpZW50Q2hy b21pdW0qIGNocm9tZUNsaWVudCA9IGNocm9tZUNsaWVudENocm9taXVtKCk7CiAgICAgaWYgKGNo cm9tZUNsaWVudCkgewogICAgICAgICBJbnRSZWN0IHBvcHVwUmVjdCA9IGZyYW1lUmVjdCgpOwot ICAgICAgICBjaHJvbWVDbGllbnQtPnBvcHVwT3BlbmVkKHRoaXMsIGxheW91dEFuZENhbGN1bGF0 ZVdpZGdldFJlY3QocG9wdXBSZWN0LmhlaWdodCgpLCBwb3B1cFJlY3QueSgpKSwgZmFsc2UpOwor ICAgICAgICBjaHJvbWVDbGllbnQtPnBvcHVwT3BlbmVkKHRoaXMsIGxheW91dEFuZENhbGN1bGF0 ZVdpZGdldFJlY3QocG9wdXBSZWN0LmhlaWdodCgpLCBwb3B1cFJlY3QubG9jYXRpb24oKSksIGZh bHNlKTsKICAgICAgICAgbV9wb3B1cE9wZW4gPSB0cnVlOwogICAgIH0KIApAQCAtNDEyLDcgKzQx Miw3IEBAIHZvaWQgUG9wdXBDb250YWluZXI6Om5vdGlmeVBvcHVwSGlkZGVuKCkKICAgICBjaHJv bWVDbGllbnRDaHJvbWl1bSgpLT5wb3B1cENsb3NlZCh0aGlzKTsKIH0KIAotdm9pZCBQb3B1cENv bnRhaW5lcjo6bGF5b3V0KCkKK2ludCBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kUmlnaHRPZmZz ZXQoKQogewogICAgIG1fbGlzdEJveC0+bGF5b3V0KCk7CiAKQEAgLTQyOSwxMiArNDI5LDE1IEBA IHZvaWQgUG9wdXBDb250YWluZXI6OmxheW91dCgpCiAgICAgLy8gb2YgZHJvcGRvd24gYm94IHNo b3VsZCBiZSBhbGlnbmVkIHdpdGggdGhlIHJpZ2h0IGVkZ2Ugb2YgPHNlbGVjdD4gZWxlbWVudCBi b3gsCiAgICAgLy8gYW5kIHRoZSBkcm9wZG93biBib3ggc2hvdWxkIGJlIGV4cGFuZGVkIHRvIGxl ZnQgaWYgbW9yZSBzcGFjZSBuZWVkZWQuCiAgICAgUG9wdXBNZW51Q2xpZW50KiBwb3B1cENsaWVu dCA9IG1fbGlzdEJveC0+bV9wb3B1cENsaWVudDsKKyAgICBpbnQgcmlnaHRPZmZzZXQgPSAwOwog ICAgIGlmIChwb3B1cENsaWVudCkgewogICAgICAgICBib29sIHJpZ2h0QWxpZ25lZCA9IG1fbGlz dEJveC0+bV9wb3B1cENsaWVudC0+bWVudVN0eWxlKCkudGV4dERpcmVjdGlvbigpID09IFJUTDsK ICAgICAgICAgaWYgKHJpZ2h0QWxpZ25lZCkKLSAgICAgICAgICAgIG1vdmUoeCgpICsgcG9wdXBX aWR0aCAtIGxpc3RCb3hXaWR0aCwgeSgpKTsKKyAgICAgICAgICAgIHJpZ2h0T2Zmc2V0ID0gcG9w dXBXaWR0aCAtIGxpc3RCb3hXaWR0aDsKICAgICB9CiAgICAgaW52YWxpZGF0ZSgpOworCisgICAg cmV0dXJuIHJpZ2h0T2Zmc2V0OwogfQogCiBib29sIFBvcHVwQ29udGFpbmVyOjpoYW5kbGVNb3Vz ZURvd25FdmVudChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KQpAQCAtNTUzLDcgKzU1 Niw3IEBAIHZvaWQgUG9wdXBDb250YWluZXI6OnJlZnJlc2goY29uc3QgSW50UmVjdCYgdGFyZ2V0 Q29udHJvbFJlY3QpCiAgICAgbGlzdEJveCgpLT51cGRhdGVGcm9tRWxlbWVudCgpOwogICAgIC8v IFN0b3JlIHRoZSBvcmlnaW5hbCBoZWlnaHQgdG8gY2hlY2sgaWYgd2UgbmVlZCB0byByZXF1ZXN0 IHRoZSBsb2NhdGlvbi4KICAgICBpbnQgb3JpZ2luYWxIZWlnaHQgPSBoZWlnaHQoKTsKLSAgICBJ bnRSZWN0IHdpZGdldFJlY3QgPSBsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KHRhcmdldENv bnRyb2xSZWN0LmhlaWdodCgpLCBsb2NhdGlvbi55KCkpOworICAgIEludFJlY3Qgd2lkZ2V0UmVj dCA9IGxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QodGFyZ2V0Q29udHJvbFJlY3QuaGVpZ2h0 KCksIGxvY2F0aW9uKTsKICAgICBpZiAob3JpZ2luYWxIZWlnaHQgIT0gd2lkZ2V0UmVjdC5oZWln aHQoKSkKICAgICAgICAgc2V0RnJhbWVSZWN0KHdpZGdldFJlY3QpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaAppbmRleCA0 M2I4YjBlMDEyNTAwOWRjOTFhOTkxMGQ1OGI1Yjk1ZDAzZWU2MTM3Li44OWMzNzIxZDQ0OTFkMjY3 ZjE0NmY3MTFiMjBkNjA2ZmJmMDNkZmExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKQEAgLTE0Miw3ICsxNDIsNyBAQCBw dWJsaWM6CiAgICAgdm9pZCBub3RpZnlQb3B1cEhpZGRlbigpOwogCiAgICAgLy8gQ29tcHV0ZSBz aXplIG9mIHdpZGdldCBhbmQgY2hpbGRyZW4uCi0gICAgdm9pZCBsYXlvdXQoKTsKKyAgICBpbnQg bGF5b3V0QW5kUmlnaHRPZmZzZXQoKTsKIAogICAgIFBvcHVwTGlzdEJveCogbGlzdEJveCgpIGNv bnN0IHsgcmV0dXJuIG1fbGlzdEJveC5nZXQoKTsgfQogCkBAIC0xNzcsNyArMTc3LDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIHBhaW50Qm9yZGVyKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJl Y3QmKTsKIAogICAgIC8vIExheW91dCBhbmQgY2FsY3VsYXRlIHBvcHVwIHdpZGdldCBzaXplIGFu ZCBsb2NhdGlvbiBhbmQgcmV0dXJucyBpdCBhcyBJbnRSZWN0LgotICAgIEludFJlY3QgbGF5b3V0 QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgaW50IHBvcHVw SW5pdGlhbFkpOworICAgIEludFJlY3QgbGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChpbnQg dGFyZ2V0Q29udHJvbEhlaWdodCwgY29uc3QgSW50UG9pbnQmIHBvcHVwSW5pdGlhbENvb3JkaW5h dGUpOwogCiAgICAgLy8gUmV0dXJucyB0aGUgQ2hyb21lQ2xpZW50IG9mIHRoZSBwYWdlIHRoaXMg cG9wdXAgaXMgYXNzb2NpYXRlZCB3aXRoLgogICAgIENocm9tZUNsaWVudENocm9taXVtKiBjaHJv bWVDbGllbnRDaHJvbWl1bSgpOwo= 82293 2011-02-14 00:23:47 -0800 2011-02-14 00:27:32 -0800 Patch bug-54375-20110214002345.patch text/plain 7686 honten ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YWZiZjE5NzFiOTY5ZWVkYTUwMzYwMjM1M2Y1OGQ5ZTZjZTExYjNiLi4w MmU1MjMyYTZhNGU4NTUwNDUyOTIxZmZhZDU4NTAxMzk4ODk4M2M4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTEtMDItMTMgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBGaXggd3JvbmcgcG9wdXAgcG9zaXRpb24gZm9yIFJUTChhZ2FpbikKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzc1CisKKyAgICAg ICAgRml4IHJpZ2h0IHBvc2l0aW9uIGJ1ZyBpbnRyb2R1Y2UgYnkgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUzNTY3LCBiZWNhdXNlIHRoZSBwcmV2aW91cyBmaXggd2Fz IGNvcnJlY3QgZm9yIHRoZSBjdXJyZW50IGJlaGF2aW91ciwgYnV0IG5vdCBnb29kIGZvciBodHRw Oi8vY3JidWcuY29tLzYwNDI3LiBUbyBjYWxjdWxhdGUgdGhlIGNvcnJlY3QgcmlnaHQgb2Zmc2V0 IHZhbHVlIGFuZCBhcHBseSB0byB0aGUgcG9zaXRpb24sIGNoYW5nZSBXZWJDb3JlOjpQb3B1cENv bnRhaW5lcjo6bGF5b3V0KCkgdG8gcmV0dXJuIHJpZ2h0IG9mZnNldCB2YWx1ZSBhbmQgdXNlIHRo ZSByZXR1cm5lZCB2YWx1ZSB0byBjYWxjdWxhdGUgcG9zaXRpb24uCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBIb3dldmVyIHdlIGNhbiBjaGVjayBtYW51YWxseSB3aXRoIHNlbGVjdF9kcm9wZG93 bl9ib3hfYWxpZ25tZW50Lmh0bWwsIGF1dG9maWxsX2FsaWdubWVudC5odG1sLCBzZWxlY3RfYWxp Z25tZW50Lmh0bWwsIHNlbGVjdF9kcm9wZG93bl9ib3hfYWxpZ25tZW50Lmh0bWwsIGF1dG9maWxs LXBvcHVwLXdpZHRoLWFuZC1pdGVtLWRpcmVjdGlvbi5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9y bS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1 cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCk6IENoYW5nZSB0aGUgaW5w dXQgcGFyYW1ldGVyIHRvIHRha2UgcG9wdXBJbml0aWFsQ29vcmRpbmF0ZSBhZ2Fpbi4gQW5kIGNh bGN1bGF0ZSBjb3JyZWN0IHJpZ2h0IHBvc2l0aW9uIHdpdGggcmV0dXJuZWQgcmlnaHQgb2Zmc2V0 IGZyb20gbGF5b3V0QW5kR2V0UmlnaHRPZmZzZXQoKS4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVw Q29udGFpbmVyOjpzaG93UG9wdXApOiBDaGFuZ2UgdGhlIHBhc3NpbmcgcGFyYW1ldGVyIHRvIGxh eW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoKS4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29u dGFpbmVyOjpsYXlvdXRBbmRHZXRSaWdodE9mZnNldCk6IENoYW5nZSB0aGUgbmFtZSBmcm9tIGxh eW91dCgpIGFuZCB0byByZXR1cm4gcmlnaHRPZmZzZXQgdmFsdWUuCisgICAgICAgIChXZWJDb3Jl OjpQb3B1cENvbnRhaW5lcjo6cmVmcmVzaCk6IENoYW5nZSB0aGUgcGFzc2luZyBwYXJhbWV0ZXIg dG8gbGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCgpLgorICAgICAgICAqIHBsYXRmb3JtL2No cm9taXVtL1BvcHVwTWVudUNocm9taXVtLmg6IENoYW5nZSB0aGUgZnVuY3Rpb24gbmFtZSBhbmQg cGFyYW1ldGVycy4KKwogMjAxMS0wMi0xMyAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGlyayBTY2h1bHplLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmluZGV4 IDU5NDQxZDBiZTRhOGJhOTA5YTUzNDJlNjIzZGRkNjMzZTgzYmRlNjcuLmViOWM1NGVhNDE5ZWEx MmVjMTg4NmZkNmRhM2JhNWU1YTRkYzhkYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTMyOCw3ICszMjgs NyBAQCBQb3B1cENvbnRhaW5lcjo6flBvcHVwQ29udGFpbmVyKCkKICAgICAgICAgcmVtb3ZlQ2hp bGQobV9saXN0Qm94LmdldCgpKTsKIH0KIAotSW50UmVjdCBQb3B1cENvbnRhaW5lcjo6bGF5b3V0 QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgaW50IHBvcHVw SW5pdGlhbFkpCitJbnRSZWN0IFBvcHVwQ29udGFpbmVyOjpsYXlvdXRBbmRDYWxjdWxhdGVXaWRn ZXRSZWN0KGludCB0YXJnZXRDb250cm9sSGVpZ2h0LCBjb25zdCBJbnRQb2ludCYgcG9wdXBJbml0 aWFsQ29vcmRpbmF0ZSkKIHsKICAgICAvLyBSZXNldCB0aGUgbWF4IGhlaWdodCB0byBpdHMgZGVm YXVsdCB2YWx1ZSwgaXQgd2lsbCBiZSByZWNvbXB1dGVkIGJlbG93CiAgICAgLy8gaWYgbmVjZXNz YXJ5LgpAQCAtMzM2LDggKzMzNiw4IEBAIEludFJlY3QgUG9wdXBDb250YWluZXI6OmxheW91dEFu ZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50IHRhcmdldENvbnRyb2xIZWlnaHQsIGluCiAKICAgICAv LyBMYXkgZXZlcnl0aGluZyBvdXQgdG8gZmlndXJlIG91dCBvdXIgcHJlZmVycmVkIHNpemUsIHRo ZW4gdGVsbCB0aGUgdmlldydzCiAgICAgLy8gV2lkZ2V0Q2xpZW50IGFib3V0IGl0LiAgSXQgc2hv dWxkIGFzc2lnbiB1cyBhIGNsaWVudC4KLSAgICBsYXlvdXQoKTsKLSAgCisgICAgaW50IHJpZ2h0 T2Zmc2V0ID0gbGF5b3V0QW5kR2V0UmlnaHRPZmZzZXQoKTsKKwogICAgIC8vIEFzc3VtZSBtX2xp c3RCb3ggc2l6ZSBpcyBhbHJlYWR5IGNhbGN1bGF0ZWQuCiAgICAgSW50U2l6ZSB0YXJnZXRTaXpl KG1fbGlzdEJveC0+d2lkdGgoKSArIGtCb3JkZXJTaXplICogMiwKICAgICAgICAgICAgICAgICAg ICAgICAgbV9saXN0Qm94LT5oZWlnaHQoKSArIGtCb3JkZXJTaXplICogMik7CkBAIC0zNDgsOSAr MzQ4LDkgQEAgSW50UmVjdCBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0 UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgaW4KICAgICAgICAgLy8gSWYgdGhlIHBvcHVw IHdvdWxkIGV4dGVuZCBwYXN0IHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbiwgb3BlbiB1cHdhcmRz CiAgICAgICAgIC8vIGluc3RlYWQuCiAgICAgICAgIEZsb2F0UmVjdCBzY3JlZW4gPSBzY3JlZW5B dmFpbGFibGVSZWN0KG1fZnJhbWVWaWV3LmdldCgpKTsKLSAgICAgICAgLy8gVXNlIHRoaXM6Ongo KSBmb3IgbG9jYXRpb24gYmVjYXVzZSBSVEwgcG9zaXRpb24gaXMgY29uc2lkZXJlZAotICAgICAg ICAvLyBpbiBsYXlvdXQoKS4KLSAgICAgICAgd2lkZ2V0UmVjdCA9IGNocm9tZUNsaWVudC0+d2lu ZG93VG9TY3JlZW4oSW50UmVjdCh4KCksIHBvcHVwSW5pdGlhbFksIHRhcmdldFNpemUud2lkdGgo KSwgdGFyZ2V0U2l6ZS5oZWlnaHQoKSkpOworICAgICAgICAvLyBVc2UgfHBvcHVwSW5pdGlhbENv b3JkaW5hdGUueCgpfCArIHxyaWdodE9mZnNldHwgYmVjYXVzZSBSVEwgcG9zaXRpb24KKyAgICAg ICAgLy8gbmVlZHMgdG8gYmUgY29uc2lkZXJlZC4KKyAgICAgICAgd2lkZ2V0UmVjdCA9IGNocm9t ZUNsaWVudC0+d2luZG93VG9TY3JlZW4oSW50UmVjdChwb3B1cEluaXRpYWxDb29yZGluYXRlLngo KSArIHJpZ2h0T2Zmc2V0LCBwb3B1cEluaXRpYWxDb29yZGluYXRlLnkoKSwgdGFyZ2V0U2l6ZS53 aWR0aCgpLCB0YXJnZXRTaXplLmhlaWdodCgpKSk7CiAgICAgICAgIGlmICh3aWRnZXRSZWN0Lm1h eFkoKSA+IHN0YXRpY19jYXN0PGludD4oc2NyZWVuLm1heFkoKSkpIHsKICAgICAgICAgICAgIGlm ICh3aWRnZXRSZWN0LnkoKSAtIHdpZGdldFJlY3QuaGVpZ2h0KCkgLSB0YXJnZXRDb250cm9sSGVp Z2h0ID4gMCkgewogICAgICAgICAgICAgICAgIC8vIFRoZXJlIGlzIGVub3VnaCByb29tIHRvIG9w ZW4gdXB3YXJkcy4KQEAgLTM2NCw3ICszNjQsNyBAQCBJbnRSZWN0IFBvcHVwQ29udGFpbmVyOjps YXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KGludCB0YXJnZXRDb250cm9sSGVpZ2h0LCBpbgog ICAgICAgICAgICAgICAgICAgICBtX2xpc3RCb3gtPnNldE1heEhlaWdodChzcGFjZUFib3ZlKTsK ICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIG1fbGlzdEJveC0+c2V0 TWF4SGVpZ2h0KHNwYWNlQmVsb3cpOwotICAgICAgICAgICAgICAgIGxheW91dCgpOworICAgICAg ICAgICAgICAgIGxheW91dEFuZEdldFJpZ2h0T2Zmc2V0KCk7CiAgICAgICAgICAgICAgICAgLy8g T3VyIHNpemUgaGFzIGNoYW5nZWQsIHJlY29tcHV0ZSB0aGUgd2lkZ2V0UmVjdC4KICAgICAgICAg ICAgICAgICB3aWRnZXRSZWN0ID0gY2hyb21lQ2xpZW50LT53aW5kb3dUb1NjcmVlbihmcmFtZVJl Y3QoKSk7CiAgICAgICAgICAgICAgICAgLy8gQW5kIG1vdmUgdXB3YXJkcyBpZiBuZWNlc3Nhcnku CkBAIC0zODMsNyArMzgzLDcgQEAgdm9pZCBQb3B1cENvbnRhaW5lcjo6c2hvd1BvcHVwKEZyYW1l VmlldyogdmlldykKICAgICBDaHJvbWVDbGllbnRDaHJvbWl1bSogY2hyb21lQ2xpZW50ID0gY2hy b21lQ2xpZW50Q2hyb21pdW0oKTsKICAgICBpZiAoY2hyb21lQ2xpZW50KSB7CiAgICAgICAgIElu dFJlY3QgcG9wdXBSZWN0ID0gZnJhbWVSZWN0KCk7Ci0gICAgICAgIGNocm9tZUNsaWVudC0+cG9w dXBPcGVuZWQodGhpcywgbGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChwb3B1cFJlY3QuaGVp Z2h0KCksIHBvcHVwUmVjdC55KCkpLCBmYWxzZSk7CisgICAgICAgIGNocm9tZUNsaWVudC0+cG9w dXBPcGVuZWQodGhpcywgbGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChwb3B1cFJlY3QuaGVp Z2h0KCksIHBvcHVwUmVjdC5sb2NhdGlvbigpKSwgZmFsc2UpOwogICAgICAgICBtX3BvcHVwT3Bl biA9IHRydWU7CiAgICAgfQogCkBAIC00MTIsNyArNDEyLDcgQEAgdm9pZCBQb3B1cENvbnRhaW5l cjo6bm90aWZ5UG9wdXBIaWRkZW4oKQogICAgIGNocm9tZUNsaWVudENocm9taXVtKCktPnBvcHVw Q2xvc2VkKHRoaXMpOwogfQogCi12b2lkIFBvcHVwQ29udGFpbmVyOjpsYXlvdXQoKQoraW50IFBv cHVwQ29udGFpbmVyOjpsYXlvdXRBbmRHZXRSaWdodE9mZnNldCgpCiB7CiAgICAgbV9saXN0Qm94 LT5sYXlvdXQoKTsKIApAQCAtNDI5LDEyICs0MjksMTUgQEAgdm9pZCBQb3B1cENvbnRhaW5lcjo6 bGF5b3V0KCkKICAgICAvLyBvZiBkcm9wZG93biBib3ggc2hvdWxkIGJlIGFsaWduZWQgd2l0aCB0 aGUgcmlnaHQgZWRnZSBvZiA8c2VsZWN0PiBlbGVtZW50IGJveCwKICAgICAvLyBhbmQgdGhlIGRy b3Bkb3duIGJveCBzaG91bGQgYmUgZXhwYW5kZWQgdG8gbGVmdCBpZiBtb3JlIHNwYWNlIG5lZWRl ZC4KICAgICBQb3B1cE1lbnVDbGllbnQqIHBvcHVwQ2xpZW50ID0gbV9saXN0Qm94LT5tX3BvcHVw Q2xpZW50OworICAgIGludCByaWdodE9mZnNldCA9IDA7CiAgICAgaWYgKHBvcHVwQ2xpZW50KSB7 CiAgICAgICAgIGJvb2wgcmlnaHRBbGlnbmVkID0gbV9saXN0Qm94LT5tX3BvcHVwQ2xpZW50LT5t ZW51U3R5bGUoKS50ZXh0RGlyZWN0aW9uKCkgPT0gUlRMOwogICAgICAgICBpZiAocmlnaHRBbGln bmVkKQotICAgICAgICAgICAgbW92ZSh4KCkgKyBwb3B1cFdpZHRoIC0gbGlzdEJveFdpZHRoLCB5 KCkpOworICAgICAgICAgICAgcmlnaHRPZmZzZXQgPSBwb3B1cFdpZHRoIC0gbGlzdEJveFdpZHRo OwogICAgIH0KICAgICBpbnZhbGlkYXRlKCk7CisKKyAgICByZXR1cm4gcmlnaHRPZmZzZXQ7CiB9 CiAKIGJvb2wgUG9wdXBDb250YWluZXI6OmhhbmRsZU1vdXNlRG93bkV2ZW50KGNvbnN0IFBsYXRm b3JtTW91c2VFdmVudCYgZXZlbnQpCkBAIC01NTMsNyArNTU2LDcgQEAgdm9pZCBQb3B1cENvbnRh aW5lcjo6cmVmcmVzaChjb25zdCBJbnRSZWN0JiB0YXJnZXRDb250cm9sUmVjdCkKICAgICBsaXN0 Qm94KCktPnVwZGF0ZUZyb21FbGVtZW50KCk7CiAgICAgLy8gU3RvcmUgdGhlIG9yaWdpbmFsIGhl aWdodCB0byBjaGVjayBpZiB3ZSBuZWVkIHRvIHJlcXVlc3QgdGhlIGxvY2F0aW9uLgogICAgIGlu dCBvcmlnaW5hbEhlaWdodCA9IGhlaWdodCgpOwotICAgIEludFJlY3Qgd2lkZ2V0UmVjdCA9IGxh eW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QodGFyZ2V0Q29udHJvbFJlY3QuaGVpZ2h0KCksIGxv Y2F0aW9uLnkoKSk7CisgICAgSW50UmVjdCB3aWRnZXRSZWN0ID0gbGF5b3V0QW5kQ2FsY3VsYXRl V2lkZ2V0UmVjdCh0YXJnZXRDb250cm9sUmVjdC5oZWlnaHQoKSwgbG9jYXRpb24pOwogICAgIGlm IChvcmlnaW5hbEhlaWdodCAhPSB3aWRnZXRSZWN0LmhlaWdodCgpKQogICAgICAgICBzZXRGcmFt ZVJlY3Qod2lkZ2V0UmVjdCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCmluZGV4IDQzYjhiMGUwMTI1MDA5ZGM5MWE5OTEw ZDU4YjViOTVkMDNlZTYxMzcuLjNkNTU2ODY4MjI1YWUzMmE0MTJhYjk1NGYzNDNjMDY3ZTA0YTRi NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVu dUNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBN ZW51Q2hyb21pdW0uaApAQCAtMTQxLDggKzE0MSw4IEBAIHB1YmxpYzoKICAgICAvLyBUaGUgcG9w dXAgd2FzIGhpZGRlbi4KICAgICB2b2lkIG5vdGlmeVBvcHVwSGlkZGVuKCk7CiAKLSAgICAvLyBD b21wdXRlIHNpemUgb2Ygd2lkZ2V0IGFuZCBjaGlsZHJlbi4KLSAgICB2b2lkIGxheW91dCgpOwor ICAgIC8vIENvbXB1dGUgc2l6ZSBvZiB3aWRnZXQgYW5kIGNoaWxkcmVuLiBSZXR1cm4gcmlnaHQg b2Zmc2V0IGZvciBSVEwuCisgICAgaW50IGxheW91dEFuZEdldFJpZ2h0T2Zmc2V0KCk7CiAKICAg ICBQb3B1cExpc3RCb3gqIGxpc3RCb3goKSBjb25zdCB7IHJldHVybiBtX2xpc3RCb3guZ2V0KCk7 IH0KIApAQCAtMTc3LDcgKzE3Nyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwYWludEJvcmRlcihH cmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0Jik7CiAKICAgICAvLyBMYXlvdXQgYW5kIGNh bGN1bGF0ZSBwb3B1cCB3aWRnZXQgc2l6ZSBhbmQgbG9jYXRpb24gYW5kIHJldHVybnMgaXQgYXMg SW50UmVjdC4KLSAgICBJbnRSZWN0IGxheW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50IHRh cmdldENvbnRyb2xIZWlnaHQsIGludCBwb3B1cEluaXRpYWxZKTsKKyAgICBJbnRSZWN0IGxheW91 dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50IHRhcmdldENvbnRyb2xIZWlnaHQsIGNvbnN0IElu dFBvaW50JiBwb3B1cEluaXRpYWxDb29yZGluYXRlKTsKIAogICAgIC8vIFJldHVybnMgdGhlIENo cm9tZUNsaWVudCBvZiB0aGUgcGFnZSB0aGlzIHBvcHVwIGlzIGFzc29jaWF0ZWQgd2l0aC4KICAg ICBDaHJvbWVDbGllbnRDaHJvbWl1bSogY2hyb21lQ2xpZW50Q2hyb21pdW0oKTsK 82294 2011-02-14 00:27:35 -0800 2011-02-14 05:12:11 -0800 Patch bug-54375-20110214002734.patch text/plain 7682 honten ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YWZiZjE5NzFiOTY5ZWVkYTUwMzYwMjM1M2Y1OGQ5ZTZjZTExYjNiLi4w MmU1MjMyYTZhNGU4NTUwNDUyOTIxZmZhZDU4NTAxMzk4ODk4M2M4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTEtMDItMTMgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBGaXggd3JvbmcgcG9wdXAgcG9zaXRpb24gZm9yIFJUTChhZ2FpbikKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzc1CisKKyAgICAg ICAgRml4IHJpZ2h0IHBvc2l0aW9uIGJ1ZyBpbnRyb2R1Y2UgYnkgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUzNTY3LCBiZWNhdXNlIHRoZSBwcmV2aW91cyBmaXggd2Fz IGNvcnJlY3QgZm9yIHRoZSBjdXJyZW50IGJlaGF2aW91ciwgYnV0IG5vdCBnb29kIGZvciBodHRw Oi8vY3JidWcuY29tLzYwNDI3LiBUbyBjYWxjdWxhdGUgdGhlIGNvcnJlY3QgcmlnaHQgb2Zmc2V0 IHZhbHVlIGFuZCBhcHBseSB0byB0aGUgcG9zaXRpb24sIGNoYW5nZSBXZWJDb3JlOjpQb3B1cENv bnRhaW5lcjo6bGF5b3V0KCkgdG8gcmV0dXJuIHJpZ2h0IG9mZnNldCB2YWx1ZSBhbmQgdXNlIHRo ZSByZXR1cm5lZCB2YWx1ZSB0byBjYWxjdWxhdGUgcG9zaXRpb24uCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBIb3dldmVyIHdlIGNhbiBjaGVjayBtYW51YWxseSB3aXRoIHNlbGVjdF9kcm9wZG93 bl9ib3hfYWxpZ25tZW50Lmh0bWwsIGF1dG9maWxsX2FsaWdubWVudC5odG1sLCBzZWxlY3RfYWxp Z25tZW50Lmh0bWwsIHNlbGVjdF9kcm9wZG93bl9ib3hfYWxpZ25tZW50Lmh0bWwsIGF1dG9maWxs LXBvcHVwLXdpZHRoLWFuZC1pdGVtLWRpcmVjdGlvbi5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9y bS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1 cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCk6IENoYW5nZSB0aGUgaW5w dXQgcGFyYW1ldGVyIHRvIHRha2UgcG9wdXBJbml0aWFsQ29vcmRpbmF0ZSBhZ2Fpbi4gQW5kIGNh bGN1bGF0ZSBjb3JyZWN0IHJpZ2h0IHBvc2l0aW9uIHdpdGggcmV0dXJuZWQgcmlnaHQgb2Zmc2V0 IGZyb20gbGF5b3V0QW5kR2V0UmlnaHRPZmZzZXQoKS4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVw Q29udGFpbmVyOjpzaG93UG9wdXApOiBDaGFuZ2UgdGhlIHBhc3NpbmcgcGFyYW1ldGVyIHRvIGxh eW91dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoKS4KKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29u dGFpbmVyOjpsYXlvdXRBbmRHZXRSaWdodE9mZnNldCk6IENoYW5nZSB0aGUgbmFtZSBmcm9tIGxh eW91dCgpIGFuZCB0byByZXR1cm4gcmlnaHRPZmZzZXQgdmFsdWUuCisgICAgICAgIChXZWJDb3Jl OjpQb3B1cENvbnRhaW5lcjo6cmVmcmVzaCk6IENoYW5nZSB0aGUgcGFzc2luZyBwYXJhbWV0ZXIg dG8gbGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCgpLgorICAgICAgICAqIHBsYXRmb3JtL2No cm9taXVtL1BvcHVwTWVudUNocm9taXVtLmg6IENoYW5nZSB0aGUgZnVuY3Rpb24gbmFtZSBhbmQg cGFyYW1ldGVycy4KKwogMjAxMS0wMi0xMyAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGlyayBTY2h1bHplLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmluZGV4 IDU5NDQxZDBiZTRhOGJhOTA5YTUzNDJlNjIzZGRkNjMzZTgzYmRlNjcuLjYzYWNkZmQwM2Y1ZTlj OTQ0ODNmMmZkMzg1MTU4OTAzMTYxZGU4NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTMyOCw3ICszMjgs NyBAQCBQb3B1cENvbnRhaW5lcjo6flBvcHVwQ29udGFpbmVyKCkKICAgICAgICAgcmVtb3ZlQ2hp bGQobV9saXN0Qm94LmdldCgpKTsKIH0KIAotSW50UmVjdCBQb3B1cENvbnRhaW5lcjo6bGF5b3V0 QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgaW50IHBvcHVw SW5pdGlhbFkpCitJbnRSZWN0IFBvcHVwQ29udGFpbmVyOjpsYXlvdXRBbmRDYWxjdWxhdGVXaWRn ZXRSZWN0KGludCB0YXJnZXRDb250cm9sSGVpZ2h0LCBjb25zdCBJbnRQb2ludCYgcG9wdXBJbml0 aWFsQ29vcmRpbmF0ZSkKIHsKICAgICAvLyBSZXNldCB0aGUgbWF4IGhlaWdodCB0byBpdHMgZGVm YXVsdCB2YWx1ZSwgaXQgd2lsbCBiZSByZWNvbXB1dGVkIGJlbG93CiAgICAgLy8gaWYgbmVjZXNz YXJ5LgpAQCAtMzM2LDggKzMzNiw4IEBAIEludFJlY3QgUG9wdXBDb250YWluZXI6OmxheW91dEFu ZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50IHRhcmdldENvbnRyb2xIZWlnaHQsIGluCiAKICAgICAv LyBMYXkgZXZlcnl0aGluZyBvdXQgdG8gZmlndXJlIG91dCBvdXIgcHJlZmVycmVkIHNpemUsIHRo ZW4gdGVsbCB0aGUgdmlldydzCiAgICAgLy8gV2lkZ2V0Q2xpZW50IGFib3V0IGl0LiAgSXQgc2hv dWxkIGFzc2lnbiB1cyBhIGNsaWVudC4KLSAgICBsYXlvdXQoKTsKLSAgCisgICAgaW50IHJpZ2h0 T2Zmc2V0ID0gbGF5b3V0QW5kR2V0UmlnaHRPZmZzZXQoKTsKKwogICAgIC8vIEFzc3VtZSBtX2xp c3RCb3ggc2l6ZSBpcyBhbHJlYWR5IGNhbGN1bGF0ZWQuCiAgICAgSW50U2l6ZSB0YXJnZXRTaXpl KG1fbGlzdEJveC0+d2lkdGgoKSArIGtCb3JkZXJTaXplICogMiwKICAgICAgICAgICAgICAgICAg ICAgICAgbV9saXN0Qm94LT5oZWlnaHQoKSArIGtCb3JkZXJTaXplICogMik7CkBAIC0zNDgsOSAr MzQ4LDkgQEAgSW50UmVjdCBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0 UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgaW4KICAgICAgICAgLy8gSWYgdGhlIHBvcHVw IHdvdWxkIGV4dGVuZCBwYXN0IHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbiwgb3BlbiB1cHdhcmRz CiAgICAgICAgIC8vIGluc3RlYWQuCiAgICAgICAgIEZsb2F0UmVjdCBzY3JlZW4gPSBzY3JlZW5B dmFpbGFibGVSZWN0KG1fZnJhbWVWaWV3LmdldCgpKTsKLSAgICAgICAgLy8gVXNlIHRoaXM6Ongo KSBmb3IgbG9jYXRpb24gYmVjYXVzZSBSVEwgcG9zaXRpb24gaXMgY29uc2lkZXJlZAotICAgICAg ICAvLyBpbiBsYXlvdXQoKS4KLSAgICAgICAgd2lkZ2V0UmVjdCA9IGNocm9tZUNsaWVudC0+d2lu ZG93VG9TY3JlZW4oSW50UmVjdCh4KCksIHBvcHVwSW5pdGlhbFksIHRhcmdldFNpemUud2lkdGgo KSwgdGFyZ2V0U2l6ZS5oZWlnaHQoKSkpOworICAgICAgICAvLyBVc2UgcG9wdXBJbml0aWFsQ29v cmRpbmF0ZS54KCkgKyByaWdodE9mZnNldCBiZWNhdXNlIFJUTCBwb3NpdGlvbgorICAgICAgICAv LyBuZWVkcyB0byBiZSBjb25zaWRlcmVkLgorICAgICAgICB3aWRnZXRSZWN0ID0gY2hyb21lQ2xp ZW50LT53aW5kb3dUb1NjcmVlbihJbnRSZWN0KHBvcHVwSW5pdGlhbENvb3JkaW5hdGUueCgpICsg cmlnaHRPZmZzZXQsIHBvcHVwSW5pdGlhbENvb3JkaW5hdGUueSgpLCB0YXJnZXRTaXplLndpZHRo KCksIHRhcmdldFNpemUuaGVpZ2h0KCkpKTsKICAgICAgICAgaWYgKHdpZGdldFJlY3QubWF4WSgp ID4gc3RhdGljX2Nhc3Q8aW50PihzY3JlZW4ubWF4WSgpKSkgewogICAgICAgICAgICAgaWYgKHdp ZGdldFJlY3QueSgpIC0gd2lkZ2V0UmVjdC5oZWlnaHQoKSAtIHRhcmdldENvbnRyb2xIZWlnaHQg PiAwKSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlcmUgaXMgZW5vdWdoIHJvb20gdG8gb3BlbiB1 cHdhcmRzLgpAQCAtMzY0LDcgKzM2NCw3IEBAIEludFJlY3QgUG9wdXBDb250YWluZXI6OmxheW91 dEFuZENhbGN1bGF0ZVdpZGdldFJlY3QoaW50IHRhcmdldENvbnRyb2xIZWlnaHQsIGluCiAgICAg ICAgICAgICAgICAgICAgIG1fbGlzdEJveC0+c2V0TWF4SGVpZ2h0KHNwYWNlQWJvdmUpOwogICAg ICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgbV9saXN0Qm94LT5zZXRNYXhI ZWlnaHQoc3BhY2VCZWxvdyk7Ci0gICAgICAgICAgICAgICAgbGF5b3V0KCk7CisgICAgICAgICAg ICAgICAgbGF5b3V0QW5kR2V0UmlnaHRPZmZzZXQoKTsKICAgICAgICAgICAgICAgICAvLyBPdXIg c2l6ZSBoYXMgY2hhbmdlZCwgcmVjb21wdXRlIHRoZSB3aWRnZXRSZWN0LgogICAgICAgICAgICAg ICAgIHdpZGdldFJlY3QgPSBjaHJvbWVDbGllbnQtPndpbmRvd1RvU2NyZWVuKGZyYW1lUmVjdCgp KTsKICAgICAgICAgICAgICAgICAvLyBBbmQgbW92ZSB1cHdhcmRzIGlmIG5lY2Vzc2FyeS4KQEAg LTM4Myw3ICszODMsNyBAQCB2b2lkIFBvcHVwQ29udGFpbmVyOjpzaG93UG9wdXAoRnJhbWVWaWV3 KiB2aWV3KQogICAgIENocm9tZUNsaWVudENocm9taXVtKiBjaHJvbWVDbGllbnQgPSBjaHJvbWVD bGllbnRDaHJvbWl1bSgpOwogICAgIGlmIChjaHJvbWVDbGllbnQpIHsKICAgICAgICAgSW50UmVj dCBwb3B1cFJlY3QgPSBmcmFtZVJlY3QoKTsKLSAgICAgICAgY2hyb21lQ2xpZW50LT5wb3B1cE9w ZW5lZCh0aGlzLCBsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KHBvcHVwUmVjdC5oZWlnaHQo KSwgcG9wdXBSZWN0LnkoKSksIGZhbHNlKTsKKyAgICAgICAgY2hyb21lQ2xpZW50LT5wb3B1cE9w ZW5lZCh0aGlzLCBsYXlvdXRBbmRDYWxjdWxhdGVXaWRnZXRSZWN0KHBvcHVwUmVjdC5oZWlnaHQo KSwgcG9wdXBSZWN0LmxvY2F0aW9uKCkpLCBmYWxzZSk7CiAgICAgICAgIG1fcG9wdXBPcGVuID0g dHJ1ZTsKICAgICB9CiAKQEAgLTQxMiw3ICs0MTIsNyBAQCB2b2lkIFBvcHVwQ29udGFpbmVyOjpu b3RpZnlQb3B1cEhpZGRlbigpCiAgICAgY2hyb21lQ2xpZW50Q2hyb21pdW0oKS0+cG9wdXBDbG9z ZWQodGhpcyk7CiB9CiAKLXZvaWQgUG9wdXBDb250YWluZXI6OmxheW91dCgpCitpbnQgUG9wdXBD b250YWluZXI6OmxheW91dEFuZEdldFJpZ2h0T2Zmc2V0KCkKIHsKICAgICBtX2xpc3RCb3gtPmxh eW91dCgpOwogCkBAIC00MjksMTIgKzQyOSwxNSBAQCB2b2lkIFBvcHVwQ29udGFpbmVyOjpsYXlv dXQoKQogICAgIC8vIG9mIGRyb3Bkb3duIGJveCBzaG91bGQgYmUgYWxpZ25lZCB3aXRoIHRoZSBy aWdodCBlZGdlIG9mIDxzZWxlY3Q+IGVsZW1lbnQgYm94LAogICAgIC8vIGFuZCB0aGUgZHJvcGRv d24gYm94IHNob3VsZCBiZSBleHBhbmRlZCB0byBsZWZ0IGlmIG1vcmUgc3BhY2UgbmVlZGVkLgog ICAgIFBvcHVwTWVudUNsaWVudCogcG9wdXBDbGllbnQgPSBtX2xpc3RCb3gtPm1fcG9wdXBDbGll bnQ7CisgICAgaW50IHJpZ2h0T2Zmc2V0ID0gMDsKICAgICBpZiAocG9wdXBDbGllbnQpIHsKICAg ICAgICAgYm9vbCByaWdodEFsaWduZWQgPSBtX2xpc3RCb3gtPm1fcG9wdXBDbGllbnQtPm1lbnVT dHlsZSgpLnRleHREaXJlY3Rpb24oKSA9PSBSVEw7CiAgICAgICAgIGlmIChyaWdodEFsaWduZWQp Ci0gICAgICAgICAgICBtb3ZlKHgoKSArIHBvcHVwV2lkdGggLSBsaXN0Qm94V2lkdGgsIHkoKSk7 CisgICAgICAgICAgICByaWdodE9mZnNldCA9IHBvcHVwV2lkdGggLSBsaXN0Qm94V2lkdGg7CiAg ICAgfQogICAgIGludmFsaWRhdGUoKTsKKworICAgIHJldHVybiByaWdodE9mZnNldDsKIH0KIAog Ym9vbCBQb3B1cENvbnRhaW5lcjo6aGFuZGxlTW91c2VEb3duRXZlbnQoY29uc3QgUGxhdGZvcm1N b3VzZUV2ZW50JiBldmVudCkKQEAgLTU1Myw3ICs1NTYsNyBAQCB2b2lkIFBvcHVwQ29udGFpbmVy OjpyZWZyZXNoKGNvbnN0IEludFJlY3QmIHRhcmdldENvbnRyb2xSZWN0KQogICAgIGxpc3RCb3go KS0+dXBkYXRlRnJvbUVsZW1lbnQoKTsKICAgICAvLyBTdG9yZSB0aGUgb3JpZ2luYWwgaGVpZ2h0 IHRvIGNoZWNrIGlmIHdlIG5lZWQgdG8gcmVxdWVzdCB0aGUgbG9jYXRpb24uCiAgICAgaW50IG9y aWdpbmFsSGVpZ2h0ID0gaGVpZ2h0KCk7Ci0gICAgSW50UmVjdCB3aWRnZXRSZWN0ID0gbGF5b3V0 QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCh0YXJnZXRDb250cm9sUmVjdC5oZWlnaHQoKSwgbG9jYXRp b24ueSgpKTsKKyAgICBJbnRSZWN0IHdpZGdldFJlY3QgPSBsYXlvdXRBbmRDYWxjdWxhdGVXaWRn ZXRSZWN0KHRhcmdldENvbnRyb2xSZWN0LmhlaWdodCgpLCBsb2NhdGlvbik7CiAgICAgaWYgKG9y aWdpbmFsSGVpZ2h0ICE9IHdpZGdldFJlY3QuaGVpZ2h0KCkpCiAgICAgICAgIHNldEZyYW1lUmVj dCh3aWRnZXRSZWN0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1BvcHVwTWVudUNocm9taXVtLmgKaW5kZXggNDNiOGIwZTAxMjUwMDlkYzkxYTk5MTBkNThi NWI5NWQwM2VlNjEzNy4uM2Q1NTY4NjgyMjVhZTMyYTQxMmFiOTU0ZjM0M2MwNjdlMDRhNGI2YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hy b21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVD aHJvbWl1bS5oCkBAIC0xNDEsOCArMTQxLDggQEAgcHVibGljOgogICAgIC8vIFRoZSBwb3B1cCB3 YXMgaGlkZGVuLgogICAgIHZvaWQgbm90aWZ5UG9wdXBIaWRkZW4oKTsKIAotICAgIC8vIENvbXB1 dGUgc2l6ZSBvZiB3aWRnZXQgYW5kIGNoaWxkcmVuLgotICAgIHZvaWQgbGF5b3V0KCk7CisgICAg Ly8gQ29tcHV0ZSBzaXplIG9mIHdpZGdldCBhbmQgY2hpbGRyZW4uIFJldHVybiByaWdodCBvZmZz ZXQgZm9yIFJUTC4KKyAgICBpbnQgbGF5b3V0QW5kR2V0UmlnaHRPZmZzZXQoKTsKIAogICAgIFBv cHVwTGlzdEJveCogbGlzdEJveCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlzdEJveC5nZXQoKTsgfQog CkBAIC0xNzcsNyArMTc3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBhaW50Qm9yZGVyKEdyYXBo aWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsKIAogICAgIC8vIExheW91dCBhbmQgY2FsY3Vs YXRlIHBvcHVwIHdpZGdldCBzaXplIGFuZCBsb2NhdGlvbiBhbmQgcmV0dXJucyBpdCBhcyBJbnRS ZWN0LgotICAgIEludFJlY3QgbGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdChpbnQgdGFyZ2V0 Q29udHJvbEhlaWdodCwgaW50IHBvcHVwSW5pdGlhbFkpOworICAgIEludFJlY3QgbGF5b3V0QW5k Q2FsY3VsYXRlV2lkZ2V0UmVjdChpbnQgdGFyZ2V0Q29udHJvbEhlaWdodCwgY29uc3QgSW50UG9p bnQmIHBvcHVwSW5pdGlhbENvb3JkaW5hdGUpOwogCiAgICAgLy8gUmV0dXJucyB0aGUgQ2hyb21l Q2xpZW50IG9mIHRoZSBwYWdlIHRoaXMgcG9wdXAgaXMgYXNzb2NpYXRlZCB3aXRoLgogICAgIENo cm9tZUNsaWVudENocm9taXVtKiBjaHJvbWVDbGllbnRDaHJvbWl1bSgpOwo=