117984 2013-06-25 05:48:46 -0700 Rearrange the code of FrameWin 2013-08-01 09:22:01 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Windows 7 RESOLVED FIXED P2 Normal --- 117988 1 paroga paroga bfulgham commit-queue oldest_to_newest 903292 0 paroga 2013-06-25 05:48:46 -0700 Rearrange the code of FrameWin 903297 1 205390 paroga 2013-06-25 05:55:21 -0700 Created attachment 205390 Patch 903299 2 commit-queue 2013-06-25 05:56:22 -0700 Attachment 205390 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/page/win/FrameCGWin.cpp', u'Source/WebCore/page/win/FrameCairoWin.cpp', u'Source/WebCore/page/win/FrameWin.cpp', u'Source/WebCore/page/win/FrameWin.h', u'Source/WebKit/win/WebView.cpp']" exit_code: 1 Source/WebCore/page/win/FrameWin.cpp:55: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 903304 3 205392 paroga 2013-06-25 06:02:25 -0700 Created attachment 205392 Patch 912877 4 205392 bfulgham 2013-07-30 09:27:00 -0700 Comment on attachment 205392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205392&action=review I think the imageFromRect method should take a const Frame* argument. Otherwise, this looks good to me. Please correct the const when you land it. > Source/WebCore/page/win/FrameCGWin.cpp:52 > +PassOwnPtr<HBITMAP> imageFromRect(Frame* frame, IntRect& ir) Why remove the 'const' from the Frame* argument? 912878 5 bfulgham 2013-07-30 09:28:15 -0700 Also, I think the ChangeLog should be a bit more descriptive, since you: 1. Shared more code between WinCairo and Windows. 2. Made use of our safer pointer types. Also, please fix the spaces in FrameWin.cpp when you land. 913712 6 207914 paroga 2013-08-01 05:36:29 -0700 Created attachment 207914 Patch for landing 913756 7 207914 bfulgham 2013-08-01 09:00:33 -0700 Comment on attachment 207914 Patch for landing r=me 913761 8 207914 commit-queue 2013-08-01 09:22:00 -0700 Comment on attachment 207914 Patch for landing Clearing flags on attachment: 207914 Committed r153586: <http://trac.webkit.org/changeset/153586> 913762 9 commit-queue 2013-08-01 09:22:01 -0700 All reviewed patches have been landed. Closing bug. 205390 2013-06-25 05:55:21 -0700 2013-06-25 06:02:25 -0700 Patch bug-117984.patch text/plain 8285 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4OTUyNTNhLi5lM2Q3YjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDYtMjUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmVhcnJhbmdlIHRoZSBjb2RlIG9mIEZyYW1lV2luCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc5ODQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGNvZGUgZnJvbSB0aGUgQ0cgaW1w bGVtZW50YXRpb24gaW50byB0aGUgZ2VuZXJhbCBmaWxlIHNvIHdlIGNhbgorICAgICAgICBzaGFy ZSB0aGUgY29kZSB3aXRoIFdpbmRvd3MgQ0UgcG9ydCBpbiBhIG5leHQgc3RlcC4KKyAgICAgICAg QWxzbyB1c2UgT3duUHRyIGluc3RlYWQgb2YgcGxhaW4gcG9pbnRlcnMgdG8gbWFrZSBvd25lcnNo aXAgbW9yZSBjbGVhci4KKworICAgICAgICAqIHBhZ2Uvd2luL0ZyYW1lQ0dXaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6aW1hZ2VGcm9tUmVjdCk6CisgICAgICAgICogcGFnZS93aW4vRnJhbWVD YWlyb1dpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbWFnZUZyb21SZWN0KToKKyAgICAgICAg KiBwYWdlL3dpbi9GcmFtZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbWFnZUZyb21TZWxl Y3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OmRyYWdJbWFnZUZvclNlbGVjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6bm9kZUltYWdlKToKKyAgICAgICAgKiBwYWdlL3dp bi9GcmFtZVdpbi5oOgorCiAyMDEzLTA2LTI1ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxh bi5qZW5zZW5AZGlnaWEuY29tPgogCiAgICAgICAgIEhUTUxNZWRpYUVsZW1lbnQgc2hvdWxkIGlu aGVyaXQgZnJvbSBNZWRpYVBsYXllckNsaWVudCBwcml2YXRlbHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ0dXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS93 aW4vRnJhbWVDR1dpbi5jcHAKaW5kZXggZDlmZmQ2NC4uMzE5ZTM3NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVDR1dpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS93aW4vRnJhbWVDR1dpbi5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgc3RhdGljIHZvaWQgZHJh d1JlY3RJbnRvQ29udGV4dChJbnRSZWN0IHJlY3QsIEZyYW1lVmlldyogdmlldywgR3JhcGhpY3ND b250ZXh0KgogICAgIHZpZXctPnBhaW50KGdjLCByZWN0KTsKIH0KIAotc3RhdGljIEhCSVRNQVAg aW1hZ2VGcm9tUmVjdChjb25zdCBGcmFtZSogZnJhbWUsIEludFJlY3QmIGlyKQorUGFzc093blB0 cjxIQklUTUFQPiBpbWFnZUZyb21SZWN0KEZyYW1lKiBmcmFtZSwgSW50UmVjdCYgaXIpCiB7CiAg ICAgUGFpbnRCZWhhdmlvciBvbGRQYWludEJlaGF2aW9yID0gZnJhbWUtPnZpZXcoKS0+cGFpbnRC ZWhhdmlvcigpOwogICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3Iob2xkUGFpbnRC ZWhhdmlvciB8IFBhaW50QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXllcnMpOwpAQCAtNjAs OCArNjAsOCBAQCBzdGF0aWMgSEJJVE1BUCBpbWFnZUZyb21SZWN0KGNvbnN0IEZyYW1lKiBmcmFt ZSwgSW50UmVjdCYgaXIpCiAgICAgaW50IGggPSBpci5oZWlnaHQoKTsKICAgICBCaXRtYXBJbmZv IGJtcCA9IEJpdG1hcEluZm86OmNyZWF0ZShJbnRTaXplKHcsIGgpKTsKIAotICAgIEhCSVRNQVAg aGJtcCA9IENyZWF0ZURJQlNlY3Rpb24oMCwgJmJtcCwgRElCX1JHQl9DT0xPUlMsIHN0YXRpY19j YXN0PHZvaWQqKj4oJmJpdHMpLCAwLCAwKTsKLSAgICBIQklUTUFQIGhibXBPbGQgPSBzdGF0aWNf Y2FzdDxIQklUTUFQPihTZWxlY3RPYmplY3QoaGRjLCBoYm1wKSk7CisgICAgT3duUHRyPEhCSVRN QVA+IGhibXAgPSBhZG9wdFB0cihDcmVhdGVESUJTZWN0aW9uKDAsICZibXAsIERJQl9SR0JfQ09M T1JTLCBzdGF0aWNfY2FzdDx2b2lkKio+KCZiaXRzKSwgMCwgMCkpOworICAgIEhHRElPQkogaGJt cE9sZCA9IFNlbGVjdE9iamVjdChoZGMsIGhibXAuZ2V0KCkpOwogICAgIENHQ29udGV4dFJlZiBj b250ZXh0ID0gQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKHN0YXRpY19jYXN0PHZvaWQqPihiaXRzKSwg dywgaCwKICAgICAgICAgOCwgdyAqIHNpemVvZihSR0JRVUFEKSwgZGV2aWNlUkdCQ29sb3JTcGFj ZVJlZigpLCBrQ0dCaXRtYXBCeXRlT3JkZXIzMkxpdHRsZSB8IGtDR0ltYWdlQWxwaGFQcmVtdWx0 aXBsaWVkRmlyc3QpOwogICAgIENHQ29udGV4dFNhdmVHU3RhdGUoY29udGV4dCk7CkBAIC03Niwz OCArNzYsNyBAQCBzdGF0aWMgSEJJVE1BUCBpbWFnZUZyb21SZWN0KGNvbnN0IEZyYW1lKiBmcmFt ZSwgSW50UmVjdCYgaXIpCiAKICAgICBmcmFtZS0+dmlldygpLT5zZXRQYWludEJlaGF2aW9yKG9s ZFBhaW50QmVoYXZpb3IpOwogCi0gICAgcmV0dXJuIGhibXA7Ci19Ci0KLUhCSVRNQVAgaW1hZ2VG cm9tU2VsZWN0aW9uKEZyYW1lKiBmcmFtZSwgYm9vbCBmb3JjZUJsYWNrVGV4dCkKLXsKLSAgICBm cmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlTGF5b3V0KCk7Ci0KLSAgICBmcmFtZS0+dmlldygpLT5z ZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5IHwgKGZvcmNlQmxhY2tU ZXh0ID8gUGFpbnRCZWhhdmlvckZvcmNlQmxhY2tUZXh0IDogMCkpOwotICAgIEZsb2F0UmVjdCBm ciA9IGZyYW1lLT5zZWxlY3Rpb24oKS0+Ym91bmRzKCk7Ci0gICAgSW50UmVjdCBpcihzdGF0aWNf Y2FzdDxpbnQ+KGZyLngoKSksIHN0YXRpY19jYXN0PGludD4oZnIueSgpKSwKLSAgICAgICAgICAg ICAgIHN0YXRpY19jYXN0PGludD4oZnIud2lkdGgoKSksIHN0YXRpY19jYXN0PGludD4oZnIuaGVp Z2h0KCkpKTsKLSAgICBIQklUTUFQIGltYWdlID0gaW1hZ2VGcm9tUmVjdChmcmFtZSwgaXIpOwot ICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3IoUGFpbnRCZWhhdmlvck5vcm1hbCk7 Ci0gICAgcmV0dXJuIGltYWdlOwotfQotCi1EcmFnSW1hZ2VSZWYgRnJhbWU6Om5vZGVJbWFnZShO b2RlKiBub2RlKQotewotICAgIGRvY3VtZW50KCktPnVwZGF0ZUxheW91dCgpOwotCi0gICAgUmVu ZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7Ci0gICAgaWYgKCFyZW5kZXJl cikKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBMYXlvdXRSZWN0IHRvcExldmVsUmVjdDsKLSAg ICBJbnRSZWN0IHBhaW50aW5nUmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3QocmVuZGVyZXItPnBh aW50aW5nUm9vdFJlY3QodG9wTGV2ZWxSZWN0KSk7Ci0KLSAgICBtX3ZpZXctPnNldE5vZGVUb0Ry YXcobm9kZSk7IC8vIGludm9rZSBzcGVjaWFsIHN1Yi10cmVlIGRyYXdpbmcgbW9kZQotICAgIEhC SVRNQVAgcmVzdWx0ID0gaW1hZ2VGcm9tUmVjdCh0aGlzLCBwYWludGluZ1JlY3QpOwotICAgIG1f dmlldy0+c2V0Tm9kZVRvRHJhdygwKTsKLQotICAgIHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJu IGhibXAucmVsZWFzZSgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZUNhaXJvV2luLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvd2luL0ZyYW1lQ2Fpcm9XaW4uY3BwCmluZGV4IGY4NDNiYTEuLjc4NGZlN2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ2Fpcm9XaW4uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ2Fpcm9XaW4uY3BwCkBAIC0yNywyMyArMjcs MTQgQEAKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lV2luLmgiCiAKLSNpbmNs dWRlICJFZGl0b3JDbGllbnQuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogCi11c2lu ZyBzdGQ6Om1pbjsKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1IQklUTUFQIGltYWdlRnJvbVNl bGVjdGlvbihGcmFtZSogZnJhbWUsIGJvb2wgZm9yY2VCbGFja1RleHQpCi17Ci0gICAgbm90SW1w bGVtZW50ZWQoKTsKLSAgICByZXR1cm4gMDsKLX0KLQotRHJhZ0ltYWdlUmVmIEZyYW1lOjpub2Rl SW1hZ2UoTm9kZSopCitQYXNzT3duUHRyPEhCSVRNQVA+IGltYWdlRnJvbVJlY3QoRnJhbWUqLCBJ bnRSZWN0JikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiAwOworICAgIHJl dHVybiBudWxscHRyOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3dpbi9GcmFtZVdpbi5jcHAKaW5kZXggYzQ1MjU1OS4uOTYwNjg5MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvd2luL0ZyYW1lV2luLmNwcApAQCAtMjYsMTYgKzI2LDEzIEBACiAjaW5jbHVkZSAiY29uZmln LmgiCiAjaW5jbHVkZSAiRnJhbWVXaW4uaCIKIAotI2luY2x1ZGUgIkJyaWRnZUpTQy5oIgogI2lu Y2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiRnJh bWUuaCIKICNpbmNsdWRlICJGcmFtZVNlbGVjdGlvbi5oIgorI2luY2x1ZGUgIkZyYW1lVmlldy5o IgogI2luY2x1ZGUgIlByaW50Q29udGV4dC5oIgotI2luY2x1ZGUgIlJhbmdlLmgiCi0jaW5jbHVk ZSAiUmVuZGVyVmlldy5oIgotI2luY2x1ZGUgIlNldHRpbmdzLmgiCi0jaW5jbHVkZSAiVHJhbnNm b3JtYXRpb25NYXRyaXguaCIKKyNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCkBAIC00OCwxMiArNDUsNDMgQEAgdm9pZCBjb21wdXRlUGFnZVJlY3RzRm9y RnJhbWUoRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRSZWN0JiBwcmludFJlY3QsIGZsb2F0IGhlYWQK ICAgICBvdXRQYWdlcyA9IHByaW50Q29udGV4dC5wYWdlUmVjdHMoKTsKIH0KIAorUGFzc093blB0 cjxIQklUTUFQPiBpbWFnZUZyb21TZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBib29sIGZvcmNlQmxh Y2tUZXh0KQoreworICAgIGZyYW1lLT5kb2N1bWVudCgpLT51cGRhdGVMYXlvdXQoKTsKKworICAg IGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3IoUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9u bHkgfCAoZm9yY2VCbGFja1RleHQgPyBQYWludEJlaGF2aW9yRm9yY2VCbGFja1RleHQgOiAwKSk7 CisgICAgRmxvYXRSZWN0IGZyID0gZnJhbWUtPnNlbGVjdGlvbigpLT5ib3VuZHMoKTsKKyAgICBJ bnRSZWN0IGlyKHN0YXRpY19jYXN0PGludD4oZnIueCgpKSwgc3RhdGljX2Nhc3Q8aW50Pihmci55 KCkpLAorICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8aW50Pihmci53aWR0aCgpKSwgc3RhdGlj X2Nhc3Q8aW50Pihmci5oZWlnaHQoKSkpOworICAgIE93blB0cjxIQklUTUFQPiBpbWFnZSA9IGlt YWdlRnJvbVJlY3QoZnJhbWUsIGlyKTsKKyAgICBmcmFtZS0+dmlldygpLT5zZXRQYWludEJlaGF2 aW9yKFBhaW50QmVoYXZpb3JOb3JtYWwpOworICAgIHJldHVybiBpbWFnZS5yZWxlYXNlKCk7Cit9 CisKIERyYWdJbWFnZVJlZiBGcmFtZTo6ZHJhZ0ltYWdlRm9yU2VsZWN0aW9uKCkKLXsgICAgCit7 CiAgICAgaWYgKHNlbGVjdGlvbigpLT5pc1JhbmdlKCkpCi0gICAgICAgIHJldHVybiBpbWFnZUZy b21TZWxlY3Rpb24odGhpcywgZmFsc2UpOworICAgICAgICByZXR1cm4gaW1hZ2VGcm9tU2VsZWN0 aW9uKHRoaXMsIGZhbHNlKS5sZWFrUHRyKCk7CiAKICAgICByZXR1cm4gMDsKIH0KIAorRHJhZ0lt YWdlUmVmIEZyYW1lOjpub2RlSW1hZ2UoTm9kZSogbm9kZSkKK3sKKyAgICBkb2N1bWVudCgpLT51 cGRhdGVMYXlvdXQoKTsKKworICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBub2RlLT5yZW5k ZXJlcigpOworICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIHJldHVybiAwOworCisgICAgTGF5 b3V0UmVjdCB0b3BMZXZlbFJlY3Q7CisgICAgSW50UmVjdCBwYWludGluZ1JlY3QgPSBwaXhlbFNu YXBwZWRJbnRSZWN0KHJlbmRlcmVyLT5wYWludGluZ1Jvb3RSZWN0KHRvcExldmVsUmVjdCkpOwor CisgICAgbV92aWV3LT5zZXROb2RlVG9EcmF3KG5vZGUpOyAvLyBpbnZva2Ugc3BlY2lhbCBzdWIt dHJlZSBkcmF3aW5nIG1vZGUKKyAgICBPd25QdHI8SEJJVE1BUD4gcmVzdWx0ID0gaW1hZ2VGcm9t UmVjdCh0aGlzLCBwYWludGluZ1JlY3QpOworICAgIG1fdmlldy0+c2V0Tm9kZVRvRHJhdygwKTsK KworICAgIHJldHVybiByZXN1bHQubGVha1B0cigpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZVdpbi5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVXaW4uaAppbmRleCBjYmZlMzNkLi5jZmY0NTg0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZVdpbi5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lV2luLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYg RnJhbWVXaW5faAogI2RlZmluZSBGcmFtZVdpbl9oCiAKKyNpbmNsdWRlIDx3dGYvUGFzc093blB0 ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogLy8gRm9yd2FyZCBkZWNsYXJlZCBzbyB3 ZSBkb24ndCBuZWVkIHdpbmdkaS5oLgpAQCAtMzMsMTIgKzM0LDEzIEBAIHR5cGVkZWYgc3RydWN0 IEhCSVRNQVBfXyogSEJJVE1BUDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xhc3Mg RnJhbWU7Ci0gICAgY2xhc3MgSW50UmVjdDsKK2NsYXNzIEZyYW1lOworY2xhc3MgSW50UmVjdDsK IAotICAgIEhCSVRNQVAgaW1hZ2VGcm9tU2VsZWN0aW9uKEZyYW1lKiBmcmFtZSwgYm9vbCBmb3Jj ZVdoaXRlVGV4dCk7Ci0gICAgdm9pZCBjb21wdXRlUGFnZVJlY3RzRm9yRnJhbWUoRnJhbWUqLCBj b25zdCBJbnRSZWN0JiBwcmludFJlY3QsIGZsb2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVy SGVpZ2h0LCBmbG9hdCB1c2VyU2NhbGVGYWN0b3IsIFZlY3RvcjxJbnRSZWN0PiYgb3V0UGFnZXMs IGludCYgb3V0UGFnZUhlaWdodCk7CitQYXNzT3duUHRyPEhCSVRNQVA+IGltYWdlRnJvbVJlY3Qo RnJhbWUqLCBJbnRSZWN0Jik7CitQYXNzT3duUHRyPEhCSVRNQVA+IGltYWdlRnJvbVNlbGVjdGlv bihGcmFtZSosIGJvb2wgZm9yY2VXaGl0ZVRleHQpOwordm9pZCBjb21wdXRlUGFnZVJlY3RzRm9y RnJhbWUoRnJhbWUqLCBjb25zdCBJbnRSZWN0JiBwcmludFJlY3QsIGZsb2F0IGhlYWRlckhlaWdo dCwgZmxvYXQgZm9vdGVySGVpZ2h0LCBmbG9hdCB1c2VyU2NhbGVGYWN0b3IsIFZlY3RvcjxJbnRS ZWN0PiYgb3V0UGFnZXMsIGludCYgb3V0UGFnZUhlaWdodCk7CiAKLX0KK30gLy8gbmFtZXNwYWNl IFdlYkNvcmUKIAotI2VuZGlmCisjZW5kaWYgLy8gRnJhbWVXaW5faApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNw cAppbmRleCAzNDUzNTQ3Li44ODI0OTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9X ZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcApAQCAtMzUyOCw4 ICszNTI4LDggQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpnZW5lcmF0ZVNl bGVjdGlvbkltYWdlKEJPT0wgZm9yY2VXaGl0ZVRleHQsIE8KICAgICBXZWJDb3JlOjpGcmFtZSog ZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsK IAogICAgIGlmIChmcmFtZSkgewotICAgICAgICBIQklUTUFQIGJpdG1hcCA9IGltYWdlRnJvbVNl bGVjdGlvbihmcmFtZSwgZm9yY2VXaGl0ZVRleHQgPyBUUlVFIDogRkFMU0UpOwotICAgICAgICAq aEJpdG1hcCA9IChPTEVfSEFORExFKShVTE9ORzY0KWJpdG1hcDsKKyAgICAgICAgT3duUHRyPEhC SVRNQVA+IGJpdG1hcCA9IGltYWdlRnJvbVNlbGVjdGlvbihmcmFtZSwgZm9yY2VXaGl0ZVRleHQg PyBUUlVFIDogRkFMU0UpOworICAgICAgICAqaEJpdG1hcCA9IHN0YXRpY19jYXN0PE9MRV9IQU5E TEU+KHJlaW50ZXJwcmV0X2Nhc3Q8VUxPTkc2ND4oYml0bWFwLmxlYWtQdHIoKSkpOwogICAgIH0K IAogICAgIHJldHVybiBTX09LOwo= 205392 2013-06-25 06:02:25 -0700 2013-08-01 05:36:29 -0700 Patch bug-117984.patch text/plain 8821 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4OTUyNTNhLi5lM2Q3YjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDYtMjUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmVhcnJhbmdlIHRoZSBjb2RlIG9mIEZyYW1lV2luCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc5ODQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGNvZGUgZnJvbSB0aGUgQ0cgaW1w bGVtZW50YXRpb24gaW50byB0aGUgZ2VuZXJhbCBmaWxlIHNvIHdlIGNhbgorICAgICAgICBzaGFy ZSB0aGUgY29kZSB3aXRoIFdpbmRvd3MgQ0UgcG9ydCBpbiBhIG5leHQgc3RlcC4KKyAgICAgICAg QWxzbyB1c2UgT3duUHRyIGluc3RlYWQgb2YgcGxhaW4gcG9pbnRlcnMgdG8gbWFrZSBvd25lcnNo aXAgbW9yZSBjbGVhci4KKworICAgICAgICAqIHBhZ2Uvd2luL0ZyYW1lQ0dXaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6aW1hZ2VGcm9tUmVjdCk6CisgICAgICAgICogcGFnZS93aW4vRnJhbWVD YWlyb1dpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbWFnZUZyb21SZWN0KToKKyAgICAgICAg KiBwYWdlL3dpbi9GcmFtZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbWFnZUZyb21TZWxl Y3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OmRyYWdJbWFnZUZvclNlbGVjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6bm9kZUltYWdlKToKKyAgICAgICAgKiBwYWdlL3dp bi9GcmFtZVdpbi5oOgorCiAyMDEzLTA2LTI1ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxh bi5qZW5zZW5AZGlnaWEuY29tPgogCiAgICAgICAgIEhUTUxNZWRpYUVsZW1lbnQgc2hvdWxkIGlu aGVyaXQgZnJvbSBNZWRpYVBsYXllckNsaWVudCBwcml2YXRlbHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ0dXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS93 aW4vRnJhbWVDR1dpbi5jcHAKaW5kZXggZDlmZmQ2NC4uMzE5ZTM3NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVDR1dpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS93aW4vRnJhbWVDR1dpbi5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgc3RhdGljIHZvaWQgZHJh d1JlY3RJbnRvQ29udGV4dChJbnRSZWN0IHJlY3QsIEZyYW1lVmlldyogdmlldywgR3JhcGhpY3ND b250ZXh0KgogICAgIHZpZXctPnBhaW50KGdjLCByZWN0KTsKIH0KIAotc3RhdGljIEhCSVRNQVAg aW1hZ2VGcm9tUmVjdChjb25zdCBGcmFtZSogZnJhbWUsIEludFJlY3QmIGlyKQorUGFzc093blB0 cjxIQklUTUFQPiBpbWFnZUZyb21SZWN0KEZyYW1lKiBmcmFtZSwgSW50UmVjdCYgaXIpCiB7CiAg ICAgUGFpbnRCZWhhdmlvciBvbGRQYWludEJlaGF2aW9yID0gZnJhbWUtPnZpZXcoKS0+cGFpbnRC ZWhhdmlvcigpOwogICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3Iob2xkUGFpbnRC ZWhhdmlvciB8IFBhaW50QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXllcnMpOwpAQCAtNjAs OCArNjAsOCBAQCBzdGF0aWMgSEJJVE1BUCBpbWFnZUZyb21SZWN0KGNvbnN0IEZyYW1lKiBmcmFt ZSwgSW50UmVjdCYgaXIpCiAgICAgaW50IGggPSBpci5oZWlnaHQoKTsKICAgICBCaXRtYXBJbmZv IGJtcCA9IEJpdG1hcEluZm86OmNyZWF0ZShJbnRTaXplKHcsIGgpKTsKIAotICAgIEhCSVRNQVAg aGJtcCA9IENyZWF0ZURJQlNlY3Rpb24oMCwgJmJtcCwgRElCX1JHQl9DT0xPUlMsIHN0YXRpY19j YXN0PHZvaWQqKj4oJmJpdHMpLCAwLCAwKTsKLSAgICBIQklUTUFQIGhibXBPbGQgPSBzdGF0aWNf Y2FzdDxIQklUTUFQPihTZWxlY3RPYmplY3QoaGRjLCBoYm1wKSk7CisgICAgT3duUHRyPEhCSVRN QVA+IGhibXAgPSBhZG9wdFB0cihDcmVhdGVESUJTZWN0aW9uKDAsICZibXAsIERJQl9SR0JfQ09M T1JTLCBzdGF0aWNfY2FzdDx2b2lkKio+KCZiaXRzKSwgMCwgMCkpOworICAgIEhHRElPQkogaGJt cE9sZCA9IFNlbGVjdE9iamVjdChoZGMsIGhibXAuZ2V0KCkpOwogICAgIENHQ29udGV4dFJlZiBj b250ZXh0ID0gQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKHN0YXRpY19jYXN0PHZvaWQqPihiaXRzKSwg dywgaCwKICAgICAgICAgOCwgdyAqIHNpemVvZihSR0JRVUFEKSwgZGV2aWNlUkdCQ29sb3JTcGFj ZVJlZigpLCBrQ0dCaXRtYXBCeXRlT3JkZXIzMkxpdHRsZSB8IGtDR0ltYWdlQWxwaGFQcmVtdWx0 aXBsaWVkRmlyc3QpOwogICAgIENHQ29udGV4dFNhdmVHU3RhdGUoY29udGV4dCk7CkBAIC03Niwz OCArNzYsNyBAQCBzdGF0aWMgSEJJVE1BUCBpbWFnZUZyb21SZWN0KGNvbnN0IEZyYW1lKiBmcmFt ZSwgSW50UmVjdCYgaXIpCiAKICAgICBmcmFtZS0+dmlldygpLT5zZXRQYWludEJlaGF2aW9yKG9s ZFBhaW50QmVoYXZpb3IpOwogCi0gICAgcmV0dXJuIGhibXA7Ci19Ci0KLUhCSVRNQVAgaW1hZ2VG cm9tU2VsZWN0aW9uKEZyYW1lKiBmcmFtZSwgYm9vbCBmb3JjZUJsYWNrVGV4dCkKLXsKLSAgICBm cmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlTGF5b3V0KCk7Ci0KLSAgICBmcmFtZS0+dmlldygpLT5z ZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5IHwgKGZvcmNlQmxhY2tU ZXh0ID8gUGFpbnRCZWhhdmlvckZvcmNlQmxhY2tUZXh0IDogMCkpOwotICAgIEZsb2F0UmVjdCBm ciA9IGZyYW1lLT5zZWxlY3Rpb24oKS0+Ym91bmRzKCk7Ci0gICAgSW50UmVjdCBpcihzdGF0aWNf Y2FzdDxpbnQ+KGZyLngoKSksIHN0YXRpY19jYXN0PGludD4oZnIueSgpKSwKLSAgICAgICAgICAg ICAgIHN0YXRpY19jYXN0PGludD4oZnIud2lkdGgoKSksIHN0YXRpY19jYXN0PGludD4oZnIuaGVp Z2h0KCkpKTsKLSAgICBIQklUTUFQIGltYWdlID0gaW1hZ2VGcm9tUmVjdChmcmFtZSwgaXIpOwot ICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3IoUGFpbnRCZWhhdmlvck5vcm1hbCk7 Ci0gICAgcmV0dXJuIGltYWdlOwotfQotCi1EcmFnSW1hZ2VSZWYgRnJhbWU6Om5vZGVJbWFnZShO b2RlKiBub2RlKQotewotICAgIGRvY3VtZW50KCktPnVwZGF0ZUxheW91dCgpOwotCi0gICAgUmVu ZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7Ci0gICAgaWYgKCFyZW5kZXJl cikKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBMYXlvdXRSZWN0IHRvcExldmVsUmVjdDsKLSAg ICBJbnRSZWN0IHBhaW50aW5nUmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3QocmVuZGVyZXItPnBh aW50aW5nUm9vdFJlY3QodG9wTGV2ZWxSZWN0KSk7Ci0KLSAgICBtX3ZpZXctPnNldE5vZGVUb0Ry YXcobm9kZSk7IC8vIGludm9rZSBzcGVjaWFsIHN1Yi10cmVlIGRyYXdpbmcgbW9kZQotICAgIEhC SVRNQVAgcmVzdWx0ID0gaW1hZ2VGcm9tUmVjdCh0aGlzLCBwYWludGluZ1JlY3QpOwotICAgIG1f dmlldy0+c2V0Tm9kZVRvRHJhdygwKTsKLQotICAgIHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJu IGhibXAucmVsZWFzZSgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZUNhaXJvV2luLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvd2luL0ZyYW1lQ2Fpcm9XaW4uY3BwCmluZGV4IGY4NDNiYTEuLjc4NGZlN2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ2Fpcm9XaW4uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ2Fpcm9XaW4uY3BwCkBAIC0yNywyMyArMjcs MTQgQEAKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lV2luLmgiCiAKLSNpbmNs dWRlICJFZGl0b3JDbGllbnQuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogCi11c2lu ZyBzdGQ6Om1pbjsKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1IQklUTUFQIGltYWdlRnJvbVNl bGVjdGlvbihGcmFtZSogZnJhbWUsIGJvb2wgZm9yY2VCbGFja1RleHQpCi17Ci0gICAgbm90SW1w bGVtZW50ZWQoKTsKLSAgICByZXR1cm4gMDsKLX0KLQotRHJhZ0ltYWdlUmVmIEZyYW1lOjpub2Rl SW1hZ2UoTm9kZSopCitQYXNzT3duUHRyPEhCSVRNQVA+IGltYWdlRnJvbVJlY3QoRnJhbWUqLCBJ bnRSZWN0JikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiAwOworICAgIHJl dHVybiBudWxscHRyOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3dpbi9GcmFtZVdpbi5jcHAKaW5kZXggYzQ1MjU1OS4uYWFmZWU3NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvd2luL0ZyYW1lV2luLmNwcApAQCAtMjYsMTYgKzI2LDEzIEBACiAjaW5jbHVkZSAiY29uZmln LmgiCiAjaW5jbHVkZSAiRnJhbWVXaW4uaCIKIAotI2luY2x1ZGUgIkJyaWRnZUpTQy5oIgogI2lu Y2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiRnJh bWUuaCIKICNpbmNsdWRlICJGcmFtZVNlbGVjdGlvbi5oIgorI2luY2x1ZGUgIkZyYW1lVmlldy5o IgogI2luY2x1ZGUgIlByaW50Q29udGV4dC5oIgotI2luY2x1ZGUgIlJhbmdlLmgiCi0jaW5jbHVk ZSAiUmVuZGVyVmlldy5oIgotI2luY2x1ZGUgIlNldHRpbmdzLmgiCi0jaW5jbHVkZSAiVHJhbnNm b3JtYXRpb25NYXRyaXguaCIKKyNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCkBAIC00OCwxMiArNDUsNDIgQEAgdm9pZCBjb21wdXRlUGFnZVJlY3RzRm9y RnJhbWUoRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRSZWN0JiBwcmludFJlY3QsIGZsb2F0IGhlYWQK ICAgICBvdXRQYWdlcyA9IHByaW50Q29udGV4dC5wYWdlUmVjdHMoKTsKIH0KIAorUGFzc093blB0 cjxIQklUTUFQPiBpbWFnZUZyb21TZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBib29sIGZvcmNlQmxh Y2tUZXh0KQoreworICAgIGZyYW1lLT5kb2N1bWVudCgpLT51cGRhdGVMYXlvdXQoKTsKKworICAg IGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3IoUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9u bHkgfCAoZm9yY2VCbGFja1RleHQgPyBQYWludEJlaGF2aW9yRm9yY2VCbGFja1RleHQgOiAwKSk7 CisgICAgRmxvYXRSZWN0IGZyID0gZnJhbWUtPnNlbGVjdGlvbigpLT5ib3VuZHMoKTsKKyAgICBJ bnRSZWN0IGlyKHN0YXRpY19jYXN0PGludD4oZnIueCgpKSwgc3RhdGljX2Nhc3Q8aW50Pihmci55 KCkpLCBzdGF0aWNfY2FzdDxpbnQ+KGZyLndpZHRoKCkpLCBzdGF0aWNfY2FzdDxpbnQ+KGZyLmhl aWdodCgpKSk7CisgICAgT3duUHRyPEhCSVRNQVA+IGltYWdlID0gaW1hZ2VGcm9tUmVjdChmcmFt ZSwgaXIpOworICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3IoUGFpbnRCZWhhdmlv ck5vcm1hbCk7CisgICAgcmV0dXJuIGltYWdlLnJlbGVhc2UoKTsKK30KKwogRHJhZ0ltYWdlUmVm IEZyYW1lOjpkcmFnSW1hZ2VGb3JTZWxlY3Rpb24oKQoteyAgICAKK3sKICAgICBpZiAoc2VsZWN0 aW9uKCktPmlzUmFuZ2UoKSkKLSAgICAgICAgcmV0dXJuIGltYWdlRnJvbVNlbGVjdGlvbih0aGlz LCBmYWxzZSk7CisgICAgICAgIHJldHVybiBpbWFnZUZyb21TZWxlY3Rpb24odGhpcywgZmFsc2Up LmxlYWtQdHIoKTsKIAogICAgIHJldHVybiAwOwogfQogCitEcmFnSW1hZ2VSZWYgRnJhbWU6Om5v ZGVJbWFnZShOb2RlKiBub2RlKQoreworICAgIGRvY3VtZW50KCktPnVwZGF0ZUxheW91dCgpOwor CisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7CisgICAgaWYg KCFyZW5kZXJlcikKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBMYXlvdXRSZWN0IHRvcExldmVs UmVjdDsKKyAgICBJbnRSZWN0IHBhaW50aW5nUmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3QocmVu ZGVyZXItPnBhaW50aW5nUm9vdFJlY3QodG9wTGV2ZWxSZWN0KSk7CisKKyAgICBtX3ZpZXctPnNl dE5vZGVUb0RyYXcobm9kZSk7IC8vIGludm9rZSBzcGVjaWFsIHN1Yi10cmVlIGRyYXdpbmcgbW9k ZQorICAgIE93blB0cjxIQklUTUFQPiByZXN1bHQgPSBpbWFnZUZyb21SZWN0KHRoaXMsIHBhaW50 aW5nUmVjdCk7CisgICAgbV92aWV3LT5zZXROb2RlVG9EcmF3KDApOworCisgICAgcmV0dXJuIHJl c3VsdC5sZWFrUHRyKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lV2luLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3dpbi9GcmFtZVdpbi5oCmluZGV4IGNiZmUzM2QuLmNmZjQ1ODQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lV2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS93 aW4vRnJhbWVXaW4uaApAQCAtMjYsNiArMjYsNyBAQAogI2lmbmRlZiBGcmFtZVdpbl9oCiAjZGVm aW5lIEZyYW1lV2luX2gKIAorI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAjaW5jbHVkZSA8 d3RmL1ZlY3Rvci5oPgogCiAvLyBGb3J3YXJkIGRlY2xhcmVkIHNvIHdlIGRvbid0IG5lZWQgd2lu Z2RpLmguCkBAIC0zMywxMiArMzQsMTMgQEAgdHlwZWRlZiBzdHJ1Y3QgSEJJVE1BUF9fKiBIQklU TUFQOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSAgICBjbGFzcyBGcmFtZTsKLSAgICBjbGFz cyBJbnRSZWN0OworY2xhc3MgRnJhbWU7CitjbGFzcyBJbnRSZWN0OwogCi0gICAgSEJJVE1BUCBp bWFnZUZyb21TZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBib29sIGZvcmNlV2hpdGVUZXh0KTsKLSAg ICB2b2lkIGNvbXB1dGVQYWdlUmVjdHNGb3JGcmFtZShGcmFtZSosIGNvbnN0IEludFJlY3QmIHBy aW50UmVjdCwgZmxvYXQgaGVhZGVySGVpZ2h0LCBmbG9hdCBmb290ZXJIZWlnaHQsIGZsb2F0IHVz ZXJTY2FsZUZhY3RvciwgVmVjdG9yPEludFJlY3Q+JiBvdXRQYWdlcywgaW50JiBvdXRQYWdlSGVp Z2h0KTsKK1Bhc3NPd25QdHI8SEJJVE1BUD4gaW1hZ2VGcm9tUmVjdChGcmFtZSosIEludFJlY3Qm KTsKK1Bhc3NPd25QdHI8SEJJVE1BUD4gaW1hZ2VGcm9tU2VsZWN0aW9uKEZyYW1lKiwgYm9vbCBm b3JjZVdoaXRlVGV4dCk7Cit2b2lkIGNvbXB1dGVQYWdlUmVjdHNGb3JGcmFtZShGcmFtZSosIGNv bnN0IEludFJlY3QmIHByaW50UmVjdCwgZmxvYXQgaGVhZGVySGVpZ2h0LCBmbG9hdCBmb290ZXJI ZWlnaHQsIGZsb2F0IHVzZXJTY2FsZUZhY3RvciwgVmVjdG9yPEludFJlY3Q+JiBvdXRQYWdlcywg aW50JiBvdXRQYWdlSGVpZ2h0KTsKIAotfQorfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCi0jZW5k aWYKKyNlbmRpZiAvLyBGcmFtZVdpbl9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggNTRiMDEwOC4uNjg1 MzViYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA2LTI1ICBQYXRy aWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlYXJyYW5nZSB0 aGUgY29kZSBvZiBGcmFtZVdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3OTg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OmdlbmVyYXRlU2Vs ZWN0aW9uSW1hZ2UpOgorCiAyMDEzLTA2LTI0ICBLYW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1z dW5nLmNvbT4KIAogICAgICAgICBBZG9wdCBpcy90b0hUTUxGb3JtRWxlbWVudCBmb3IgY29kZSBj bGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IDM0NTM1NDcuLjg4MjQ5NTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2lu L1dlYlZpZXcuY3BwCkBAIC0zNTI4LDggKzM1MjgsOCBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExU WVBFIFdlYlZpZXc6OmdlbmVyYXRlU2VsZWN0aW9uSW1hZ2UoQk9PTCBmb3JjZVdoaXRlVGV4dCwg TwogICAgIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkt PmZvY3VzZWRPck1haW5GcmFtZSgpOwogCiAgICAgaWYgKGZyYW1lKSB7Ci0gICAgICAgIEhCSVRN QVAgYml0bWFwID0gaW1hZ2VGcm9tU2VsZWN0aW9uKGZyYW1lLCBmb3JjZVdoaXRlVGV4dCA/IFRS VUUgOiBGQUxTRSk7Ci0gICAgICAgICpoQml0bWFwID0gKE9MRV9IQU5ETEUpKFVMT05HNjQpYml0 bWFwOworICAgICAgICBPd25QdHI8SEJJVE1BUD4gYml0bWFwID0gaW1hZ2VGcm9tU2VsZWN0aW9u KGZyYW1lLCBmb3JjZVdoaXRlVGV4dCA/IFRSVUUgOiBGQUxTRSk7CisgICAgICAgICpoQml0bWFw ID0gc3RhdGljX2Nhc3Q8T0xFX0hBTkRMRT4ocmVpbnRlcnByZXRfY2FzdDxVTE9ORzY0PihiaXRt YXAubGVha1B0cigpKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIFNfT0s7Cg== 207914 2013-08-01 05:36:29 -0700 2013-08-01 09:22:00 -0700 Patch for landing bug-117984.patch text/plain 8929 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4OTUyNTNhLi5lM2Q3YjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTMtMDYtMjUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmVhcnJhbmdlIHRoZSBjb2RlIG9mIEZyYW1lV2luCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc5ODQKKworICAgICAgICBSZXZpZXdl ZCBieSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIE1vdmUgY29kZSBmcm9tIHRoZSBDRyBpbXBs ZW1lbnRhdGlvbiBpbnRvIHRoZSBnZW5lcmFsIGZpbGUgc28gd2UgY2FuCisgICAgICAgIHNoYXJl IHRoZSBjb2RlIHdpdGggV2luZG93cyBDRSBwb3J0IGluIGEgbmV4dCBzdGVwLiBJbiBhIGZpcnN0 IHN0ZXAKKyAgICAgICAgaXQgb25seSBzaGFyZXMgbW9yZSBjb2RlIGJldHdlZW4gdGhlIENHIGFu ZCBDYWlybyBpbXBsZW1lbnRhdGlvbnMuCisgICAgICAgIEFsc28gdXNlIE93blB0ciBpbnN0ZWFk IG9mIHBsYWluIHBvaW50ZXJzIHRvIG1ha2Ugb3duZXJzaGlwIG1vcmUgY2xlYXIuCisKKyAgICAg ICAgKiBwYWdlL3dpbi9GcmFtZUNHV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmltYWdlRnJv bVJlY3QpOgorICAgICAgICAqIHBhZ2Uvd2luL0ZyYW1lQ2Fpcm9XaW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6aW1hZ2VGcm9tUmVjdCk6CisgICAgICAgICogcGFnZS93aW4vRnJhbWVXaW4uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6aW1hZ2VGcm9tU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lOjpkcmFnSW1hZ2VGb3JTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWU6Om5vZGVJbWFnZSk6CisgICAgICAgICogcGFnZS93aW4vRnJhbWVXaW4uaDoKKwogMjAxMy0w Ni0yNSAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KIAog ICAgICAgICBIVE1MTWVkaWFFbGVtZW50IHNob3VsZCBpbmhlcml0IGZyb20gTWVkaWFQbGF5ZXJD bGllbnQgcHJpdmF0ZWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFt ZUNHV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ0dXaW4uY3BwCmluZGV4 IGQ5ZmZkNjQuLjMxOWUzNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0Zy YW1lQ0dXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lQ0dXaW4uY3Bw CkBAIC00OSw3ICs0OSw3IEBAIHN0YXRpYyB2b2lkIGRyYXdSZWN0SW50b0NvbnRleHQoSW50UmVj dCByZWN0LCBGcmFtZVZpZXcqIHZpZXcsIEdyYXBoaWNzQ29udGV4dCoKICAgICB2aWV3LT5wYWlu dChnYywgcmVjdCk7CiB9CiAKLXN0YXRpYyBIQklUTUFQIGltYWdlRnJvbVJlY3QoY29uc3QgRnJh bWUqIGZyYW1lLCBJbnRSZWN0JiBpcikKK1Bhc3NPd25QdHI8SEJJVE1BUD4gaW1hZ2VGcm9tUmVj dChjb25zdCBGcmFtZSogZnJhbWUsIEludFJlY3QmIGlyKQogewogICAgIFBhaW50QmVoYXZpb3Ig b2xkUGFpbnRCZWhhdmlvciA9IGZyYW1lLT52aWV3KCktPnBhaW50QmVoYXZpb3IoKTsKICAgICBm cmFtZS0+dmlldygpLT5zZXRQYWludEJlaGF2aW9yKG9sZFBhaW50QmVoYXZpb3IgfCBQYWludEJl aGF2aW9yRmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzKTsKQEAgLTYwLDggKzYwLDggQEAgc3RhdGlj IEhCSVRNQVAgaW1hZ2VGcm9tUmVjdChjb25zdCBGcmFtZSogZnJhbWUsIEludFJlY3QmIGlyKQog ICAgIGludCBoID0gaXIuaGVpZ2h0KCk7CiAgICAgQml0bWFwSW5mbyBibXAgPSBCaXRtYXBJbmZv OjpjcmVhdGUoSW50U2l6ZSh3LCBoKSk7CiAKLSAgICBIQklUTUFQIGhibXAgPSBDcmVhdGVESUJT ZWN0aW9uKDAsICZibXAsIERJQl9SR0JfQ09MT1JTLCBzdGF0aWNfY2FzdDx2b2lkKio+KCZiaXRz KSwgMCwgMCk7Ci0gICAgSEJJVE1BUCBoYm1wT2xkID0gc3RhdGljX2Nhc3Q8SEJJVE1BUD4oU2Vs ZWN0T2JqZWN0KGhkYywgaGJtcCkpOworICAgIE93blB0cjxIQklUTUFQPiBoYm1wID0gYWRvcHRQ dHIoQ3JlYXRlRElCU2VjdGlvbigwLCAmYm1wLCBESUJfUkdCX0NPTE9SUywgc3RhdGljX2Nhc3Q8 dm9pZCoqPigmYml0cyksIDAsIDApKTsKKyAgICBIR0RJT0JKIGhibXBPbGQgPSBTZWxlY3RPYmpl Y3QoaGRjLCBoYm1wLmdldCgpKTsKICAgICBDR0NvbnRleHRSZWYgY29udGV4dCA9IENHQml0bWFw Q29udGV4dENyZWF0ZShzdGF0aWNfY2FzdDx2b2lkKj4oYml0cyksIHcsIGgsCiAgICAgICAgIDgs IHcgKiBzaXplb2YoUkdCUVVBRCksIGRldmljZVJHQkNvbG9yU3BhY2VSZWYoKSwga0NHQml0bWFw Qnl0ZU9yZGVyMzJMaXR0bGUgfCBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0KTsKICAg ICBDR0NvbnRleHRTYXZlR1N0YXRlKGNvbnRleHQpOwpAQCAtNzYsMzggKzc2LDcgQEAgc3RhdGlj IEhCSVRNQVAgaW1hZ2VGcm9tUmVjdChjb25zdCBGcmFtZSogZnJhbWUsIEludFJlY3QmIGlyKQog CiAgICAgZnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihvbGRQYWludEJlaGF2aW9yKTsK IAotICAgIHJldHVybiBoYm1wOwotfQotCi1IQklUTUFQIGltYWdlRnJvbVNlbGVjdGlvbihGcmFt ZSogZnJhbWUsIGJvb2wgZm9yY2VCbGFja1RleHQpCi17Ci0gICAgZnJhbWUtPmRvY3VtZW50KCkt PnVwZGF0ZUxheW91dCgpOwotCi0gICAgZnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihQ YWludEJlaGF2aW9yU2VsZWN0aW9uT25seSB8IChmb3JjZUJsYWNrVGV4dCA/IFBhaW50QmVoYXZp b3JGb3JjZUJsYWNrVGV4dCA6IDApKTsKLSAgICBGbG9hdFJlY3QgZnIgPSBmcmFtZS0+c2VsZWN0 aW9uKCktPmJvdW5kcygpOwotICAgIEludFJlY3QgaXIoc3RhdGljX2Nhc3Q8aW50Pihmci54KCkp LCBzdGF0aWNfY2FzdDxpbnQ+KGZyLnkoKSksCi0gICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxp bnQ+KGZyLndpZHRoKCkpLCBzdGF0aWNfY2FzdDxpbnQ+KGZyLmhlaWdodCgpKSk7Ci0gICAgSEJJ VE1BUCBpbWFnZSA9IGltYWdlRnJvbVJlY3QoZnJhbWUsIGlyKTsKLSAgICBmcmFtZS0+dmlldygp LT5zZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JOb3JtYWwpOwotICAgIHJldHVybiBpbWFn ZTsKLX0KLQotRHJhZ0ltYWdlUmVmIEZyYW1lOjpub2RlSW1hZ2UoTm9kZSogbm9kZSkKLXsKLSAg ICBkb2N1bWVudCgpLT51cGRhdGVMYXlvdXQoKTsKLQotICAgIFJlbmRlck9iamVjdCogcmVuZGVy ZXIgPSBub2RlLT5yZW5kZXJlcigpOwotICAgIGlmICghcmVuZGVyZXIpCi0gICAgICAgIHJldHVy biAwOwotCi0gICAgTGF5b3V0UmVjdCB0b3BMZXZlbFJlY3Q7Ci0gICAgSW50UmVjdCBwYWludGlu Z1JlY3QgPSBwaXhlbFNuYXBwZWRJbnRSZWN0KHJlbmRlcmVyLT5wYWludGluZ1Jvb3RSZWN0KHRv cExldmVsUmVjdCkpOwotCi0gICAgbV92aWV3LT5zZXROb2RlVG9EcmF3KG5vZGUpOyAvLyBpbnZv a2Ugc3BlY2lhbCBzdWItdHJlZSBkcmF3aW5nIG1vZGUKLSAgICBIQklUTUFQIHJlc3VsdCA9IGlt YWdlRnJvbVJlY3QodGhpcywgcGFpbnRpbmdSZWN0KTsKLSAgICBtX3ZpZXctPnNldE5vZGVUb0Ry YXcoMCk7Ci0KLSAgICByZXR1cm4gcmVzdWx0OworICAgIHJldHVybiBoYm1wLnJlbGVhc2UoKTsK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS93aW4vRnJhbWVDYWlyb1dpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFt ZUNhaXJvV2luLmNwcAppbmRleCBmODQzYmExLi43ODRmZTdmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3dpbi9GcmFtZUNhaXJvV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3dpbi9GcmFtZUNhaXJvV2luLmNwcApAQCAtMjcsMjMgKzI3LDE0IEBACiAjaW5jbHVkZSAi RnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVdpbi5oIgogCi0jaW5jbHVkZSAiRWRpdG9yQ2xpZW50 LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKIAotdXNpbmcgc3RkOjptaW47Ci0KIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotSEJJVE1BUCBpbWFnZUZyb21TZWxlY3Rpb24oRnJhbWUqIGZy YW1lLCBib29sIGZvcmNlQmxhY2tUZXh0KQotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAg cmV0dXJuIDA7Ci19Ci0KLURyYWdJbWFnZVJlZiBGcmFtZTo6bm9kZUltYWdlKE5vZGUqKQorUGFz c093blB0cjxIQklUTUFQPiBpbWFnZUZyb21SZWN0KGNvbnN0IEZyYW1lKiwgSW50UmVjdCYpCiB7 CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0 cjsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS93aW4vRnJhbWVXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVX aW4uY3BwCmluZGV4IGM0NTI1NTkuLmFhZmVlNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvd2luL0ZyYW1lV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3dpbi9GcmFt ZVdpbi5jcHAKQEAgLTI2LDE2ICsyNiwxMyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgIkZyYW1lV2luLmgiCiAKLSNpbmNsdWRlICJCcmlkZ2VKU0MuaCIKICNpbmNsdWRlICJEb2N1 bWVudC5oIgogI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5j bHVkZSAiRnJhbWVTZWxlY3Rpb24uaCIKKyNpbmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRl ICJQcmludENvbnRleHQuaCIKLSNpbmNsdWRlICJSYW5nZS5oIgotI2luY2x1ZGUgIlJlbmRlclZp ZXcuaCIKLSNpbmNsdWRlICJTZXR0aW5ncy5oIgotI2luY2x1ZGUgIlRyYW5zZm9ybWF0aW9uTWF0 cml4LmgiCisjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IApAQCAtNDgsMTIgKzQ1LDQyIEBAIHZvaWQgY29tcHV0ZVBhZ2VSZWN0c0ZvckZyYW1lKEZyYW1l KiBmcmFtZSwgY29uc3QgSW50UmVjdCYgcHJpbnRSZWN0LCBmbG9hdCBoZWFkCiAgICAgb3V0UGFn ZXMgPSBwcmludENvbnRleHQucGFnZVJlY3RzKCk7CiB9CiAKK1Bhc3NPd25QdHI8SEJJVE1BUD4g aW1hZ2VGcm9tU2VsZWN0aW9uKEZyYW1lKiBmcmFtZSwgYm9vbCBmb3JjZUJsYWNrVGV4dCkKK3sK KyAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlTGF5b3V0KCk7CisKKyAgICBmcmFtZS0+dmll dygpLT5zZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5IHwgKGZvcmNl QmxhY2tUZXh0ID8gUGFpbnRCZWhhdmlvckZvcmNlQmxhY2tUZXh0IDogMCkpOworICAgIEZsb2F0 UmVjdCBmciA9IGZyYW1lLT5zZWxlY3Rpb24oKS0+Ym91bmRzKCk7CisgICAgSW50UmVjdCBpcihz dGF0aWNfY2FzdDxpbnQ+KGZyLngoKSksIHN0YXRpY19jYXN0PGludD4oZnIueSgpKSwgc3RhdGlj X2Nhc3Q8aW50Pihmci53aWR0aCgpKSwgc3RhdGljX2Nhc3Q8aW50Pihmci5oZWlnaHQoKSkpOwor ICAgIE93blB0cjxIQklUTUFQPiBpbWFnZSA9IGltYWdlRnJvbVJlY3QoZnJhbWUsIGlyKTsKKyAg ICBmcmFtZS0+dmlldygpLT5zZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JOb3JtYWwpOwor ICAgIHJldHVybiBpbWFnZS5yZWxlYXNlKCk7Cit9CisKIERyYWdJbWFnZVJlZiBGcmFtZTo6ZHJh Z0ltYWdlRm9yU2VsZWN0aW9uKCkKLXsgICAgCit7CiAgICAgaWYgKHNlbGVjdGlvbigpLT5pc1Jh bmdlKCkpCi0gICAgICAgIHJldHVybiBpbWFnZUZyb21TZWxlY3Rpb24odGhpcywgZmFsc2UpOwor ICAgICAgICByZXR1cm4gaW1hZ2VGcm9tU2VsZWN0aW9uKHRoaXMsIGZhbHNlKS5sZWFrUHRyKCk7 CiAKICAgICByZXR1cm4gMDsKIH0KIAorRHJhZ0ltYWdlUmVmIEZyYW1lOjpub2RlSW1hZ2UoTm9k ZSogbm9kZSkKK3sKKyAgICBkb2N1bWVudCgpLT51cGRhdGVMYXlvdXQoKTsKKworICAgIFJlbmRl ck9iamVjdCogcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigpOworICAgIGlmICghcmVuZGVyZXIp CisgICAgICAgIHJldHVybiAwOworCisgICAgTGF5b3V0UmVjdCB0b3BMZXZlbFJlY3Q7CisgICAg SW50UmVjdCBwYWludGluZ1JlY3QgPSBwaXhlbFNuYXBwZWRJbnRSZWN0KHJlbmRlcmVyLT5wYWlu dGluZ1Jvb3RSZWN0KHRvcExldmVsUmVjdCkpOworCisgICAgbV92aWV3LT5zZXROb2RlVG9EcmF3 KG5vZGUpOyAvLyBpbnZva2Ugc3BlY2lhbCBzdWItdHJlZSBkcmF3aW5nIG1vZGUKKyAgICBPd25Q dHI8SEJJVE1BUD4gcmVzdWx0ID0gaW1hZ2VGcm9tUmVjdCh0aGlzLCBwYWludGluZ1JlY3QpOwor ICAgIG1fdmlldy0+c2V0Tm9kZVRvRHJhdygwKTsKKworICAgIHJldHVybiByZXN1bHQubGVha1B0 cigpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3dpbi9GcmFtZVdpbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVX aW4uaAppbmRleCBjYmZlMzNkLi5jZmY0NTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3dpbi9GcmFtZVdpbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lV2lu LmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgRnJhbWVXaW5faAogI2RlZmluZSBGcmFtZVdp bl9oCiAKKyNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3Iu aD4KIAogLy8gRm9yd2FyZCBkZWNsYXJlZCBzbyB3ZSBkb24ndCBuZWVkIHdpbmdkaS5oLgpAQCAt MzMsMTIgKzM0LDEzIEBAIHR5cGVkZWYgc3RydWN0IEhCSVRNQVBfXyogSEJJVE1BUDsKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xhc3MgRnJhbWU7Ci0gICAgY2xhc3MgSW50UmVjdDsK K2NsYXNzIEZyYW1lOworY2xhc3MgSW50UmVjdDsKIAotICAgIEhCSVRNQVAgaW1hZ2VGcm9tU2Vs ZWN0aW9uKEZyYW1lKiBmcmFtZSwgYm9vbCBmb3JjZVdoaXRlVGV4dCk7Ci0gICAgdm9pZCBjb21w dXRlUGFnZVJlY3RzRm9yRnJhbWUoRnJhbWUqLCBjb25zdCBJbnRSZWN0JiBwcmludFJlY3QsIGZs b2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVySGVpZ2h0LCBmbG9hdCB1c2VyU2NhbGVGYWN0 b3IsIFZlY3RvcjxJbnRSZWN0PiYgb3V0UGFnZXMsIGludCYgb3V0UGFnZUhlaWdodCk7CitQYXNz T3duUHRyPEhCSVRNQVA+IGltYWdlRnJvbVJlY3QoY29uc3QgRnJhbWUqLCBJbnRSZWN0Jik7CitQ YXNzT3duUHRyPEhCSVRNQVA+IGltYWdlRnJvbVNlbGVjdGlvbihGcmFtZSosIGJvb2wgZm9yY2VX aGl0ZVRleHQpOwordm9pZCBjb21wdXRlUGFnZVJlY3RzRm9yRnJhbWUoRnJhbWUqLCBjb25zdCBJ bnRSZWN0JiBwcmludFJlY3QsIGZsb2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVySGVpZ2h0 LCBmbG9hdCB1c2VyU2NhbGVGYWN0b3IsIFZlY3RvcjxJbnRSZWN0PiYgb3V0UGFnZXMsIGludCYg b3V0UGFnZUhlaWdodCk7CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAotI2VuZGlmCisj ZW5kaWYgLy8gRnJhbWVXaW5faApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDU0YjAxMDguLjY4NTM1YmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wNi0yNSAgUGF0cmljayBH YW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZWFycmFuZ2UgdGhlIGNv ZGUgb2YgRnJhbWVXaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNzk4NAorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAg ICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OmdlbmVyYXRlU2VsZWN0aW9u SW1hZ2UpOgorCiAyMDEzLTA2LTI0ICBLYW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNv bT4KIAogICAgICAgICBBZG9wdCBpcy90b0hUTUxGb3JtRWxlbWVudCBmb3IgY29kZSBjbGVhbnVw CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IDM0NTM1NDcuLjg4MjQ5NTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZp ZXcuY3BwCkBAIC0zNTI4LDggKzM1MjgsOCBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdl YlZpZXc6OmdlbmVyYXRlU2VsZWN0aW9uSW1hZ2UoQk9PTCBmb3JjZVdoaXRlVGV4dCwgTwogICAg IFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3Vz ZWRPck1haW5GcmFtZSgpOwogCiAgICAgaWYgKGZyYW1lKSB7Ci0gICAgICAgIEhCSVRNQVAgYml0 bWFwID0gaW1hZ2VGcm9tU2VsZWN0aW9uKGZyYW1lLCBmb3JjZVdoaXRlVGV4dCA/IFRSVUUgOiBG QUxTRSk7Ci0gICAgICAgICpoQml0bWFwID0gKE9MRV9IQU5ETEUpKFVMT05HNjQpYml0bWFwOwor ICAgICAgICBPd25QdHI8SEJJVE1BUD4gYml0bWFwID0gaW1hZ2VGcm9tU2VsZWN0aW9uKGZyYW1l LCBmb3JjZVdoaXRlVGV4dCA/IFRSVUUgOiBGQUxTRSk7CisgICAgICAgICpoQml0bWFwID0gc3Rh dGljX2Nhc3Q8T0xFX0hBTkRMRT4ocmVpbnRlcnByZXRfY2FzdDxVTE9ORzY0PihiaXRtYXAubGVh a1B0cigpKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIFNfT0s7Cg==