84591 2012-04-23 06:17:02 -0700 [Qt] Restore x-position when restoring previous zoom-level 2012-04-24 02:41:57 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84602 1 allan.jensen allan.jensen abecsi menard webkit.review.bot zalan zoltan oldest_to_newest 607627 0 allan.jensen 2012-04-23 06:17:02 -0700 When zooming out on tap to zoom the previous zoom-level is reestablished, but the previous position is not. The X-position needs to be restored to ensure the columns that were visible before zooming-in will be visible again after zooming out. Y-position does not need to be restored since zooming is fit-to-width, and moving Y-position is an intended feature of double-tap. 607631 1 138333 allan.jensen 2012-04-23 06:25:25 -0700 Created attachment 138333 Patch 607646 2 138333 menard 2012-04-23 06:51:50 -0700 Comment on attachment 138333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138333&action=review > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:96 > +static inline bool fuzzyCompare(qreal a, qreal b, qreal f) qFuzzyCompare is not good enough? 607648 3 allan.jensen 2012-04-23 06:56:44 -0700 (In reply to comment #2) > (From update of attachment 138333 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138333&action=review > > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:96 > > +static inline bool fuzzyCompare(qreal a, qreal b, qreal f) > > qFuzzyCompare is not good enough? I tried it, but I still had cases where a double-tap didn't zoom out, and qFuzzyCompare couldn't take an argument for epsilon. I am kinda of surprised I couldn't find a proper Qt floating-point compare with epsilon argument. 607713 4 138355 allan.jensen 2012-04-23 08:48:05 -0700 Created attachment 138355 Patch 607716 5 webkit.review.bot 2012-04-23 08:51:42 -0700 Attachment 138355 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:27: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 607729 6 138355 abecsi 2012-04-23 09:04:44 -0700 Comment on attachment 138355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138355&action=review > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:99 > + return std::abs(a - b) < epsilon; I think you could use qAbs() here, then you wouldn't need cmath. Looks good otherwise. 607731 7 allan.jensen 2012-04-23 09:06:19 -0700 (In reply to comment #5) > Attachment 138355 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:27: Alphabetical sorting problem. [build/include_order] [4] > Total errors found: 1 in 3 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Style-bot is wrong by the way. The includes are sorted with system-includes after other includes. 607737 8 abecsi 2012-04-23 09:14:15 -0700 (In reply to comment #7) > (In reply to comment #5) > > Attachment 138355 [details] [details] did not pass style-queue: > > > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:27: Alphabetical sorting problem. [build/include_order] [4] > > Total errors found: 1 in 3 files > > > > > > If any of these errors are false positives, please file a bug against check-webkit-style. > > Style-bot is wrong by the way. The includes are sorted with system-includes after other includes. I think the bot uses C locale for sort (LC_COLLATE=C) which would expect cmath after QWheelEvent. 607739 9 138361 allan.jensen 2012-04-23 09:14:43 -0700 Created attachment 138361 Patch 607756 10 allan.jensen 2012-04-23 09:32:58 -0700 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #5) > > > Attachment 138355 [details] [details] [details] did not pass style-queue: > > > > > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 > > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:27: Alphabetical sorting problem. [build/include_order] [4] > > > Total errors found: 1 in 3 files > > > > > > > > > If any of these errors are false positives, please file a bug against check-webkit-style. > > > > Style-bot is wrong by the way. The includes are sorted with system-includes after other includes. > > I think the bot uses C locale for sort (LC_COLLATE=C) which would expect cmath after QWheelEvent. That was where I first placed it. There was no place the style-checker would accept it. Anyway it is gone now, qAbs was a better choice. 607761 11 abecsi 2012-04-23 09:47:36 -0700 (In reply to comment #10) > (In reply to comment #8) > > (In reply to comment #7) > > > (In reply to comment #5) > > > > Attachment 138355 [details] [details] [details] [details] did not pass style-queue: > > > > > > > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 > > > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:27: Alphabetical sorting problem. [build/include_order] [4] > > > > Total errors found: 1 in 3 files > > > > > > > > > > > > If any of these errors are false positives, please file a bug against check-webkit-style. > > > > > > Style-bot is wrong by the way. The includes are sorted with system-includes after other includes. > > > > I think the bot uses C locale for sort (LC_COLLATE=C) which would expect cmath after QWheelEvent. > > That was where I first placed it. There was no place the style-checker would accept it. Anyway it is gone now, qAbs was a better choice. That's probably because your system has something like en_US.UTF-8 as a locale, using LC_COLLATE=C Tools/Scripts/check-webkit-style might give the correct result. 608433 12 138512 allan.jensen 2012-04-24 01:12:08 -0700 Created attachment 138512 Patch 608436 13 zalan 2012-04-24 01:13:51 -0700 discussed on #irc. the updated(coming) patch looks good. :) 608495 14 138512 webkit.review.bot 2012-04-24 02:41:51 -0700 Comment on attachment 138512 Patch Clearing flags on attachment: 138512 Committed r115022: <http://trac.webkit.org/changeset/115022> 608496 15 webkit.review.bot 2012-04-24 02:41:57 -0700 All reviewed patches have been landed. Closing bug. 138333 2012-04-23 06:25:25 -0700 2012-04-23 08:47:58 -0700 Patch bug-84591-20120423152531.patch text/plain 6123 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTdmZTFlYzg5YjVmZTkz YjUyN2FhMzgzYWRmZmY0YTdmMmVhZDZmNS4uYTczNWI1NTAzNzViNDdiNzg5ZGYwZTllNDlhOWUw YzAyMGE5NGQzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTIzICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gUmVzdG9yZSB4LXBvc2l0aW9uIHdoZW4gcmVzdG9yaW5nIHByZXZpb3VzIHpvb20tbGV2ZWwu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU5MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAg VGFwLXRvLXpvb20gZml0cyBjb250ZW50IHRvIHdpZHRoLCB0aGVyZWZvcmUgaXQgaXMgZXNzZW50 aW9uYWwgdGhhdAorICAgICAgICB0aGUgY29udGVudCBpcyByZWZpdHRlZCB0byB3aWR0aCB3aGVu IHpvb21pbmcgb3V0LgorICAgICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBwYWlycyBob3Jpem9u dGFsIHBvc2l0aW9uIGFuZCBzY2FsZSBvbiB0aGUgem9vbS1vdXQgc3RhY2suCisgICAgICAgIAor ICAgICAgICBBZGRpdGlvbmFsbHkgaXQgZml4ZXMgYSBwcm9ibGVtIHdpdGggbm90IGRldGVjdGlu ZyB6b29tLW91dCBwcm9wZXJseQorICAgICAgICBkdWUgdG8gZmxvYXRpbmcgcG9pbnQgZXJyb3Jz LgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OmZ1enp5Q29tcGFyZSk6CisgICAgICAgIChXZWJLaXQ6OlF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZCk6CisgICAg ICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgorICAgICAg ICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OlNjYWxlU3RhY2tJdGVtOjpT Y2FsZVN0YWNrSXRlbSk6CisgICAgICAgIChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgor CiAyMDEyLTA0LTIzICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBBZGQgdGVzdCBmdW5jdGlvbiB0byBnZXQgcGxhY2Vob2xkZXIgc3RyaW5nCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmUuY3BwCmluZGV4IDEzOTAzNTZmMjg2ZTgyMThjZTQ1ZTVkNmQ4ODE3NjNhMTdhYmJhZWEu LjlhMjA4ZmVmZDcxMTllOTE1ZGEwZGM0MDgxYWY3MjYyZTJjMmNmODYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmUuY3BwCkBAIC05Miw2ICs5MiwxNyBAQCBwcml2YXRlOgogICAgIFF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZSogY29uc3QgZW5naW5lOwogfTsKIAorLy8gQSBmdXp6eSBjb21wYXJlIHdp dGggY29uZmlndXJhYmxlIGZ1enppbmVzcy4KK3N0YXRpYyBpbmxpbmUgYm9vbCBmdXp6eUNvbXBh cmUocXJlYWwgYSwgcXJlYWwgYiwgcXJlYWwgZikKK3sKKyAgICBxcmVhbCBkaWZmID0gYSAtIGI7 CisgICAgaWYgKGRpZmYgPiAwLjApCisgICAgICAgIHJldHVybiBkaWZmIDwgZjsKKyAgICBpZiAo ZGlmZiA8IDAuMCkKKyAgICAgICAgcmV0dXJuIC1kaWZmIDwgZjsKKyAgICByZXR1cm4gdHJ1ZTsK K30KKwogaW5saW5lIHFyZWFsIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y3NzU2NhbGVG cm9tSXRlbShxcmVhbCBpdGVtU2NhbGUpCiB7CiAgICAgcmV0dXJuIGl0ZW1TY2FsZSAvIG1fZGV2 aWNlUGl4ZWxSYXRpbzsKQEAgLTM2NiwyNiArMzc3LDcgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmU6Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoY29uc3QgUVBvaW50RiYgdG91Y2hQ b2kKIAogICAgIHFyZWFsIHRhcmdldENTU1NjYWxlID0gY3NzU2NhbGVGcm9tSXRlbSh2aWV3cG9y dFJlY3Quc2l6ZSgpLndpZHRoKCkgLyBlbmRBcmVhLnNpemUoKS53aWR0aCgpKTsKICAgICBxcmVh bCBlbmRJdGVtU2NhbGUgPSBpdGVtU2NhbGVGcm9tQ1NTKGlubmVyQm91bmRlZENTU1NjYWxlKHFN aW4odGFyZ2V0Q1NTU2NhbGUsIHFyZWFsKDIuNSkpKSk7Ci0KICAgICBxcmVhbCBjdXJyZW50U2Nh bGUgPSBtX2NvbnRlbnQtPmNvbnRlbnRzU2NhbGUoKTsKLSAgICBpZiAoIW1fc2NhbGVTdGFjay5p c0VtcHR5KCkpIHsKLSAgICAgICAgLy8gWm9vbSBiYWNrIG91dCBpZiBhdHRlbXB0aW5nIHRvIHNj YWxlIHRvIHRoZSBzYW1lIGN1cnJlbnQgc2NhbGUsIG9yCi0gICAgICAgIC8vIGF0dGVtcHRpbmcg dG8gY29udGludWUgc2NhbGluZyBvdXQgZnJvbSB0aGUgaW5uZXIgbW9zdCBsZXZlbC4KLSAgICAg ICAgaWYgKGVuZEl0ZW1TY2FsZSA9PSBtX3pvb21PdXRTY2FsZSB8fCBlbmRJdGVtU2NhbGUgPT0g Y3VycmVudFNjYWxlKQotICAgICAgICAgICAgZW5kSXRlbVNjYWxlID0gbV9zY2FsZVN0YWNrLnRh a2VMYXN0KCk7Ci0gICAgICAgIGVsc2UgaWYgKGVuZEl0ZW1TY2FsZSA+IGN1cnJlbnRTY2FsZSkg ewotICAgICAgICAgICAgbV9zY2FsZVN0YWNrLmFwcGVuZChjdXJyZW50U2NhbGUpOwotICAgICAg ICAgICAgbV96b29tT3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7Ci0gICAgICAgIH0gZWxzZSB7IC8v IGVuZEl0ZW1TY2FsZSA8IGN1cnJlbnRTY2FsZQotICAgICAgICAgICAgLy8gVW5zdGFjayBhbGwg c2NhbGUtbGV2ZWxzIGRlZXBlciB0aGFuIHRoZSBuZXcgbGV2ZWwsIHNvIGEgem9vbS1vdXQgd29u J3Qgem9vbSBpbiB0byBhIHByZXZpb3VzIGxldmVsLgotICAgICAgICAgICAgd2hpbGUgKCFtX3Nj YWxlU3RhY2suaXNFbXB0eSgpICYmIG1fc2NhbGVTdGFjay5sYXN0KCkgPj0gZW5kSXRlbVNjYWxl KQotICAgICAgICAgICAgICAgIG1fc2NhbGVTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgICAgICAg ICBtX3pvb21PdXRTY2FsZSA9IGVuZEl0ZW1TY2FsZTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7 Ci0gICAgICAgIG1fc2NhbGVTdGFjay5hcHBlbmQoY3VycmVudFNjYWxlKTsKLSAgICAgICAgbV96 b29tT3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7Ci0gICAgfQogCiAgICAgLy8gV2Ugd2FudCB0byBl bmQgdXAgd2l0aCB0aGUgdGFyZ2V0IGFyZWEgZmlsbGluZyB0aGUgd2hvbGUgd2lkdGggb2YgdGhl IHZpZXdwb3J0IChpZiBwb3NzaWJsZSksCiAgICAgLy8gYW5kIGNlbnRyYWxpemVkIHZlcnRpY2Fs bHkgd2hlcmUgdGhlIHVzZXIgcmVxdWVzdGVkIHpvb20uIFRodXMgb3VyIGhvdHNwb3QgaXMgdGhl IGNlbnRlciBvZgpAQCAtNDAwLDYgKzM5MiwyOSBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0b3VjaFBvaQog CiAgICAgUVJlY3RGIGVuZFZpc2libGVDb250ZW50UmVjdChlbmRQb3NpdGlvbiAvIGVuZEl0ZW1T Y2FsZSwgdmlld3BvcnRSZWN0LnNpemUoKSAvIGVuZEl0ZW1TY2FsZSk7CiAKKyAgICBpZiAoIW1f c2NhbGVTdGFjay5pc0VtcHR5KCkpIHsKKyAgICAgICAgLy8gWm9vbSBiYWNrIG91dCBpZiBhdHRl bXB0aW5nIHRvIHNjYWxlIHRvIHRoZSBzYW1lIGN1cnJlbnQgc2NhbGUsIG9yCisgICAgICAgIC8v IGF0dGVtcHRpbmcgdG8gY29udGludWUgc2NhbGluZyBvdXQgZnJvbSB0aGUgaW5uZXIgbW9zdCBs ZXZlbC4KKyAgICAgICAgaWYgKGZ1enp5Q29tcGFyZShlbmRJdGVtU2NhbGUsIG1fem9vbU91dFNj YWxlLCAwLjAxKSB8fCBmdXp6eUNvbXBhcmUoZW5kSXRlbVNjYWxlLCBjdXJyZW50U2NhbGUsIDAu MDEpKSB7CisgICAgICAgICAgICBTY2FsZVN0YWNrSXRlbSBsYXN0U2NhbGUgPSBtX3NjYWxlU3Rh Y2sudGFrZUxhc3QoKTsKKyAgICAgICAgICAgIGVuZEl0ZW1TY2FsZSA9IGxhc3RTY2FsZS5zY2Fs ZTsKKyAgICAgICAgICAgIGVuZFBvc2l0aW9uLnNldFkoaG90c3BvdC55KCkgKiBlbmRJdGVtU2Nh bGUgLSB2aWV3cG9ydEhvdHNwb3QueSgpKTsKKyAgICAgICAgICAgIGVuZFBvc2l0aW9uLnNldFgo bGFzdFNjYWxlLnhQb3NpdGlvbik7CisgICAgICAgICAgICBlbmRWaXNpYmxlQ29udGVudFJlY3Qg PSBRUmVjdEYoZW5kUG9zaXRpb24gLyBlbmRJdGVtU2NhbGUsIHZpZXdwb3J0UmVjdC5zaXplKCkg LyBlbmRJdGVtU2NhbGUpOworICAgICAgICB9IGVsc2UgaWYgKGVuZEl0ZW1TY2FsZSA+IGN1cnJl bnRTY2FsZSkgeworICAgICAgICAgICAgbV9zY2FsZVN0YWNrLmFwcGVuZChTY2FsZVN0YWNrSXRl bShjdXJyZW50U2NhbGUsIG1fdmlld3BvcnQtPmNvbnRlbnRQb3MoKS54KCkpKTsKKyAgICAgICAg ICAgIG1fem9vbU91dFNjYWxlID0gZW5kSXRlbVNjYWxlOworICAgICAgICB9IGVsc2UgeyAvLyBl bmRJdGVtU2NhbGUgPCBjdXJyZW50U2NhbGUKKyAgICAgICAgICAgIC8vIFVuc3RhY2sgYWxsIHNj YWxlLWxldmVscyBkZWVwZXIgdGhhbiB0aGUgbmV3IGxldmVsLCBzbyBhIHpvb20tb3V0IHdvbid0 IHpvb20gaW4gdG8gYSBwcmV2aW91cyBsZXZlbC4KKyAgICAgICAgICAgIHdoaWxlICghbV9zY2Fs ZVN0YWNrLmlzRW1wdHkoKSAmJiBtX3NjYWxlU3RhY2subGFzdCgpLnNjYWxlID49IGVuZEl0ZW1T Y2FsZSkKKyAgICAgICAgICAgICAgICBtX3NjYWxlU3RhY2sucmVtb3ZlTGFzdCgpOworICAgICAg ICAgICAgbV96b29tT3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7CisgICAgICAgIH0KKyAgICB9IGVs c2UgeworICAgICAgICBtX3NjYWxlU3RhY2suYXBwZW5kKFNjYWxlU3RhY2tJdGVtKGN1cnJlbnRT Y2FsZSwgbV92aWV3cG9ydC0+Y29udGVudFBvcygpLngoKSkpOworICAgICAgICBtX3pvb21PdXRT Y2FsZSA9IGVuZEl0ZW1TY2FsZTsKKyAgICB9CisKICAgICBhbmltYXRlSXRlbVJlY3RWaXNpYmxl KGVuZFZpc2libGVDb250ZW50UmVjdCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCBkN2Rk NGY3MzQwNmY3N2IyZGEwMGZjZmQzMWM4Mjg0MzQ0YmE1NmQxLi4zMmUxZmMzMzhlN2Q0M2NkMmJk MzNhZGJkNTllNmZkYTI3MGQ1YWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC0xNTgsMTIgKzE1 OCwxOCBAQCBwcml2YXRlOgogICAgICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3VycmVudFZhbHVl KGNvbnN0IFFWYXJpYW50JikgeyB9CiAgICAgfTsKIAorICAgIHN0cnVjdCBTY2FsZVN0YWNrSXRl bSB7CisgICAgICAgIFNjYWxlU3RhY2tJdGVtKHFyZWFsIHNjYWxlLCBxcmVhbCB4UG9zaXRpb24p IDogc2NhbGUoc2NhbGUpLCB4UG9zaXRpb24oeFBvc2l0aW9uKSB7IH0KKyAgICAgICAgcXJlYWwg c2NhbGU7CisgICAgICAgIHFyZWFsIHhQb3NpdGlvbjsKKyAgICB9OworCiAgICAgU2NhbGVBbmlt YXRpb24qIG1fc2NhbGVBbmltYXRpb247CiAgICAgUVBvaW50RiBtX2xhc3RQaW5jaENlbnRlcklu Vmlld3BvcnRDb29yZGluYXRlczsKICAgICBRUG9pbnRGIG1fbGFzdFNjcm9sbFBvc2l0aW9uOwog ICAgIHFyZWFsIG1fcGluY2hTdGFydFNjYWxlOwogICAgIHFyZWFsIG1fem9vbU91dFNjYWxlOwot ICAgIFFMaXN0PHFyZWFsPiBtX3NjYWxlU3RhY2s7CisgICAgUUxpc3Q8U2NhbGVTdGFja0l0ZW0+ IG1fc2NhbGVTdGFjazsKIH07CiAKIH0K 138355 2012-04-23 08:48:05 -0700 2012-04-23 09:14:29 -0700 Patch bug-84591-20120423174812.patch text/plain 6330 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTdmZTFlYzg5YjVmZTkz YjUyN2FhMzgzYWRmZmY0YTdmMmVhZDZmNS4uMjZjODRmYTNmMjEyNTAzOWQ2ZmYxMmViZDJiYjNh NWIxOTIzNGZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTIzICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gUmVzdG9yZSB4LXBvc2l0aW9uIHdoZW4gcmVzdG9yaW5nIHByZXZpb3VzIHpvb20tbGV2ZWwu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU5MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRhcC10by16 b29tIGZpdHMgY29udGVudCB0byB3aWR0aCwgdGhlcmVmb3JlIGl0IGlzIGVzc2VudGlvbmFsIHRo YXQKKyAgICAgICAgdGhlIGNvbnRlbnQgaXMgcmVmaXR0ZWQgdG8gd2lkdGggd2hlbiB6b29taW5n IG91dC4KKworICAgICAgICBUaGlzIHBhdGNoIHBhaXJzIGhvcml6b250YWwgcG9zaXRpb24gYW5k IHNjYWxlIG9uIHRoZSB6b29tLW91dCBzdGFjay4KKworICAgICAgICBBZGRpdGlvbmFsbHkgaXQg Zml4ZXMgYSBwcm9ibGVtIHdpdGggbm90IGRldGVjdGluZyB6b29tLW91dCBwcm9wZXJseQorICAg ICAgICBkdWUgdG8gZmxvYXRpbmcgcG9pbnQgZXJyb3JzLgorCisgICAgICAgICogVUlQcm9jZXNz L3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OmZ1 enp5Q29tcGFyZSk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OlNjYWxlU3RhY2tJdGVtOjpTY2FsZVN0YWNrSXRlbSk6CisgICAgICAg IChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorCiAyMDEyLTA0LTIzICBLZW50IFRhbXVy YSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgdGVzdCBmdW5jdGlvbiB0byBn ZXQgcGxhY2Vob2xkZXIgc3RyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCmluZGV4IDEzOTAzNTZm Mjg2ZTgyMThjZTQ1ZTVkNmQ4ODE3NjNhMTdhYmJhZWEuLmY5ZjhjYzY0MDQyZDZlN2ViYzMyNGY3 NzU5MjEyNjU1YTE4NGRlZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCkBAIC0yNCw2ICsyNCw3 IEBACiAKICNpbmNsdWRlICJxcXVpY2t3ZWJwYWdlX3AuaCIKICNpbmNsdWRlICJxcXVpY2t3ZWJ2 aWV3X3AuaCIKKyNpbmNsdWRlIDxjbWF0aD4KICNpbmNsdWRlIDxRUG9pbnRGPgogI2luY2x1ZGUg PFFUcmFuc2Zvcm0+CiAjaW5jbHVkZSA8UVdoZWVsRXZlbnQ+CkBAIC05Miw2ICs5MywxMiBAQCBw cml2YXRlOgogICAgIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSogY29uc3QgZW5naW5lOwog fTsKIAorLy8gQSBmbG9hdGluZyBwb2ludCBjb21wYXJlIHdpdGggYWJzb2x1dGUgZXJyb3IuCitz dGF0aWMgaW5saW5lIGJvb2wgZnV6enlDb21wYXJlKHFyZWFsIGEsIHFyZWFsIGIsIHFyZWFsIGVw c2lsb24pCit7CisgICAgcmV0dXJuIHN0ZDo6YWJzKGEgLSBiKSA8IGVwc2lsb247Cit9CisKIGlu bGluZSBxcmVhbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmNzc1NjYWxlRnJvbUl0ZW0o cXJlYWwgaXRlbVNjYWxlKQogewogICAgIHJldHVybiBpdGVtU2NhbGUgLyBtX2RldmljZVBpeGVs UmF0aW87CkBAIC0zNjYsMjYgKzM3Myw3IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lOjp6b29tVG9BcmVhR2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pCiAKICAg ICBxcmVhbCB0YXJnZXRDU1NTY2FsZSA9IGNzc1NjYWxlRnJvbUl0ZW0odmlld3BvcnRSZWN0LnNp emUoKS53aWR0aCgpIC8gZW5kQXJlYS5zaXplKCkud2lkdGgoKSk7CiAgICAgcXJlYWwgZW5kSXRl bVNjYWxlID0gaXRlbVNjYWxlRnJvbUNTUyhpbm5lckJvdW5kZWRDU1NTY2FsZShxTWluKHRhcmdl dENTU1NjYWxlLCBxcmVhbCgyLjUpKSkpOwotCiAgICAgcXJlYWwgY3VycmVudFNjYWxlID0gbV9j b250ZW50LT5jb250ZW50c1NjYWxlKCk7Ci0gICAgaWYgKCFtX3NjYWxlU3RhY2suaXNFbXB0eSgp KSB7Ci0gICAgICAgIC8vIFpvb20gYmFjayBvdXQgaWYgYXR0ZW1wdGluZyB0byBzY2FsZSB0byB0 aGUgc2FtZSBjdXJyZW50IHNjYWxlLCBvcgotICAgICAgICAvLyBhdHRlbXB0aW5nIHRvIGNvbnRp bnVlIHNjYWxpbmcgb3V0IGZyb20gdGhlIGlubmVyIG1vc3QgbGV2ZWwuCi0gICAgICAgIGlmIChl bmRJdGVtU2NhbGUgPT0gbV96b29tT3V0U2NhbGUgfHwgZW5kSXRlbVNjYWxlID09IGN1cnJlbnRT Y2FsZSkKLSAgICAgICAgICAgIGVuZEl0ZW1TY2FsZSA9IG1fc2NhbGVTdGFjay50YWtlTGFzdCgp OwotICAgICAgICBlbHNlIGlmIChlbmRJdGVtU2NhbGUgPiBjdXJyZW50U2NhbGUpIHsKLSAgICAg ICAgICAgIG1fc2NhbGVTdGFjay5hcHBlbmQoY3VycmVudFNjYWxlKTsKLSAgICAgICAgICAgIG1f em9vbU91dFNjYWxlID0gZW5kSXRlbVNjYWxlOwotICAgICAgICB9IGVsc2UgeyAvLyBlbmRJdGVt U2NhbGUgPCBjdXJyZW50U2NhbGUKLSAgICAgICAgICAgIC8vIFVuc3RhY2sgYWxsIHNjYWxlLWxl dmVscyBkZWVwZXIgdGhhbiB0aGUgbmV3IGxldmVsLCBzbyBhIHpvb20tb3V0IHdvbid0IHpvb20g aW4gdG8gYSBwcmV2aW91cyBsZXZlbC4KLSAgICAgICAgICAgIHdoaWxlICghbV9zY2FsZVN0YWNr LmlzRW1wdHkoKSAmJiBtX3NjYWxlU3RhY2subGFzdCgpID49IGVuZEl0ZW1TY2FsZSkKLSAgICAg ICAgICAgICAgICBtX3NjYWxlU3RhY2sucmVtb3ZlTGFzdCgpOwotICAgICAgICAgICAgbV96b29t T3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAg ICBtX3NjYWxlU3RhY2suYXBwZW5kKGN1cnJlbnRTY2FsZSk7Ci0gICAgICAgIG1fem9vbU91dFNj YWxlID0gZW5kSXRlbVNjYWxlOwotICAgIH0KIAogICAgIC8vIFdlIHdhbnQgdG8gZW5kIHVwIHdp dGggdGhlIHRhcmdldCBhcmVhIGZpbGxpbmcgdGhlIHdob2xlIHdpZHRoIG9mIHRoZSB2aWV3cG9y dCAoaWYgcG9zc2libGUpLAogICAgIC8vIGFuZCBjZW50cmFsaXplZCB2ZXJ0aWNhbGx5IHdoZXJl IHRoZSB1c2VyIHJlcXVlc3RlZCB6b29tLiBUaHVzIG91ciBob3RzcG90IGlzIHRoZSBjZW50ZXIg b2YKQEAgLTQwMCw2ICszODgsNDEgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoY29uc3QgUVBvaW50RiYgdG91Y2hQb2kKIAogICAgIFFS ZWN0RiBlbmRWaXNpYmxlQ29udGVudFJlY3QoZW5kUG9zaXRpb24gLyBlbmRJdGVtU2NhbGUsIHZp ZXdwb3J0UmVjdC5zaXplKCkgLyBlbmRJdGVtU2NhbGUpOwogCisgICAgZW51bSB7IFpvb21Jbiwg Wm9vbUJhY2ssIFpvb21PdXQgfSB6b29tQWN0aW9uID0gWm9vbUluOworCisgICAgaWYgKCFtX3Nj YWxlU3RhY2suaXNFbXB0eSgpKSB7CisgICAgICAgIC8vIFpvb20gYmFjayBvdXQgaWYgYXR0ZW1w dGluZyB0byBzY2FsZSB0byB0aGUgc2FtZSBjdXJyZW50IHNjYWxlLCBvcgorICAgICAgICAvLyBh dHRlbXB0aW5nIHRvIGNvbnRpbnVlIHNjYWxpbmcgb3V0IGZyb20gdGhlIGlubmVyIG1vc3QgbGV2 ZWwuCisgICAgICAgIGlmIChmdXp6eUNvbXBhcmUoZW5kSXRlbVNjYWxlLCBjdXJyZW50U2NhbGUs IDAuMDEpKQorICAgICAgICAgICAgLy8gRklYTUU6IENoZWNrIGlmIHdlIHNob3VsZCBtb3ZlIHRo ZSB2aWV3cG9ydCBpbnN0ZWFkIG9mIHpvb21pbmcgYmFjay4KKyAgICAgICAgICAgIHpvb21BY3Rp b24gPSBab29tQmFjazsKKyAgICAgICAgZWxzZSBpZiAoZnV6enlDb21wYXJlKGVuZEl0ZW1TY2Fs ZSwgbV96b29tT3V0U2NhbGUsIDAuMDEpKQorICAgICAgICAgICAgem9vbUFjdGlvbiA9IFpvb21C YWNrOworICAgICAgICBlbHNlIGlmIChlbmRJdGVtU2NhbGUgPCBjdXJyZW50U2NhbGUpCisgICAg ICAgICAgICB6b29tQWN0aW9uID0gWm9vbU91dDsKKyAgICB9CisKKyAgICBzd2l0Y2ggKHpvb21B Y3Rpb24pIHsKKyAgICBjYXNlIFpvb21JbjoKKyAgICAgICAgbV9zY2FsZVN0YWNrLmFwcGVuZChT Y2FsZVN0YWNrSXRlbShjdXJyZW50U2NhbGUsIG1fdmlld3BvcnQtPmNvbnRlbnRQb3MoKS54KCkp KTsKKyAgICAgICAgbV96b29tT3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgWm9vbUJhY2s6IHsKKyAgICAgICAgU2NhbGVTdGFja0l0ZW0gbGFzdFNjYWxl ID0gbV9zY2FsZVN0YWNrLnRha2VMYXN0KCk7CisgICAgICAgIGVuZEl0ZW1TY2FsZSA9IGxhc3RT Y2FsZS5zY2FsZTsKKyAgICAgICAgZW5kUG9zaXRpb24uc2V0WShob3RzcG90LnkoKSAqIGVuZEl0 ZW1TY2FsZSAtIHZpZXdwb3J0SG90c3BvdC55KCkpOworICAgICAgICBlbmRQb3NpdGlvbi5zZXRY KGxhc3RTY2FsZS54UG9zaXRpb24pOworICAgICAgICBlbmRWaXNpYmxlQ29udGVudFJlY3QgPSBR UmVjdEYoZW5kUG9zaXRpb24gLyBlbmRJdGVtU2NhbGUsIHZpZXdwb3J0UmVjdC5zaXplKCkgLyBl bmRJdGVtU2NhbGUpOworICAgICAgICBicmVhazsKKyAgICB9CisgICAgY2FzZSBab29tT3V0Ogor ICAgICAgICAvLyBVbnN0YWNrIGFsbCBzY2FsZS1sZXZlbHMgZGVlcGVyIHRoYW4gdGhlIG5ldyBs ZXZlbCwgc28gYSB6b29tLWJhY2sgd29uJ3QgZW5kIHVwIHpvb21pbmcgaW4uCisgICAgICAgIHdo aWxlICghbV9zY2FsZVN0YWNrLmlzRW1wdHkoKSAmJiBtX3NjYWxlU3RhY2subGFzdCgpLnNjYWxl ID49IGVuZEl0ZW1TY2FsZSkKKyAgICAgICAgICAgIG1fc2NhbGVTdGFjay5yZW1vdmVMYXN0KCk7 CisgICAgICAgIG1fem9vbU91dFNjYWxlID0gZW5kSXRlbVNjYWxlOworICAgICAgICBicmVhazsK KyAgICB9CisKICAgICBhbmltYXRlSXRlbVJlY3RWaXNpYmxlKGVuZFZpc2libGVDb250ZW50UmVj dCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCBkN2RkNGY3MzQwNmY3N2IyZGEwMGZjZmQz MWM4Mjg0MzQ0YmE1NmQxLi4zMmUxZmMzMzhlN2Q0M2NkMmJkMzNhZGJkNTllNmZkYTI3MGQ1YWY0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC0xNTgsMTIgKzE1OCwxOCBAQCBwcml2YXRlOgogICAg ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3VycmVudFZhbHVlKGNvbnN0IFFWYXJpYW50JikgeyB9 CiAgICAgfTsKIAorICAgIHN0cnVjdCBTY2FsZVN0YWNrSXRlbSB7CisgICAgICAgIFNjYWxlU3Rh Y2tJdGVtKHFyZWFsIHNjYWxlLCBxcmVhbCB4UG9zaXRpb24pIDogc2NhbGUoc2NhbGUpLCB4UG9z aXRpb24oeFBvc2l0aW9uKSB7IH0KKyAgICAgICAgcXJlYWwgc2NhbGU7CisgICAgICAgIHFyZWFs IHhQb3NpdGlvbjsKKyAgICB9OworCiAgICAgU2NhbGVBbmltYXRpb24qIG1fc2NhbGVBbmltYXRp b247CiAgICAgUVBvaW50RiBtX2xhc3RQaW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlczsK ICAgICBRUG9pbnRGIG1fbGFzdFNjcm9sbFBvc2l0aW9uOwogICAgIHFyZWFsIG1fcGluY2hTdGFy dFNjYWxlOwogICAgIHFyZWFsIG1fem9vbU91dFNjYWxlOwotICAgIFFMaXN0PHFyZWFsPiBtX3Nj YWxlU3RhY2s7CisgICAgUUxpc3Q8U2NhbGVTdGFja0l0ZW0+IG1fc2NhbGVTdGFjazsKIH07CiAK IH0K 138361 2012-04-23 09:14:43 -0700 2012-04-24 01:12:01 -0700 Patch bug-84591-20120423181450.patch text/plain 6161 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTdmZTFlYzg5YjVmZTkz YjUyN2FhMzgzYWRmZmY0YTdmMmVhZDZmNS4uMjZjODRmYTNmMjEyNTAzOWQ2ZmYxMmViZDJiYjNh NWIxOTIzNGZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTIzICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gUmVzdG9yZSB4LXBvc2l0aW9uIHdoZW4gcmVzdG9yaW5nIHByZXZpb3VzIHpvb20tbGV2ZWwu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU5MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRhcC10by16 b29tIGZpdHMgY29udGVudCB0byB3aWR0aCwgdGhlcmVmb3JlIGl0IGlzIGVzc2VudGlvbmFsIHRo YXQKKyAgICAgICAgdGhlIGNvbnRlbnQgaXMgcmVmaXR0ZWQgdG8gd2lkdGggd2hlbiB6b29taW5n IG91dC4KKworICAgICAgICBUaGlzIHBhdGNoIHBhaXJzIGhvcml6b250YWwgcG9zaXRpb24gYW5k IHNjYWxlIG9uIHRoZSB6b29tLW91dCBzdGFjay4KKworICAgICAgICBBZGRpdGlvbmFsbHkgaXQg Zml4ZXMgYSBwcm9ibGVtIHdpdGggbm90IGRldGVjdGluZyB6b29tLW91dCBwcm9wZXJseQorICAg ICAgICBkdWUgdG8gZmxvYXRpbmcgcG9pbnQgZXJyb3JzLgorCisgICAgICAgICogVUlQcm9jZXNz L3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OmZ1 enp5Q29tcGFyZSk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OlNjYWxlU3RhY2tJdGVtOjpTY2FsZVN0YWNrSXRlbSk6CisgICAgICAg IChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorCiAyMDEyLTA0LTIzICBLZW50IFRhbXVy YSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgdGVzdCBmdW5jdGlvbiB0byBn ZXQgcGxhY2Vob2xkZXIgc3RyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCmluZGV4IDEzOTAzNTZm Mjg2ZTgyMThjZTQ1ZTVkNmQ4ODE3NjNhMTdhYmJhZWEuLmFiYzdiMjY3ZmRhYzI2MzU1YmQxZWE2 YzAyM2Y5ZTkyOWVjNTEyMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCkBAIC05Miw2ICs5Miwx MiBAQCBwcml2YXRlOgogICAgIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSogY29uc3QgZW5n aW5lOwogfTsKIAorLy8gQSBmbG9hdGluZyBwb2ludCBjb21wYXJlIHdpdGggYWJzb2x1dGUgZXJy b3IuCitzdGF0aWMgaW5saW5lIGJvb2wgZnV6enlDb21wYXJlKHFyZWFsIGEsIHFyZWFsIGIsIHFy ZWFsIGVwc2lsb24pCit7CisgICAgcmV0dXJuIHFBYnMoYSAtIGIpIDwgZXBzaWxvbjsKK30KKwog aW5saW5lIHFyZWFsIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y3NzU2NhbGVGcm9tSXRl bShxcmVhbCBpdGVtU2NhbGUpCiB7CiAgICAgcmV0dXJuIGl0ZW1TY2FsZSAvIG1fZGV2aWNlUGl4 ZWxSYXRpbzsKQEAgLTM2NiwyNiArMzcyLDcgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoY29uc3QgUVBvaW50RiYgdG91Y2hQb2kKIAog ICAgIHFyZWFsIHRhcmdldENTU1NjYWxlID0gY3NzU2NhbGVGcm9tSXRlbSh2aWV3cG9ydFJlY3Qu c2l6ZSgpLndpZHRoKCkgLyBlbmRBcmVhLnNpemUoKS53aWR0aCgpKTsKICAgICBxcmVhbCBlbmRJ dGVtU2NhbGUgPSBpdGVtU2NhbGVGcm9tQ1NTKGlubmVyQm91bmRlZENTU1NjYWxlKHFNaW4odGFy Z2V0Q1NTU2NhbGUsIHFyZWFsKDIuNSkpKSk7Ci0KICAgICBxcmVhbCBjdXJyZW50U2NhbGUgPSBt X2NvbnRlbnQtPmNvbnRlbnRzU2NhbGUoKTsKLSAgICBpZiAoIW1fc2NhbGVTdGFjay5pc0VtcHR5 KCkpIHsKLSAgICAgICAgLy8gWm9vbSBiYWNrIG91dCBpZiBhdHRlbXB0aW5nIHRvIHNjYWxlIHRv IHRoZSBzYW1lIGN1cnJlbnQgc2NhbGUsIG9yCi0gICAgICAgIC8vIGF0dGVtcHRpbmcgdG8gY29u dGludWUgc2NhbGluZyBvdXQgZnJvbSB0aGUgaW5uZXIgbW9zdCBsZXZlbC4KLSAgICAgICAgaWYg KGVuZEl0ZW1TY2FsZSA9PSBtX3pvb21PdXRTY2FsZSB8fCBlbmRJdGVtU2NhbGUgPT0gY3VycmVu dFNjYWxlKQotICAgICAgICAgICAgZW5kSXRlbVNjYWxlID0gbV9zY2FsZVN0YWNrLnRha2VMYXN0 KCk7Ci0gICAgICAgIGVsc2UgaWYgKGVuZEl0ZW1TY2FsZSA+IGN1cnJlbnRTY2FsZSkgewotICAg ICAgICAgICAgbV9zY2FsZVN0YWNrLmFwcGVuZChjdXJyZW50U2NhbGUpOwotICAgICAgICAgICAg bV96b29tT3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7Ci0gICAgICAgIH0gZWxzZSB7IC8vIGVuZEl0 ZW1TY2FsZSA8IGN1cnJlbnRTY2FsZQotICAgICAgICAgICAgLy8gVW5zdGFjayBhbGwgc2NhbGUt bGV2ZWxzIGRlZXBlciB0aGFuIHRoZSBuZXcgbGV2ZWwsIHNvIGEgem9vbS1vdXQgd29uJ3Qgem9v bSBpbiB0byBhIHByZXZpb3VzIGxldmVsLgotICAgICAgICAgICAgd2hpbGUgKCFtX3NjYWxlU3Rh Y2suaXNFbXB0eSgpICYmIG1fc2NhbGVTdGFjay5sYXN0KCkgPj0gZW5kSXRlbVNjYWxlKQotICAg ICAgICAgICAgICAgIG1fc2NhbGVTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgICAgICAgICBtX3pv b21PdXRTY2FsZSA9IGVuZEl0ZW1TY2FsZTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAg ICAgIG1fc2NhbGVTdGFjay5hcHBlbmQoY3VycmVudFNjYWxlKTsKLSAgICAgICAgbV96b29tT3V0 U2NhbGUgPSBlbmRJdGVtU2NhbGU7Ci0gICAgfQogCiAgICAgLy8gV2Ugd2FudCB0byBlbmQgdXAg d2l0aCB0aGUgdGFyZ2V0IGFyZWEgZmlsbGluZyB0aGUgd2hvbGUgd2lkdGggb2YgdGhlIHZpZXdw b3J0IChpZiBwb3NzaWJsZSksCiAgICAgLy8gYW5kIGNlbnRyYWxpemVkIHZlcnRpY2FsbHkgd2hl cmUgdGhlIHVzZXIgcmVxdWVzdGVkIHpvb20uIFRodXMgb3VyIGhvdHNwb3QgaXMgdGhlIGNlbnRl ciBvZgpAQCAtNDAwLDYgKzM4Nyw0MSBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0b3VjaFBvaQogCiAgICAg UVJlY3RGIGVuZFZpc2libGVDb250ZW50UmVjdChlbmRQb3NpdGlvbiAvIGVuZEl0ZW1TY2FsZSwg dmlld3BvcnRSZWN0LnNpemUoKSAvIGVuZEl0ZW1TY2FsZSk7CiAKKyAgICBlbnVtIHsgWm9vbUlu LCBab29tQmFjaywgWm9vbU91dCB9IHpvb21BY3Rpb24gPSBab29tSW47CisKKyAgICBpZiAoIW1f c2NhbGVTdGFjay5pc0VtcHR5KCkpIHsKKyAgICAgICAgLy8gWm9vbSBiYWNrIG91dCBpZiBhdHRl bXB0aW5nIHRvIHNjYWxlIHRvIHRoZSBzYW1lIGN1cnJlbnQgc2NhbGUsIG9yCisgICAgICAgIC8v IGF0dGVtcHRpbmcgdG8gY29udGludWUgc2NhbGluZyBvdXQgZnJvbSB0aGUgaW5uZXIgbW9zdCBs ZXZlbC4KKyAgICAgICAgaWYgKGZ1enp5Q29tcGFyZShlbmRJdGVtU2NhbGUsIGN1cnJlbnRTY2Fs ZSwgMC4wMSkpCisgICAgICAgICAgICAvLyBGSVhNRTogQ2hlY2sgaWYgd2Ugc2hvdWxkIG1vdmUg dGhlIHZpZXdwb3J0IGluc3RlYWQgb2Ygem9vbWluZyBiYWNrLgorICAgICAgICAgICAgem9vbUFj dGlvbiA9IFpvb21CYWNrOworICAgICAgICBlbHNlIGlmIChmdXp6eUNvbXBhcmUoZW5kSXRlbVNj YWxlLCBtX3pvb21PdXRTY2FsZSwgMC4wMSkpCisgICAgICAgICAgICB6b29tQWN0aW9uID0gWm9v bUJhY2s7CisgICAgICAgIGVsc2UgaWYgKGVuZEl0ZW1TY2FsZSA8IGN1cnJlbnRTY2FsZSkKKyAg ICAgICAgICAgIHpvb21BY3Rpb24gPSBab29tT3V0OworICAgIH0KKworICAgIHN3aXRjaCAoem9v bUFjdGlvbikgeworICAgIGNhc2UgWm9vbUluOgorICAgICAgICBtX3NjYWxlU3RhY2suYXBwZW5k KFNjYWxlU3RhY2tJdGVtKGN1cnJlbnRTY2FsZSwgbV92aWV3cG9ydC0+Y29udGVudFBvcygpLngo KSkpOworICAgICAgICBtX3pvb21PdXRTY2FsZSA9IGVuZEl0ZW1TY2FsZTsKKyAgICAgICAgYnJl YWs7CisgICAgY2FzZSBab29tQmFjazogeworICAgICAgICBTY2FsZVN0YWNrSXRlbSBsYXN0U2Nh bGUgPSBtX3NjYWxlU3RhY2sudGFrZUxhc3QoKTsKKyAgICAgICAgZW5kSXRlbVNjYWxlID0gbGFz dFNjYWxlLnNjYWxlOworICAgICAgICBlbmRQb3NpdGlvbi5zZXRZKGhvdHNwb3QueSgpICogZW5k SXRlbVNjYWxlIC0gdmlld3BvcnRIb3RzcG90LnkoKSk7CisgICAgICAgIGVuZFBvc2l0aW9uLnNl dFgobGFzdFNjYWxlLnhQb3NpdGlvbik7CisgICAgICAgIGVuZFZpc2libGVDb250ZW50UmVjdCA9 IFFSZWN0RihlbmRQb3NpdGlvbiAvIGVuZEl0ZW1TY2FsZSwgdmlld3BvcnRSZWN0LnNpemUoKSAv IGVuZEl0ZW1TY2FsZSk7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBjYXNlIFpvb21PdXQ6 CisgICAgICAgIC8vIFVuc3RhY2sgYWxsIHNjYWxlLWxldmVscyBkZWVwZXIgdGhhbiB0aGUgbmV3 IGxldmVsLCBzbyBhIHpvb20tYmFjayB3b24ndCBlbmQgdXAgem9vbWluZyBpbi4KKyAgICAgICAg d2hpbGUgKCFtX3NjYWxlU3RhY2suaXNFbXB0eSgpICYmIG1fc2NhbGVTdGFjay5sYXN0KCkuc2Nh bGUgPj0gZW5kSXRlbVNjYWxlKQorICAgICAgICAgICAgbV9zY2FsZVN0YWNrLnJlbW92ZUxhc3Qo KTsKKyAgICAgICAgbV96b29tT3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7CisgICAgICAgIGJyZWFr OworICAgIH0KKwogICAgIGFuaW1hdGVJdGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRS ZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCmluZGV4IGQ3ZGQ0ZjczNDA2Zjc3YjJkYTAwZmNm ZDMxYzgyODQzNDRiYTU2ZDEuLjMyZTFmYzMzOGU3ZDQzY2QyYmQzM2FkYmQ1OWU2ZmRhMjcwZDVh ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmgKQEAgLTE1OCwxMiArMTU4LDE4IEBAIHByaXZhdGU6CiAg ICAgICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDdXJyZW50VmFsdWUoY29uc3QgUVZhcmlhbnQmKSB7 IH0KICAgICB9OwogCisgICAgc3RydWN0IFNjYWxlU3RhY2tJdGVtIHsKKyAgICAgICAgU2NhbGVT dGFja0l0ZW0ocXJlYWwgc2NhbGUsIHFyZWFsIHhQb3NpdGlvbikgOiBzY2FsZShzY2FsZSksIHhQ b3NpdGlvbih4UG9zaXRpb24pIHsgfQorICAgICAgICBxcmVhbCBzY2FsZTsKKyAgICAgICAgcXJl YWwgeFBvc2l0aW9uOworICAgIH07CisKICAgICBTY2FsZUFuaW1hdGlvbiogbV9zY2FsZUFuaW1h dGlvbjsKICAgICBRUG9pbnRGIG1fbGFzdFBpbmNoQ2VudGVySW5WaWV3cG9ydENvb3JkaW5hdGVz OwogICAgIFFQb2ludEYgbV9sYXN0U2Nyb2xsUG9zaXRpb247CiAgICAgcXJlYWwgbV9waW5jaFN0 YXJ0U2NhbGU7CiAgICAgcXJlYWwgbV96b29tT3V0U2NhbGU7Ci0gICAgUUxpc3Q8cXJlYWw+IG1f c2NhbGVTdGFjazsKKyAgICBRTGlzdDxTY2FsZVN0YWNrSXRlbT4gbV9zY2FsZVN0YWNrOwogfTsK IAogfQo= 138512 2012-04-24 01:12:08 -0700 2012-04-24 02:41:51 -0700 Patch bug-84591-20120424101215.patch text/plain 6361 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmFlZDc2NTBhZDlhZGE1 MTQzMDYwOTQwOTFkYWY3MGRhYTU3MjViZC4uOWM1NjhlZTg2YmQ2MzFiM2E5OGVhZTljNDc4MjY4 OTdiNDU1NDMwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTIzICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gUmVzdG9yZSB4LXBvc2l0aW9uIHdoZW4gcmVzdG9yaW5nIHByZXZpb3VzIHpvb20tbGV2ZWwu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU5MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRhcC10by16 b29tIGZpdHMgY29udGVudCB0byB3aWR0aCwgdGhlcmVmb3JlIGl0IGlzIGVzc2VudGlvbmFsIHRo YXQKKyAgICAgICAgdGhlIGNvbnRlbnQgaXMgcmVmaXR0ZWQgdG8gd2lkdGggd2hlbiB6b29taW5n IG91dC4KKworICAgICAgICBUaGlzIHBhdGNoIHBhaXJzIGhvcml6b250YWwgcG9zaXRpb24gYW5k IHNjYWxlIG9uIHRoZSB6b29tLW91dCBzdGFjay4KKworICAgICAgICBBZGRpdGlvbmFsbHkgaXQg Zml4ZXMgYSBwcm9ibGVtIHdpdGggbm90IGRldGVjdGluZyB6b29tLW91dCBwcm9wZXJseQorICAg ICAgICBkdWUgdG8gZmxvYXRpbmcgcG9pbnQgZXJyb3JzLgorCisgICAgICAgICogVUlQcm9jZXNz L3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OmZ1 enp5Q29tcGFyZSk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OlNjYWxlU3RhY2tJdGVtOjpTY2FsZVN0YWNrSXRlbSk6CisgICAgICAg IChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorCiAyMDEyLTA0LTIzICBBbmRyZWFzIEts aW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBbTWFjXSBXZWJQcm9jZXNzIHNob3Vs ZCBlbXB0eSBjYWNoZSBvbiBhIGJhY2tncm91bmQgdGhyZWFkL2Jsb2NrLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lLmNwcAppbmRleCBjN2Y5OTMwOGM5ZTc2ZWYwMGFjOTJhOTI1Mjg3ZDA0ZWIyNmI2MWY4Li4z ODg0OTNkN2FkNjQ0MDZjMDg5OGFjNWFlZjRiYjYwMDBkZmRhYjhhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lLmNwcApAQCAtOTIsNiArOTIsMTIgQEAgcHJpdmF0ZToKICAgICBRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmUqIGNvbnN0IGVuZ2luZTsKIH07CiAKKy8vIEEgZmxvYXRpbmcgcG9pbnQgY29t cGFyZSB3aXRoIGFic29sdXRlIGVycm9yLgorc3RhdGljIGlubGluZSBib29sIGZ1enp5Q29tcGFy ZShxcmVhbCBhLCBxcmVhbCBiLCBxcmVhbCBlcHNpbG9uKQoreworICAgIHJldHVybiBxQWJzKGEg LSBiKSA8IGVwc2lsb247Cit9CisKIGlubGluZSBxcmVhbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6OmNzc1NjYWxlRnJvbUl0ZW0ocXJlYWwgaXRlbVNjYWxlKQogewogICAgIHJldHVybiBp dGVtU2NhbGUgLyBtX2RldmljZVBpeGVsUmF0aW87CkBAIC0zNjYsMjYgKzM3Miw3IEBAIHZvaWQg UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp6b29tVG9BcmVhR2VzdHVyZUVuZGVkKGNvbnN0 IFFQb2ludEYmIHRvdWNoUG9pCiAKICAgICBxcmVhbCB0YXJnZXRDU1NTY2FsZSA9IGNzc1NjYWxl RnJvbUl0ZW0odmlld3BvcnRSZWN0LnNpemUoKS53aWR0aCgpIC8gZW5kQXJlYS5zaXplKCkud2lk dGgoKSk7CiAgICAgcXJlYWwgZW5kSXRlbVNjYWxlID0gaXRlbVNjYWxlRnJvbUNTUyhpbm5lckJv dW5kZWRDU1NTY2FsZShxTWluKHRhcmdldENTU1NjYWxlLCBxcmVhbCgyLjUpKSkpOwotCiAgICAg cXJlYWwgY3VycmVudFNjYWxlID0gbV9jb250ZW50LT5jb250ZW50c1NjYWxlKCk7Ci0gICAgaWYg KCFtX3NjYWxlU3RhY2suaXNFbXB0eSgpKSB7Ci0gICAgICAgIC8vIFpvb20gYmFjayBvdXQgaWYg YXR0ZW1wdGluZyB0byBzY2FsZSB0byB0aGUgc2FtZSBjdXJyZW50IHNjYWxlLCBvcgotICAgICAg ICAvLyBhdHRlbXB0aW5nIHRvIGNvbnRpbnVlIHNjYWxpbmcgb3V0IGZyb20gdGhlIGlubmVyIG1v c3QgbGV2ZWwuCi0gICAgICAgIGlmIChlbmRJdGVtU2NhbGUgPT0gbV96b29tT3V0U2NhbGUgfHwg ZW5kSXRlbVNjYWxlID09IGN1cnJlbnRTY2FsZSkKLSAgICAgICAgICAgIGVuZEl0ZW1TY2FsZSA9 IG1fc2NhbGVTdGFjay50YWtlTGFzdCgpOwotICAgICAgICBlbHNlIGlmIChlbmRJdGVtU2NhbGUg PiBjdXJyZW50U2NhbGUpIHsKLSAgICAgICAgICAgIG1fc2NhbGVTdGFjay5hcHBlbmQoY3VycmVu dFNjYWxlKTsKLSAgICAgICAgICAgIG1fem9vbU91dFNjYWxlID0gZW5kSXRlbVNjYWxlOwotICAg ICAgICB9IGVsc2UgeyAvLyBlbmRJdGVtU2NhbGUgPCBjdXJyZW50U2NhbGUKLSAgICAgICAgICAg IC8vIFVuc3RhY2sgYWxsIHNjYWxlLWxldmVscyBkZWVwZXIgdGhhbiB0aGUgbmV3IGxldmVsLCBz byBhIHpvb20tb3V0IHdvbid0IHpvb20gaW4gdG8gYSBwcmV2aW91cyBsZXZlbC4KLSAgICAgICAg ICAgIHdoaWxlICghbV9zY2FsZVN0YWNrLmlzRW1wdHkoKSAmJiBtX3NjYWxlU3RhY2subGFzdCgp ID49IGVuZEl0ZW1TY2FsZSkKLSAgICAgICAgICAgICAgICBtX3NjYWxlU3RhY2sucmVtb3ZlTGFz dCgpOwotICAgICAgICAgICAgbV96b29tT3V0U2NhbGUgPSBlbmRJdGVtU2NhbGU7Ci0gICAgICAg IH0KLSAgICB9IGVsc2UgewotICAgICAgICBtX3NjYWxlU3RhY2suYXBwZW5kKGN1cnJlbnRTY2Fs ZSk7Ci0gICAgICAgIG1fem9vbU91dFNjYWxlID0gZW5kSXRlbVNjYWxlOwotICAgIH0KIAogICAg IC8vIFdlIHdhbnQgdG8gZW5kIHVwIHdpdGggdGhlIHRhcmdldCBhcmVhIGZpbGxpbmcgdGhlIHdo b2xlIHdpZHRoIG9mIHRoZSB2aWV3cG9ydCAoaWYgcG9zc2libGUpLAogICAgIC8vIGFuZCBjZW50 cmFsaXplZCB2ZXJ0aWNhbGx5IHdoZXJlIHRoZSB1c2VyIHJlcXVlc3RlZCB6b29tLiBUaHVzIG91 ciBob3RzcG90IGlzIHRoZSBjZW50ZXIgb2YKQEAgLTQwMCw2ICszODcsNDIgQEAgdm9pZCBRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoY29uc3QgUVBv aW50RiYgdG91Y2hQb2kKIAogICAgIFFSZWN0RiBlbmRWaXNpYmxlQ29udGVudFJlY3QoZW5kUG9z aXRpb24gLyBlbmRJdGVtU2NhbGUsIHZpZXdwb3J0UmVjdC5zaXplKCkgLyBlbmRJdGVtU2NhbGUp OwogCisgICAgZW51bSB7IFpvb21JbiwgWm9vbUJhY2ssIFpvb21PdXQgfSB6b29tQWN0aW9uID0g Wm9vbUluOworCisgICAgaWYgKCFtX3NjYWxlU3RhY2suaXNFbXB0eSgpKSB7CisgICAgICAgIC8v IFpvb20gYmFjayBvdXQgaWYgYXR0ZW1wdGluZyB0byBzY2FsZSB0byB0aGUgc2FtZSBjdXJyZW50 IHNjYWxlLCBvcgorICAgICAgICAvLyBhdHRlbXB0aW5nIHRvIGNvbnRpbnVlIHNjYWxpbmcgb3V0 IGZyb20gdGhlIGlubmVyIG1vc3QgbGV2ZWwuCisgICAgICAgIC8vIFVzZSBmdXp6eSBjb21wYXJl IHdpdGggYSBmaXhlZCBlcnJvciB0byBiZSBhYmxlIHRvIGRlYWwgd2l0aCBsYXJnaXNoIGRpZmZl cmVuY2VzIGR1ZSB0byBwaXhlbCByb3VuZGluZy4KKyAgICAgICAgaWYgKGZ1enp5Q29tcGFyZShl bmRJdGVtU2NhbGUsIGN1cnJlbnRTY2FsZSwgMC4wMSkpIHsKKyAgICAgICAgICAgIC8vIEZJWE1F OiBDaGVjayBpZiB3ZSBzaG91bGQgbW92ZSB0aGUgdmlld3BvcnQgaW5zdGVhZCBvZiB6b29taW5n IGJhY2suCisgICAgICAgICAgICB6b29tQWN0aW9uID0gWm9vbUJhY2s7CisgICAgICAgIH0gZWxz ZSBpZiAoZnV6enlDb21wYXJlKGVuZEl0ZW1TY2FsZSwgbV96b29tT3V0U2NhbGUsIDAuMDEpKQor ICAgICAgICAgICAgem9vbUFjdGlvbiA9IFpvb21CYWNrOworICAgICAgICBlbHNlIGlmIChlbmRJ dGVtU2NhbGUgPCBjdXJyZW50U2NhbGUpCisgICAgICAgICAgICB6b29tQWN0aW9uID0gWm9vbU91 dDsKKyAgICB9CisKKyAgICBzd2l0Y2ggKHpvb21BY3Rpb24pIHsKKyAgICBjYXNlIFpvb21JbjoK KyAgICAgICAgbV9zY2FsZVN0YWNrLmFwcGVuZChTY2FsZVN0YWNrSXRlbShjdXJyZW50U2NhbGUs IG1fdmlld3BvcnQtPmNvbnRlbnRQb3MoKS54KCkpKTsKKyAgICAgICAgbV96b29tT3V0U2NhbGUg PSBlbmRJdGVtU2NhbGU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgWm9vbUJhY2s6IHsKKyAg ICAgICAgU2NhbGVTdGFja0l0ZW0gbGFzdFNjYWxlID0gbV9zY2FsZVN0YWNrLnRha2VMYXN0KCk7 CisgICAgICAgIGVuZEl0ZW1TY2FsZSA9IGxhc3RTY2FsZS5zY2FsZTsKKyAgICAgICAgZW5kUG9z aXRpb24uc2V0WShob3RzcG90LnkoKSAqIGVuZEl0ZW1TY2FsZSAtIHZpZXdwb3J0SG90c3BvdC55 KCkpOworICAgICAgICBlbmRQb3NpdGlvbi5zZXRYKGxhc3RTY2FsZS54UG9zaXRpb24pOworICAg ICAgICBlbmRWaXNpYmxlQ29udGVudFJlY3QgPSBRUmVjdEYoZW5kUG9zaXRpb24gLyBlbmRJdGVt U2NhbGUsIHZpZXdwb3J0UmVjdC5zaXplKCkgLyBlbmRJdGVtU2NhbGUpOworICAgICAgICBicmVh azsKKyAgICB9CisgICAgY2FzZSBab29tT3V0OgorICAgICAgICAvLyBVbnN0YWNrIGFsbCBzY2Fs ZS1sZXZlbHMgZGVlcGVyIHRoYW4gdGhlIG5ldyBsZXZlbCwgc28gYSB6b29tLWJhY2sgd29uJ3Qg ZW5kIHVwIHpvb21pbmcgaW4uCisgICAgICAgIHdoaWxlICghbV9zY2FsZVN0YWNrLmlzRW1wdHko KSAmJiBtX3NjYWxlU3RhY2subGFzdCgpLnNjYWxlID49IGVuZEl0ZW1TY2FsZSkKKyAgICAgICAg ICAgIG1fc2NhbGVTdGFjay5yZW1vdmVMYXN0KCk7CisgICAgICAgIG1fem9vbU91dFNjYWxlID0g ZW5kSXRlbVNjYWxlOworICAgICAgICBicmVhazsKKyAgICB9CisKICAgICBhbmltYXRlSXRlbVJl Y3RWaXNpYmxlKGVuZFZpc2libGVDb250ZW50UmVjdCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaApp bmRleCAxOGM4NjM1MzNjNTUzZGU5MzEyZWNmM2IwYjEwNTEyOWQyOGQyZTI5Li40ODZkODQxN2M1 YzUzNGJkNDY3MjFjMDc4ZWNmYzFjNzBhMmUzODE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC0x NTUsMTIgKzE1NSwyMiBAQCBwcml2YXRlOgogICAgICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3Vy cmVudFZhbHVlKGNvbnN0IFFWYXJpYW50JikgeyB9CiAgICAgfTsKIAorICAgIHN0cnVjdCBTY2Fs ZVN0YWNrSXRlbSB7CisgICAgICAgIFNjYWxlU3RhY2tJdGVtKHFyZWFsIHNjYWxlLCBxcmVhbCB4 UG9zaXRpb24pCisgICAgICAgICAgICA6IHNjYWxlKHNjYWxlKQorICAgICAgICAgICAgLCB4UG9z aXRpb24oeFBvc2l0aW9uKQorICAgICAgICB7IH0KKworICAgICAgICBxcmVhbCBzY2FsZTsKKyAg ICAgICAgcXJlYWwgeFBvc2l0aW9uOworICAgIH07CisKICAgICBTY2FsZUFuaW1hdGlvbiogbV9z Y2FsZUFuaW1hdGlvbjsKICAgICBRUG9pbnRGIG1fbGFzdFBpbmNoQ2VudGVySW5WaWV3cG9ydENv b3JkaW5hdGVzOwogICAgIFFQb2ludEYgbV9sYXN0U2Nyb2xsUG9zaXRpb247CiAgICAgcXJlYWwg bV9waW5jaFN0YXJ0U2NhbGU7CiAgICAgcXJlYWwgbV96b29tT3V0U2NhbGU7Ci0gICAgUUxpc3Q8 cXJlYWw+IG1fc2NhbGVTdGFjazsKKyAgICBRTGlzdDxTY2FsZVN0YWNrSXRlbT4gbV9zY2FsZVN0 YWNrOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==