57798 2011-04-04 15:51:12 -0700 Tiled Backing Store does not regenerate tiles when it should 2011-10-20 00:22:03 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 carol webkit-unassigned cmarrin eric jturcotte kbr kenneth koivisto simon.fraser tonikitoo webkit-ews webkit.review.bot oldest_to_newest 379152 0 carol 2011-04-04 15:51:12 -0700 If TiledBackingStore::adjustVisibleRect is called when the contents of the Frame/Layer is empty (or possible even when contents is not empty, but smaller in size then the frame that shows it, tiles are generated to cover the contents - (0, 0) sized tiles in case of empty contents, but not the full visible frame. When the contents changes to occupy the full visible area, tiles are not regenerated, thus the full document cannot be displayed. See attachment for a fragment of Qt test code that exhibits the behavior, but the problem is not limited to Qt. 379195 1 88153 carol 2011-04-04 16:31:57 -0700 Created attachment 88153 Patch 379211 2 webkit-ews 2011-04-04 16:45:07 -0700 Attachment 88153 did not build on qt: Build output: http://queues.webkit.org/results/8331137 379563 3 88235 carol 2011-04-05 08:00:01 -0700 Created attachment 88235 Proposed Patch. Fixed problem with missing file 408350 4 eric 2011-05-23 15:02:38 -0700 One of the CC'd shoudl easily be able to review this three-week-old patch. :) 408357 5 kenneth 2011-05-23 15:05:29 -0700 Jocelyn has been maintaining our WebKit2 version of the tiled backing store, so I'm cc'ing him. I am also cc'ing the original author Antti. 408359 6 88235 kenneth 2011-05-23 15:09:00 -0700 Comment on attachment 88235 Proposed Patch. Fixed problem with missing file View in context: https://bugs.webkit.org/attachment.cgi?id=88235&action=review > Source/WebCore/platform/graphics/TiledBackingStore.cpp:158 > - IntRect visibleRect = mapFromContents(m_client->tiledBackingStoreVisibleRect()); > + IntRect visibleRect = mapFromContents(intersection(m_client->tiledBackingStoreVisibleRect(), m_client->tiledBackingStoreContentsRect())); Wouldn't it be better to make the tiledBackingStoreVisibleRect() take the contents rect into account? That would make this change quite local. 408704 7 jturcotte 2011-05-24 00:58:30 -0700 The change looks good to me overall, I think we might have this bug in WebKit2 as well. I agree with Kenneth that this intersection would best be made at only one place in the code. Since you are already changing it, greendiv could instead be named to resizedDiv, grownDiv or something. I'm not sure it really matters that it's green. 408734 8 88235 kenneth 2011-05-24 02:04:39 -0700 Comment on attachment 88235 Proposed Patch. Fixed problem with missing file r- given mine and Jocelyn's comments 412112 9 carol 2011-05-29 21:15:27 -0700 (In reply to comment #8) > (From update of attachment 88235 [details]) > r- given mine and Jocelyn's comments Jocelyn and Kenneth, Let me disagree with your review. First, if the intersection were to be moved into tiledBackingStoreVisibleRect() there would be one intersection for every tiledBackingStore client (currently at least 2: WebCore::Frame and WebKit::QtGraphicsLayerImpl), thus there is no saving in code size, second, the TiledBackingStoreClient interface would be less rich since one would no longer be able to retrieve the size of the visible area of the backing store client, if that would ever be needed for some purpose (such as optimization of tile recreation vs. memory usage) the value returned by tiledBackingStoreVisibleRect would be clipped to contentSize always. Second, It is absolutely essential that the div is green. That is what all the tests that use this resource test against, this particular test does not even execute the function that resizes the div, because it does not matter for this test. It is true that resizableFrom50%To150%GreenDivOnWhiteBackground.html would be more descriptive, but I tried to stick with a reasonably short name. If I remember correctly it is essential that this Div causes the scrollbars to be shown in some of the tests that use it, but for this particular test it only matters that it is green and not red. I urge you guys to reconsider this review. 412126 10 95325 carol 2011-05-29 22:58:49 -0700 Created attachment 95325 Alternative Patch, to satisfy Kenneth and Joceylin's judgement I have attached a new patch just in case my previous comment did not convince you that the patch you reviewed negatively is actually a better solution to this problem. I did not mark this new patch for review yet as I still believe that my original patch was better. 412187 11 jturcotte 2011-05-30 04:28:30 -0700 (In reply to comment #9) > Let me disagree with your review. > First, if the intersection were to be moved into tiledBackingStoreVisibleRect() there would be one intersection for every tiledBackingStore client (currently at least 2: WebCore::Frame and WebKit::QtGraphicsLayerImpl), thus there is no saving in code size, second, the TiledBackingStoreClient interface would be less rich since one would no longer be able to retrieve the size of the visible area of the backing store client, if that would ever be needed for some purpose (such as optimization of tile recreation vs. memory usage) the value returned by tiledBackingStoreVisibleRect would be clipped to contentSize always. I agree, what about introducing a TiledBackingStore::visibleRect() that would do this logic? My point is just to avoid duplicate logic since those two hunks need to be synchronized. The reason why an intersection is needed there might not be obvious just by reading the code, it's easier to break. > Second, It is absolutely essential that the div is green. That is what all the tests that use this resource test against, this particular test does not even execute the function that resizes the div, because it does not matter for this test. It is true that resizableFrom50%To150%GreenDivOnWhiteBackground.html would be more descriptive, but I tried to stick with a reasonably short name. > If I remember correctly it is essential that this Div causes the scrollbars to be shown in some of the tests that use it, but for this particular test it only matters that it is green and not red. > I urge you guys to reconsider this review. Sure, greendiv is also fine if you prefer it. 413107 12 95536 carol 2011-05-31 20:35:56 -0700 Created attachment 95536 Proposed Patch, per Jocelyn's suggestion. Implemented Jocelyn's suggestion. 485623 13 95536 webkit.review.bot 2011-10-17 16:40:43 -0700 Comment on attachment 95536 Proposed Patch, per Jocelyn's suggestion. Rejecting attachment 95536 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: e Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp.rej patching file Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.qrc patching file Source/WebKit/qt/tests/qgraphicswebview/resources/56929.html rm 'Source/WebKit/qt/tests/qgraphicswebview/resources/56929.html' patching file Source/WebKit/qt/tests/qgraphicswebview/resources/greendiv.html Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Darin Adler', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/10120027 487346 14 111727 carol 2011-10-19 23:15:30 -0700 Created attachment 111727 Merged reviewed patch with latest code 487373 15 111727 webkit.review.bot 2011-10-20 00:21:57 -0700 Comment on attachment 111727 Merged reviewed patch with latest code Clearing flags on attachment: 111727 Committed r97945: <http://trac.webkit.org/changeset/97945> 487374 16 webkit.review.bot 2011-10-20 00:22:03 -0700 All reviewed patches have been landed. Closing bug. 88153 2011-04-04 16:31:57 -0700 2011-04-05 08:00:01 -0700 Patch bug-57798-20110404193154.patch text/plain 6737 carol U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZmEwYzgzNjFhMzVmZTUx NzAxNjBmYWMzZjNiZWE3MmM2ZjE5YTZmLi5lNzM3NDEyMjRiNzNhMzQ4MGZlZWVjMjNhYTRjNTA3 YmZlMGNjNWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMDQgIENhcm9s IFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZWQgVGlsZWRCYWNraW5nU3RvcmU6OmFkanVz dFZpc2libGVSZWN0IHRvIHRha2UgaW50byBhY2NvdW50CisgICAgICAgIGNvbnRlbnRzU2l6ZSwg dGhlIHNhbWUgd2F5IGFzIGl0IGlzIGRvbmUgd2hlbiB0aWxlcyBhcmUgZ2VuZXJhdGVkLgorCisg ICAgICAgIFRpbGVkIEJhY2tpbmcgU3RvcmUgZG9lcyBub3QgcmVnZW5lcmF0ZSB0aWxlcyB3aGVu IGl0IHNob3VsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTc3OTgKKworICAgICAgICBUaGlzIGlzIGFuIGlzc3VlIHRoYXQgcmVxdWlyZXMgYSBjZXJ0 YWluIHNlcXVlbmNlIG9mIEFQSSBjYWxscyB3aGljaAorICAgICAgICBtYXkgbm90IGJlIGVhc2ls eSBzaW11bGF0ZWQgZnJvbSBEdW1wUmVuZGVyVHJlZSwgYnV0IHdoaWNoIGlzIAorICAgICAgICBl YXNpbHkgcmVwcm9kdWNlZCB3aXRoIFF0VGVzdC4gVGhpcyBpcyB3aHkgSSBoYXZlIHByb3ZpZGVk IG9ubHkKKyAgICAgICAgYSBRdCBzcGVjaWZpYyB0ZXN0IGRlc3BpdGUgdGhpcyBiZWluZyBhIGdl bmVyaWMgcHJvYmxlbS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2lu Z1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlOjphZGp1c3RW aXNpYmxlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZEJhY2tpbmdTdG9yZTo6Y3JlYXRl VGlsZXMpOgorCiAyMDExLTA0LTA0ICBNYWxjb2xtIE1hY0xlb2QgIDxtbWFjbGVvZEB3ZWJtYWls LmNvLnphPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtldmluIE9sbGl2aWVyLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuY3Bw CmluZGV4IGFjN2U5YzZmNTI5NDExM2RmZWY2ZDEzYWY0YTg3MGUwYzY2MjZlZTEuLjZlNmIxNGZh YmJlY2ExYjhhOGMzN2E4OGY1ZGFkZDRkZmRiZGNmNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAKQEAgLTE1NSw3 ICsxNTUsNyBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpwYWludChHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6 OmFkanVzdFZpc2libGVSZWN0KCkKIHsKLSAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gbWFwRnJv bUNvbnRlbnRzKG1fY2xpZW50LT50aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCkpOworICAg IEludFJlY3QgdmlzaWJsZVJlY3QgPSBtYXBGcm9tQ29udGVudHMoaW50ZXJzZWN0aW9uKG1fY2xp ZW50LT50aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCksIG1fY2xpZW50LT50aWxlZEJhY2tp bmdTdG9yZUNvbnRlbnRzUmVjdCgpKSk7CiAgICAgaWYgKG1fcHJldmlvdXNWaXNpYmxlUmVjdCA9 PSB2aXNpYmxlUmVjdCkKICAgICAgICAgcmV0dXJuOwogICAgIG1fcHJldmlvdXNWaXNpYmxlUmVj dCA9IHZpc2libGVSZWN0OwpAQCAtMjAyLDcgKzIwMiw3IEBAIHZvaWQgVGlsZWRCYWNraW5nU3Rv cmU6OmNyZWF0ZVRpbGVzKCkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIEludFJlY3Qgdmlz aWJsZVJlY3QgPSBtYXBGcm9tQ29udGVudHMobV9jbGllbnQtPnRpbGVkQmFja2luZ1N0b3JlVmlz aWJsZVJlY3QoKSk7Ci0gICAgbV9wcmV2aW91c1Zpc2libGVSZWN0ID0gdmlzaWJsZVJlY3Q7Cisg ICAgbV9wcmV2aW91c1Zpc2libGVSZWN0ID0gaW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBjb250 ZW50c1JlY3QoKSk7CiAKICAgICBpZiAodmlzaWJsZVJlY3QuaXNFbXB0eSgpKQogICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDY1YzRlZTk3NjRmMmQyOTI0MTVkM2QxYjRkYzk2N2Mx MWQ3YjczMWMuLjdhNzlmOGU1ZmM2YzZiZWM3NzJlYzZhZDgyM2U2NjlhMWYwM2JhYTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMDQgIENhcm9sIFN6YWJvICA8Y2Fy b2wuc3phYm9Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByb3ZpZGVkIHRlc3QgZm9yIHRoaXMgYnVnLiBDaGFuZ2VkIHRoZSBuYW1l IG9mIHRoZSByZXNvdXJjZSBJIGFkZGVkCisgICAgICAgIGZvciBhIHByZXZpb3VzIHRlc3Qgc28g dGhhdCB0aGUgbmFtZSBpcyBkZXNjcmlwdGl2ZSBzdWNoIHRoYXQgaXQgY2FuCisgICAgICAgIGJl IHNoYXJlZCBhY3Jvc3Mgc2V2ZXJhbCB0ZXN0cy4KKyAgICAgICAgVGlsZWQgQmFja2luZyBTdG9y ZSBkb2VzIG5vdCByZWdlbmVyYXRlIHRpbGVzIHdoZW4gaXQgc2hvdWxkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzc5OAorCisgICAgICAgICogdGVz dHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHA6CisgICAgICAgICh0 c3RfUUdyYXBoaWNzV2ViVmlldzo6YnVnNTc3OTgpOgorICAgICAgICAodHN0X1FHcmFwaGljc1dl YlZpZXc6OmJ1ZzU2OTI5KToKKyAgICAgICAgKiB0ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9x Z3JhcGhpY3N3ZWJ2aWV3LnFyYzoKKwogMjAxMS0wNC0wMSAgQ2Fyb2wgU3phYm8gIDxjYXJvbC5z emFib0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmVuamFtaW4gUG91bGFpbi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3Rf cWdyYXBoaWNzd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dl YnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IGVkMTYyYzQxODlkMzYxMjY2ZGYx MDI1MzVmZmIzOGNhY2VlZDU2MWEuLjIzYmRiY2YyNzM3ZWYyYzgxNWJiODI0N2MwZDM1MjQyOWUz MmRlMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmll dy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x Z3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtNDUsNiArNDUsNyBA QCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgc2V0UGFsZXR0ZSgpOwogICAgIHZvaWQgcmVuZGVy SGludHMoKTsKICNpZiBkZWZpbmVkKEVOQUJMRV9USUxFRF9CQUNLSU5HX1NUT1JFKSAmJiBFTkFC TEVfVElMRURfQkFDS0lOR19TVE9SRQorICAgIHZvaWQgYnVnNTc3OTgoKTsKICAgICB2b2lkIGJ1 ZzU2OTI5KCk7CiAjZW5kaWYKICNpZiBkZWZpbmVkKEVOQUJMRV9XRUJHTCkgJiYgRU5BQkxFX1dF QkdMCkBAIC0xOTUsNiArMTk2LDM1IEBAIHZvaWQgdHN0X1FHcmFwaGljc1dlYlZpZXc6OndpZGdl dHNSZW5kZXJpbmdUaHJvdWdoQ2FjaGUoKQogfQogCiAjaWYgZGVmaW5lZChFTkFCTEVfVElMRURf QkFDS0lOR19TVE9SRSkgJiYgRU5BQkxFX1RJTEVEX0JBQ0tJTkdfU1RPUkUKK3ZvaWQgdHN0X1FH cmFwaGljc1dlYlZpZXc6OmJ1ZzU3Nzk4KCkKK3sKKyAgICAvLyBXaGVuIGNvbnRlbnQgc2l6ZSBn cm93cyBmcm9tIGxlc3MgdGhhbiB2aWV3cG9ydCBzaXplIHRvIG1vcmUgdGhhbiB0aGF0LCB0aWxl cyBtYXkgbmVlZCB0byBiZSByZWdlbmVyYXRlZC4KKworICAgIFFHcmFwaGljc1dlYlZpZXcqIHdl YlZpZXcgPSBuZXcgUUdyYXBoaWNzV2ViVmlldygpOworICAgIHdlYlZpZXctPnNldEdlb21ldHJ5 KFFSZWN0RigwLjAsIDAuMCwgMTAwLjAsIDEwMC4wKSk7CisgICAgUUdyYXBoaWNzVmlldyB2aWV3 KG5ldyBRR3JhcGhpY3NTY2VuZSgpKTsKKyAgICB2aWV3LnNjZW5lKCktPnNldFBhcmVudCgmdmll dyk7CisgICAgdmlldy5zY2VuZSgpLT5hZGRJdGVtKHdlYlZpZXcpOworICAgIHdlYlZpZXctPnNl dHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OlRpbGVkQmFja2luZ1N0b3JlRW5h YmxlZCwgdHJ1ZSk7CisgICAgUVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtIG9wdGlvbjsKKyAgICBv cHRpb24uZXhwb3NlZFJlY3QgPSB2aWV3LnNjZW5lUmVjdCgpOworICAgIFFJbWFnZSBpbWcodmll dy53aWR0aCgpLCB2aWV3LmhlaWdodCgpLAorICAgIFFJbWFnZTo6Rm9ybWF0X0FSR0IzMl9QcmVt dWx0aXBsaWVkKTsKKyAgICBRUGFpbnRlciBwYWludGVyKCZpbWcpOworICAgIC8vIFRoaXMgd2ls bCBub3QgcGFpbnQgYW55dGhpbmcgYXMgdGhlIHRpbGVzIGFyZSBub3QgcmVhZHksIGJ1dCB3aWxs IHRyaWdnZXIgdGlsZSBjcmVhdGlvbiB3aXRoIHNpemUgKDAsIDApLgorICAgIHdlYlZpZXctPnBh aW50KCZwYWludGVyLCAmb3B0aW9uKTsKKyAgICBRQXBwbGljYXRpb246OnByb2Nlc3NFdmVudHMo KTsKKyAgICBRVXJsIHVybCgicXJjOi8vL3Jlc291cmNlcy9ncmVlbmRpdi5odG1sIik7CisgICAg d2ViVmlldy0+bG9hZCh1cmwpOworICAgIFFWRVJJRlkod2FpdEZvclNpZ25hbCh3ZWJWaWV3LCBT SUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkpOworICAgIC8vIFRoaXMgc2hvdWxkIHRyaWdnZXIg dGhlIHJlY3JlYXRpb24gb2YgdGhlIHRpbGVzLgorICAgIHdlYlZpZXctPnBhaW50KCZwYWludGVy LCAmb3B0aW9uKTsKKyAgICBRQXBwbGljYXRpb246OnByb2Nlc3NFdmVudHMoKTsKKyAgICBwYWlu dGVyLmZpbGxSZWN0KG9wdGlvbi5leHBvc2VkUmVjdCwgUXQ6OnJlZCk7IC8vIFRoaXMgaXMgaGVy ZSB0byBlbnN1cmUgZmFpbHVyZSBpZiBwYWludCBkb2VzIG5vdCBwYWludCBhbnl0aGluZworICAg IHdlYlZpZXctPnBhaW50KCZwYWludGVyLCAmb3B0aW9uKTsKKyAgICBRQ09NUEFSRShpbWcucGl4 ZWwob3B0aW9uLmV4cG9zZWRSZWN0LndpZHRoKCkgLyA0LCBvcHRpb24uZXhwb3NlZFJlY3QuaGVp Z2h0KCkgLyA0KSwgcVJnYmEoMCwgMTI4LCAwLCAyNTUpKTsKK30KKwogdm9pZCB0c3RfUUdyYXBo aWNzV2ViVmlldzo6YnVnNTY5MjkoKQogewogICAgIC8vIFdoZW4gcmVuZGVyaW5nIGZyb20gdGls ZXMgc3ljaHJvbm91cyBsYXlvdXQgc2hvdWxkIG5vdCBiZSB0cmlnZ2VyZWQKQEAgLTIwNiw3ICsy MzYsNyBAQCB2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpidWc1NjkyOSgpCiAgICAgdmlldy5z Y2VuZSgpLT5zZXRQYXJlbnQoJnZpZXcpOwogICAgIHZpZXcuc2NlbmUoKS0+YWRkSXRlbSh3ZWJW aWV3KTsKICAgICB3ZWJWaWV3LT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdz OjpUaWxlZEJhY2tpbmdTdG9yZUVuYWJsZWQsIHRydWUpOwotICAgIFFVcmwgdXJsKCJxcmM6Ly8v cmVzb3VyY2VzLzU2OTI5Lmh0bWwiKTsKKyAgICBRVXJsIHVybCgicXJjOi8vL3Jlc291cmNlcy9n cmVlbmRpdi5odG1sIik7CiAgICAgd2ViVmlldy0+bG9hZCh1cmwpOwogICAgIFFWRVJJRlkod2Fp dEZvclNpZ25hbCh3ZWJWaWV3LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkpOwogICAgIFFT dHlsZU9wdGlvbkdyYXBoaWNzSXRlbSBvcHRpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcucXJjIGIvU291 cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3 LnFyYwppbmRleCBmOTI5ZmU3MjFiNDFiZWJkZGU0NzJiYWVkMjYyMWIxZjlhNTcxNzRiLi45Nzcy NmJhNzNmZWI4M2Q1NzllYjc0YjllZDM5YjZhYmI0NjBiZDRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcucXJj CisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBo aWNzd2Vidmlldy5xcmMKQEAgLTMsNiArMyw2IEBACiAgICAgICAgIDxmaWxlPnJlc291cmNlcy9p bnB1dF90eXBlcy5odG1sPC9maWxlPgogICAgICAgICA8ZmlsZT5yZXNvdXJjZXMvcG9pbnRpbmdf cmlnaHQuaHRtbDwvZmlsZT4KICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3BvaW50aW5nX3VwLmh0 bWw8L2ZpbGU+Ci0gICAgICAgIDxmaWxlPnJlc291cmNlcy81NjkyOS5odG1sPC9maWxlPgorICAg ICAgICA8ZmlsZT5yZXNvdXJjZXMvZ3JlZW5kaXYuaHRtbDwvZmlsZT4KICAgICA8L3FyZXNvdXJj ZT4KIDwvUkNDPgo= 88235 2011-04-05 08:00:01 -0700 2011-05-31 20:35:56 -0700 Proposed Patch. Fixed problem with missing file patchForW57798-2.patch text/plain 7527 carol ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjZmEwYzgzLi5lNzM3NDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDQtMDQgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZWQgVGls ZWRCYWNraW5nU3RvcmU6OmFkanVzdFZpc2libGVSZWN0IHRvIHRha2UgaW50byBhY2NvdW50Cisg ICAgICAgIGNvbnRlbnRzU2l6ZSwgdGhlIHNhbWUgd2F5IGFzIGl0IGlzIGRvbmUgd2hlbiB0aWxl cyBhcmUgZ2VuZXJhdGVkLgorCisgICAgICAgIFRpbGVkIEJhY2tpbmcgU3RvcmUgZG9lcyBub3Qg cmVnZW5lcmF0ZSB0aWxlcyB3aGVuIGl0IHNob3VsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc3OTgKKworICAgICAgICBUaGlzIGlzIGFuIGlzc3Vl IHRoYXQgcmVxdWlyZXMgYSBjZXJ0YWluIHNlcXVlbmNlIG9mIEFQSSBjYWxscyB3aGljaAorICAg ICAgICBtYXkgbm90IGJlIGVhc2lseSBzaW11bGF0ZWQgZnJvbSBEdW1wUmVuZGVyVHJlZSwgYnV0 IHdoaWNoIGlzIAorICAgICAgICBlYXNpbHkgcmVwcm9kdWNlZCB3aXRoIFF0VGVzdC4gVGhpcyBp cyB3aHkgSSBoYXZlIHByb3ZpZGVkIG9ubHkKKyAgICAgICAgYSBRdCBzcGVjaWZpYyB0ZXN0IGRl c3BpdGUgdGhpcyBiZWluZyBhIGdlbmVyaWMgcHJvYmxlbS4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVk QmFja2luZ1N0b3JlOjphZGp1c3RWaXNpYmxlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpUaWxl ZEJhY2tpbmdTdG9yZTo6Y3JlYXRlVGlsZXMpOgorCiAyMDExLTA0LTA0ICBNYWxjb2xtIE1hY0xl b2QgIDxtbWFjbGVvZEB3ZWJtYWlsLmNvLnphPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtldmlu IE9sbGl2aWVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv VGlsZWRCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv VGlsZWRCYWNraW5nU3RvcmUuY3BwCmluZGV4IGFjN2U5YzYuLjZlNmIxNGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5j cHAKQEAgLTE1NSw3ICsxNTUsNyBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpwYWludChHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIHZvaWQgVGlsZWRC YWNraW5nU3RvcmU6OmFkanVzdFZpc2libGVSZWN0KCkKIHsKLSAgICBJbnRSZWN0IHZpc2libGVS ZWN0ID0gbWFwRnJvbUNvbnRlbnRzKG1fY2xpZW50LT50aWxlZEJhY2tpbmdTdG9yZVZpc2libGVS ZWN0KCkpOworICAgIEludFJlY3QgdmlzaWJsZVJlY3QgPSBtYXBGcm9tQ29udGVudHMoaW50ZXJz ZWN0aW9uKG1fY2xpZW50LT50aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCksIG1fY2xpZW50 LT50aWxlZEJhY2tpbmdTdG9yZUNvbnRlbnRzUmVjdCgpKSk7CiAgICAgaWYgKG1fcHJldmlvdXNW aXNpYmxlUmVjdCA9PSB2aXNpYmxlUmVjdCkKICAgICAgICAgcmV0dXJuOwogICAgIG1fcHJldmlv dXNWaXNpYmxlUmVjdCA9IHZpc2libGVSZWN0OwpAQCAtMjAyLDcgKzIwMiw3IEBAIHZvaWQgVGls ZWRCYWNraW5nU3RvcmU6OmNyZWF0ZVRpbGVzKCkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAg IEludFJlY3QgdmlzaWJsZVJlY3QgPSBtYXBGcm9tQ29udGVudHMobV9jbGllbnQtPnRpbGVkQmFj a2luZ1N0b3JlVmlzaWJsZVJlY3QoKSk7Ci0gICAgbV9wcmV2aW91c1Zpc2libGVSZWN0ID0gdmlz aWJsZVJlY3Q7CisgICAgbV9wcmV2aW91c1Zpc2libGVSZWN0ID0gaW50ZXJzZWN0aW9uKHZpc2li bGVSZWN0LCBjb250ZW50c1JlY3QoKSk7CiAKICAgICBpZiAodmlzaWJsZVJlY3QuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDY1YzRlZTkuLjdhNzlmOGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv cXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMDQgIENhcm9sIFN6YWJvICA8 Y2Fyb2wuc3phYm9Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFByb3ZpZGVkIHRlc3QgZm9yIHRoaXMgYnVnLiBDaGFuZ2VkIHRoZSBu YW1lIG9mIHRoZSByZXNvdXJjZSBJIGFkZGVkCisgICAgICAgIGZvciBhIHByZXZpb3VzIHRlc3Qg c28gdGhhdCB0aGUgbmFtZSBpcyBkZXNjcmlwdGl2ZSBzdWNoIHRoYXQgaXQgY2FuCisgICAgICAg IGJlIHNoYXJlZCBhY3Jvc3Mgc2V2ZXJhbCB0ZXN0cy4KKyAgICAgICAgVGlsZWQgQmFja2luZyBT dG9yZSBkb2VzIG5vdCByZWdlbmVyYXRlIHRpbGVzIHdoZW4gaXQgc2hvdWxkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzc5OAorCisgICAgICAgICog dGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHA6CisgICAgICAg ICh0c3RfUUdyYXBoaWNzV2ViVmlldzo6YnVnNTc3OTgpOgorICAgICAgICAodHN0X1FHcmFwaGlj c1dlYlZpZXc6OmJ1ZzU2OTI5KToKKyAgICAgICAgKiB0ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3Rz dF9xZ3JhcGhpY3N3ZWJ2aWV3LnFyYzoKKwogMjAxMS0wNC0wMSAgQ2Fyb2wgU3phYm8gIDxjYXJv bC5zemFib0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmVuamFtaW4gUG91bGFp bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy9y ZXNvdXJjZXMvNTY5MjkuaHRtbCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vi dmlldy9yZXNvdXJjZXMvNTY5MjkuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MmY3ZmE5Ny4uMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dl YnZpZXcvcmVzb3VyY2VzLzU2OTI5Lmh0bWwKKysrIC9kZXYvbnVsbApAQCAtMSw4ICswLDAgQEAK LTxib2R5IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZSI+Ci0gPGRpdiBpZD0iMSIgc3R5 bGU9IndpZHRoOiA1MCU7IGhlaWdodDogNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbiIvPgot IDxzY3JpcHQ+Ci0gIGZ1bmN0aW9uIHJlc2l6ZURpdigpIHsKLSAgICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCIxIikuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJ3aWR0aDogMTUwJTsgaGVpZ2h0 OiAxNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbiIpOwotICB9Ci0gPC9zY3JpcHQ+Ci08L2Jv ZHk+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcv cmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWwgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGlj c3dlYnZpZXcvcmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uMmY3ZmE5NwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQv dGVzdHMvcWdyYXBoaWNzd2Vidmlldy9yZXNvdXJjZXMvZ3JlZW5kaXYuaHRtbApAQCAtMCwwICsx LDggQEAKKzxib2R5IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZSI+CisgPGRpdiBpZD0i MSIgc3R5bGU9IndpZHRoOiA1MCU7IGhlaWdodDogNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVl biIvPgorIDxzY3JpcHQ+CisgIGZ1bmN0aW9uIHJlc2l6ZURpdigpIHsKKyAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCIxIikuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJ3aWR0aDogMTUwJTsg aGVpZ2h0OiAxNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbiIpOworICB9CisgPC9zY3JpcHQ+ Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dl YnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x Z3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAppbmRleCBlZDE2MmM0Li4y M2JkYmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZp ZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAKQEAgLTQ1LDYgKzQ1LDcg QEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHNldFBhbGV0dGUoKTsKICAgICB2b2lkIHJlbmRl ckhpbnRzKCk7CiAjaWYgZGVmaW5lZChFTkFCTEVfVElMRURfQkFDS0lOR19TVE9SRSkgJiYgRU5B QkxFX1RJTEVEX0JBQ0tJTkdfU1RPUkUKKyAgICB2b2lkIGJ1ZzU3Nzk4KCk7CiAgICAgdm9pZCBi dWc1NjkyOSgpOwogI2VuZGlmCiAjaWYgZGVmaW5lZChFTkFCTEVfV0VCR0wpICYmIEVOQUJMRV9X RUJHTApAQCAtMTk1LDYgKzE5NiwzNSBAQCB2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3Ojp3aWRn ZXRzUmVuZGVyaW5nVGhyb3VnaENhY2hlKCkKIH0KIAogI2lmIGRlZmluZWQoRU5BQkxFX1RJTEVE X0JBQ0tJTkdfU1RPUkUpICYmIEVOQUJMRV9USUxFRF9CQUNLSU5HX1NUT1JFCit2b2lkIHRzdF9R R3JhcGhpY3NXZWJWaWV3OjpidWc1Nzc5OCgpCit7CisgICAgLy8gV2hlbiBjb250ZW50IHNpemUg Z3Jvd3MgZnJvbSBsZXNzIHRoYW4gdmlld3BvcnQgc2l6ZSB0byBtb3JlIHRoYW4gdGhhdCwgdGls ZXMgbWF5IG5lZWQgdG8gYmUgcmVnZW5lcmF0ZWQuCisKKyAgICBRR3JhcGhpY3NXZWJWaWV3KiB3 ZWJWaWV3ID0gbmV3IFFHcmFwaGljc1dlYlZpZXcoKTsKKyAgICB3ZWJWaWV3LT5zZXRHZW9tZXRy eShRUmVjdEYoMC4wLCAwLjAsIDEwMC4wLCAxMDAuMCkpOworICAgIFFHcmFwaGljc1ZpZXcgdmll dyhuZXcgUUdyYXBoaWNzU2NlbmUoKSk7CisgICAgdmlldy5zY2VuZSgpLT5zZXRQYXJlbnQoJnZp ZXcpOworICAgIHZpZXcuc2NlbmUoKS0+YWRkSXRlbSh3ZWJWaWV3KTsKKyAgICB3ZWJWaWV3LT5z ZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpUaWxlZEJhY2tpbmdTdG9yZUVu YWJsZWQsIHRydWUpOworICAgIFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbSBvcHRpb247CisgICAg b3B0aW9uLmV4cG9zZWRSZWN0ID0gdmlldy5zY2VuZVJlY3QoKTsKKyAgICBRSW1hZ2UgaW1nKHZp ZXcud2lkdGgoKSwgdmlldy5oZWlnaHQoKSwKKyAgICBRSW1hZ2U6OkZvcm1hdF9BUkdCMzJfUHJl bXVsdGlwbGllZCk7CisgICAgUVBhaW50ZXIgcGFpbnRlcigmaW1nKTsKKyAgICAvLyBUaGlzIHdp bGwgbm90IHBhaW50IGFueXRoaW5nIGFzIHRoZSB0aWxlcyBhcmUgbm90IHJlYWR5LCBidXQgd2ls bCB0cmlnZ2VyIHRpbGUgY3JlYXRpb24gd2l0aCBzaXplICgwLCAwKS4KKyAgICB3ZWJWaWV3LT5w YWludCgmcGFpbnRlciwgJm9wdGlvbik7CisgICAgUUFwcGxpY2F0aW9uOjpwcm9jZXNzRXZlbnRz KCk7CisgICAgUVVybCB1cmwoInFyYzovLy9yZXNvdXJjZXMvZ3JlZW5kaXYuaHRtbCIpOworICAg IHdlYlZpZXctPmxvYWQodXJsKTsKKyAgICBRVkVSSUZZKHdhaXRGb3JTaWduYWwod2ViVmlldywg U0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpKTsKKyAgICAvLyBUaGlzIHNob3VsZCB0cmlnZ2Vy IHRoZSByZWNyZWF0aW9uIG9mIHRoZSB0aWxlcy4KKyAgICB3ZWJWaWV3LT5wYWludCgmcGFpbnRl ciwgJm9wdGlvbik7CisgICAgUUFwcGxpY2F0aW9uOjpwcm9jZXNzRXZlbnRzKCk7CisgICAgcGFp bnRlci5maWxsUmVjdChvcHRpb24uZXhwb3NlZFJlY3QsIFF0OjpyZWQpOyAvLyBUaGlzIGlzIGhl cmUgdG8gZW5zdXJlIGZhaWx1cmUgaWYgcGFpbnQgZG9lcyBub3QgcGFpbnQgYW55dGhpbmcKKyAg ICB3ZWJWaWV3LT5wYWludCgmcGFpbnRlciwgJm9wdGlvbik7CisgICAgUUNPTVBBUkUoaW1nLnBp eGVsKG9wdGlvbi5leHBvc2VkUmVjdC53aWR0aCgpIC8gNCwgb3B0aW9uLmV4cG9zZWRSZWN0Lmhl aWdodCgpIC8gNCksIHFSZ2JhKDAsIDEyOCwgMCwgMjU1KSk7Cit9CisKIHZvaWQgdHN0X1FHcmFw aGljc1dlYlZpZXc6OmJ1ZzU2OTI5KCkKIHsKICAgICAvLyBXaGVuIHJlbmRlcmluZyBmcm9tIHRp bGVzIHN5Y2hyb25vdXMgbGF5b3V0IHNob3VsZCBub3QgYmUgdHJpZ2dlcmVkCkBAIC0yMDYsNyAr MjM2LDcgQEAgdm9pZCB0c3RfUUdyYXBoaWNzV2ViVmlldzo6YnVnNTY5MjkoKQogICAgIHZpZXcu c2NlbmUoKS0+c2V0UGFyZW50KCZ2aWV3KTsKICAgICB2aWV3LnNjZW5lKCktPmFkZEl0ZW0od2Vi Vmlldyk7CiAgICAgd2ViVmlldy0+c2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5n czo6VGlsZWRCYWNraW5nU3RvcmVFbmFibGVkLCB0cnVlKTsKLSAgICBRVXJsIHVybCgicXJjOi8v L3Jlc291cmNlcy81NjkyOS5odG1sIik7CisgICAgUVVybCB1cmwoInFyYzovLy9yZXNvdXJjZXMv Z3JlZW5kaXYuaHRtbCIpOwogICAgIHdlYlZpZXctPmxvYWQodXJsKTsKICAgICBRVkVSSUZZKHdh aXRGb3JTaWduYWwod2ViVmlldywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpKTsKICAgICBR U3R5bGVPcHRpb25HcmFwaGljc0l0ZW0gb3B0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LnFyYyBiL1Nv dXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmll dy5xcmMKaW5kZXggZjkyOWZlNy4uOTc3MjZiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9x dC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LnFyYworKysgYi9T b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZp ZXcucXJjCkBAIC0zLDYgKzMsNiBAQAogICAgICAgICA8ZmlsZT5yZXNvdXJjZXMvaW5wdXRfdHlw ZXMuaHRtbDwvZmlsZT4KICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3BvaW50aW5nX3JpZ2h0Lmh0 bWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy9wb2ludGluZ191cC5odG1sPC9maWxl PgotICAgICAgICA8ZmlsZT5yZXNvdXJjZXMvNTY5MjkuaHRtbDwvZmlsZT4KKyAgICAgICAgPGZp bGU+cmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWw8L2ZpbGU+CiAgICAgPC9xcmVzb3VyY2U+CiA8L1JD Qz4K 95325 2011-05-29 22:58:49 -0700 2011-10-19 23:15:30 -0700 Alternative Patch, to satisfy Kenneth and Joceylin's judgement patchFor57798-3.patch text/plain 8241 carol SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NjcwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDUtMjkgIENhcm9sIFN6 YWJvICA8Y2Fyb2xAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDaGFuZ2VkIFRpbGVkQmFja2luZ1N0b3JlQ2xpZW50Ojp0aWxlZEJh Y2tpbmdTdG9yZVZpc2libGVSZWN0CisgICAgICAgIGltcGxlbWVudGF0aW9ucyB0byB0YWtlIGlu dG8gYWNjb3VudCBjb250ZW50c1NpemUuCisKKyAgICAgICAgVGlsZWQgQmFja2luZyBTdG9yZSBk b2VzIG5vdCByZWdlbmVyYXRlIHRpbGVzIHdoZW4gaXQgc2hvdWxkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzc5OAorCisgICAgICAgIFRoaXMgaXMg YW4gaXNzdWUgdGhhdCByZXF1aXJlcyBhIGNlcnRhaW4gc2VxdWVuY2Ugb2YgQVBJIGNhbGxzIHdo aWNoCisgICAgICAgIG1heSBub3QgYmUgZWFzaWx5IHNpbXVsYXRlZCBmcm9tIER1bXBSZW5kZXJU cmVlLCBidXQgd2hpY2ggaXMgCisgICAgICAgIGVhc2lseSByZXByb2R1Y2VkIHdpdGggUXRUZXN0 LiBUaGlzIGlzIHdoeSBJIGhhdmUgcHJvdmlkZWQgb25seQorICAgICAgICBhIFF0IHNwZWNpZmlj IHRlc3QgZGVzcGl0ZSB0aGlzIGJlaW5nIGEgZ2VuZXJpYyBwcm9ibGVtLgorCisgICAgICAgICog cGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6dGlsZWRCYWNraW5nU3Rv cmVWaXNpYmxlUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NM YXllclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6OnRpbGVk QmFja2luZ1N0b3JlVmlzaWJsZVJlY3QpOgorCUNoYW5nZWQgdG8gaW50ZXJzZWN0IHRoZSB2aXNp YmxlIHJlY3Qgd2l0aCB0aGUgQ29udGVudHNSZWN0LgorCiAyMDExLTA1LTI5ICBCcmlhbiBXZWlu c3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCShyZXZpc2lvbiA4NzY2MCkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05OTksNyArOTk5 LDcgQEAgSW50UmVjdCBGcmFtZTo6dGlsZWRCYWNraW5nU3RvcmVWaXNpYmxlUgogewogICAgIGlm ICghbV9wYWdlKQogICAgICAgICByZXR1cm4gSW50UmVjdCgpOwotICAgIHJldHVybiBtX3BhZ2Ut PmNocm9tZSgpLT5jbGllbnQoKS0+dmlzaWJsZVJlY3RGb3JUaWxlZEJhY2tpbmdTdG9yZSgpOwor ICAgIHJldHVybiBpbnRlcnNlY3Rpb24obV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPnZpc2li bGVSZWN0Rm9yVGlsZWRCYWNraW5nU3RvcmUoKSwgdGlsZWRCYWNraW5nU3RvcmVDb250ZW50c1Jl Y3QoKSk7CiB9CiAKIENvbG9yIEZyYW1lOjp0aWxlZEJhY2tpbmdTdG9yZUJhY2tncm91bmRDb2xv cigpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0xheWVyUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAJKHJldmlzaW9uIDg3NjYwKQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtOTMyLDcgKzkzMiw3IEBAIEludFJlY3QgR3JhcGhpY3NMYXllclF0SW1wbDo6 dGlsZWRCYWNraW4KICAgICAgICAgcmV0dXJuIG1hcEZyb21TY2VuZShzY2VuZSgpLT5zY2VuZVJl Y3QoKSkuYm91bmRpbmdSZWN0KCkudG9BbGlnbmVkUmVjdCgpOwogCiAgICAgLy8gQWxsIHdlIGdl dCBpcyB0aGUgdmlld3BvcnQncyB2aXNpYmxlIHJlZ2lvbi4gV2UgaGF2ZSB0byBtYXAgaXQgdG8g dGhlIHNjZW5lIGFuZCB0aGVuIHRvIGl0ZW0gY29vcmRpbmF0ZXMuCi0gICAgcmV0dXJuIG1hcEZy b21TY2VuZSh2aWV3LT5tYXBUb1NjZW5lKHZpZXctPnZpZXdwb3J0KCktPnZpc2libGVSZWdpb24o KS5ib3VuZGluZ1JlY3QoKSkuYm91bmRpbmdSZWN0KCkpLmJvdW5kaW5nUmVjdCgpLnRvQWxpZ25l ZFJlY3QoKTsKKyAgICByZXR1cm4gbWFwRnJvbVNjZW5lKHZpZXctPm1hcFRvU2NlbmUodmlldy0+ dmlld3BvcnQoKS0+dmlzaWJsZVJlZ2lvbigpLmJvdW5kaW5nUmVjdCgpKS5ib3VuZGluZ1JlY3Qo KSkuYm91bmRpbmdSZWN0KCkuaW50ZXJzZWN0ZWQoKFFSZWN0Ril0aWxlZEJhY2tpbmdTdG9yZUNv bnRlbnRzUmVjdCgpKS50b0FsaWduZWRSZWN0KCk7CiB9CiAjZW5kaWYKIApJbmRleDogU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9DaGFu Z2VMb2cJKHJldmlzaW9uIDg3NjcwKQorKysgU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNS0yOSAgQ2Fyb2wgU3phYm8gIDxj YXJvbEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFByb3ZpZGVkIHRlc3QgZm9yIHRoaXMgYnVnLiBDaGFuZ2VkIHRoZSBuYW1lIG9m IHRoZSByZXNvdXJjZSBJIGFkZGVkCisgICAgICAgIGZvciBhIHByZXZpb3VzIHRlc3Qgc28gdGhh dCB0aGUgbmFtZSBpcyBkZXNjcmlwdGl2ZSBzdWNoIHRoYXQgaXQgY2FuCisgICAgICAgIGJlIHNo YXJlZCBhY3Jvc3Mgc2V2ZXJhbCB0ZXN0cy4KKyAgICAgICAgVGlsZWQgQmFja2luZyBTdG9yZSBk b2VzIG5vdCByZWdlbmVyYXRlIHRpbGVzIHdoZW4gaXQgc2hvdWxkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzc5OAorCisgICAgICAgICogdGVzdHMv cWdyYXBoaWNzd2Vidmlldy9yZXNvdXJjZXMvNTY5MjkuaHRtbDogUmVtb3ZlZC4KKyAgICAgICAg KiB0ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3Jlc291cmNlcy9yZXNpemFibGVncmVlbmRpdi5odG1s OiBBZGRlZC4KKyAgICAgICAgKiB0ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpidWc1Nzc5OCk6Cisg ICAgICAgICh0c3RfUUdyYXBoaWNzV2ViVmlldzo6YnVnNTY5MjkpOgorICAgICAgICAqIHRlc3Rz L3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcucXJjOgorCiAyMDExLTA1LTI4 ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QWxleGV5IFByb3NrdXJ5YWtvdi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBo aWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNw cAkocmV2aXNpb24gODc2NjApCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dl YnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0 Nyw3IEBAIHByaXZhdGUgc2xvdHM6CiAjZW5kaWYKICAgICB2b2lkIHJlbmRlckhpbnRzKCk7CiAj aWYgZGVmaW5lZChFTkFCTEVfVElMRURfQkFDS0lOR19TVE9SRSkgJiYgRU5BQkxFX1RJTEVEX0JB Q0tJTkdfU1RPUkUKKyAgICB2b2lkIGJ1ZzU3Nzk4KCk7CiAgICAgdm9pZCBidWc1NjkyOSgpOwog I2VuZGlmCiAjaWYgZGVmaW5lZChFTkFCTEVfV0VCR0wpICYmIEVOQUJMRV9XRUJHTApAQCAtMTk5 LDYgKzIwMCwzNSBAQCB2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3Ojp3aWRnZXRzUmVuZGVyCiB9 CiAKICNpZiBkZWZpbmVkKEVOQUJMRV9USUxFRF9CQUNLSU5HX1NUT1JFKSAmJiBFTkFCTEVfVElM RURfQkFDS0lOR19TVE9SRQordm9pZCB0c3RfUUdyYXBoaWNzV2ViVmlldzo6YnVnNTc3OTgoKQor eworICAgIC8vIFdoZW4gY29udGVudCBzaXplIGdyb3dzIGZyb20gbGVzcyB0aGFuIHZpZXdwb3J0 IHNpemUgdG8gbW9yZSB0aGFuIHRoYXQsIHRpbGVzIG1heSBuZWVkIHRvIGJlIHJlZ2VuZXJhdGVk LgorCisgICAgUUdyYXBoaWNzV2ViVmlldyogd2ViVmlldyA9IG5ldyBRR3JhcGhpY3NXZWJWaWV3 KCk7CisgICAgd2ViVmlldy0+c2V0R2VvbWV0cnkoUVJlY3RGKDAuMCwgMC4wLCAxMDAuMCwgMTAw LjApKTsKKyAgICBRR3JhcGhpY3NWaWV3IHZpZXcobmV3IFFHcmFwaGljc1NjZW5lKCkpOworICAg IHZpZXcuc2NlbmUoKS0+c2V0UGFyZW50KCZ2aWV3KTsKKyAgICB2aWV3LnNjZW5lKCktPmFkZEl0 ZW0od2ViVmlldyk7CisgICAgd2ViVmlldy0+c2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJT ZXR0aW5nczo6VGlsZWRCYWNraW5nU3RvcmVFbmFibGVkLCB0cnVlKTsKKyAgICBRU3R5bGVPcHRp b25HcmFwaGljc0l0ZW0gb3B0aW9uOworICAgIG9wdGlvbi5leHBvc2VkUmVjdCA9IHZpZXcuc2Nl bmVSZWN0KCk7CisgICAgUUltYWdlIGltZyh2aWV3LndpZHRoKCksIHZpZXcuaGVpZ2h0KCksCisg ICAgUUltYWdlOjpGb3JtYXRfQVJHQjMyX1ByZW11bHRpcGxpZWQpOworICAgIFFQYWludGVyIHBh aW50ZXIoJmltZyk7CisgICAgLy8gVGhpcyB3aWxsIG5vdCBwYWludCBhbnl0aGluZyBhcyB0aGUg dGlsZXMgYXJlIG5vdCByZWFkeSwgYnV0IHdpbGwgdHJpZ2dlciB0aWxlIGNyZWF0aW9uIHdpdGgg c2l6ZSAoMCwgMCkuCisgICAgd2ViVmlldy0+cGFpbnQoJnBhaW50ZXIsICZvcHRpb24pOworICAg IFFBcHBsaWNhdGlvbjo6cHJvY2Vzc0V2ZW50cygpOworICAgIFFVcmwgdXJsKCJxcmM6Ly8vcmVz b3VyY2VzL3Jlc2l6YWJsZWdyZWVuZGl2Lmh0bWwiKTsKKyAgICB3ZWJWaWV3LT5sb2FkKHVybCk7 CisgICAgUVZFUklGWSh3YWl0Rm9yU2lnbmFsKHdlYlZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQo Ym9vbCkpKSk7CisgICAgLy8gVGhpcyBzaG91bGQgdHJpZ2dlciB0aGUgcmVjcmVhdGlvbiBvZiB0 aGUgdGlsZXMuCisgICAgd2ViVmlldy0+cGFpbnQoJnBhaW50ZXIsICZvcHRpb24pOworICAgIFFB cHBsaWNhdGlvbjo6cHJvY2Vzc0V2ZW50cygpOworICAgIHBhaW50ZXIuZmlsbFJlY3Qob3B0aW9u LmV4cG9zZWRSZWN0LCBRdDo6cmVkKTsgLy8gVGhpcyBpcyBoZXJlIHRvIGVuc3VyZSBmYWlsdXJl IGlmIHBhaW50IGRvZXMgbm90IHBhaW50IGFueXRoaW5nCisgICAgd2ViVmlldy0+cGFpbnQoJnBh aW50ZXIsICZvcHRpb24pOworICAgIFFDT01QQVJFKGltZy5waXhlbChvcHRpb24uZXhwb3NlZFJl Y3Qud2lkdGgoKSAvIDQsIG9wdGlvbi5leHBvc2VkUmVjdC5oZWlnaHQoKSAvIDQpLCBxUmdiYSgw LCAxMjgsIDAsIDI1NSkpOworfQorCiB2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpidWc1Njky OSgpCiB7CiAgICAgLy8gV2hlbiByZW5kZXJpbmcgZnJvbSB0aWxlcyBzeWNocm9ub3VzIGxheW91 dCBzaG91bGQgbm90IGJlIHRyaWdnZXJlZApAQCAtMjEwLDcgKzI0MCw3IEBAIHZvaWQgdHN0X1FH cmFwaGljc1dlYlZpZXc6OmJ1ZzU2OTI5KCkKICAgICB2aWV3LnNjZW5lKCktPnNldFBhcmVudCgm dmlldyk7CiAgICAgdmlldy5zY2VuZSgpLT5hZGRJdGVtKHdlYlZpZXcpOwogICAgIHdlYlZpZXct PnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OlRpbGVkQmFja2luZ1N0b3Jl RW5hYmxlZCwgdHJ1ZSk7Ci0gICAgUVVybCB1cmwoInFyYzovLy9yZXNvdXJjZXMvNTY5MjkuaHRt bCIpOworICAgIFFVcmwgdXJsKCJxcmM6Ly8vcmVzb3VyY2VzL3Jlc2l6YWJsZWdyZWVuZGl2Lmh0 bWwiKTsKICAgICB3ZWJWaWV3LT5sb2FkKHVybCk7CiAgICAgUVZFUklGWSh3YWl0Rm9yU2lnbmFs KHdlYlZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKSk7CiAgICAgUVN0eWxlT3B0aW9u R3JhcGhpY3NJdGVtIG9wdGlvbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBo aWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5xcmMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LnFy YwkocmV2aXNpb24gODc2NjApCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dl YnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcucXJjCSh3b3JraW5nIGNvcHkpCkBAIC0zLDYgKzMs NiBAQAogICAgICAgICA8ZmlsZT5yZXNvdXJjZXMvaW5wdXRfdHlwZXMuaHRtbDwvZmlsZT4KICAg ICAgICAgPGZpbGU+cmVzb3VyY2VzL3BvaW50aW5nX3JpZ2h0Lmh0bWw8L2ZpbGU+CiAgICAgICAg IDxmaWxlPnJlc291cmNlcy9wb2ludGluZ191cC5odG1sPC9maWxlPgotICAgICAgICA8ZmlsZT5y ZXNvdXJjZXMvNTY5MjkuaHRtbDwvZmlsZT4KKyAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3Jlc2l6 YWJsZWdyZWVuZGl2Lmh0bWw8L2ZpbGU+CiAgICAgPC9xcmVzb3VyY2U+CiA8L1JDQz4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy9yZXNvdXJjZXMvNTY5Mjku aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZp ZXcvcmVzb3VyY2VzLzU2OTI5Lmh0bWwJKHJldmlzaW9uIDg3NjYwKQorKysgU291cmNlL1dlYktp dC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3Jlc291cmNlcy81NjkyOS5odG1sCSh3b3JraW5n IGNvcHkpCkBAIC0xLDggKzAsMCBAQAotPGJvZHkgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IHdo aXRlIj4KLSA8ZGl2IGlkPSIxIiBzdHlsZT0id2lkdGg6IDUwJTsgaGVpZ2h0OiA1MCU7IGJhY2tn cm91bmQtY29sb3I6IGdyZWVuIi8+Ci0gPHNjcmlwdD4KLSAgZnVuY3Rpb24gcmVzaXplRGl2KCkg ewotICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIjEiKS5zZXRBdHRyaWJ1dGUoInN0eWxl IiwgIndpZHRoOiAxNTAlOyBoZWlnaHQ6IDE1MCU7IGJhY2tncm91bmQtY29sb3I6IGdyZWVuIik7 Ci0gIH0KLSA8L3NjcmlwdD4KLTwvYm9keT4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cWdyYXBoaWNzd2Vidmlldy9yZXNvdXJjZXMvcmVzaXphYmxlZ3JlZW5kaXYuaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvcmVzb3VyY2Vz L3Jlc2l6YWJsZWdyZWVuZGl2Lmh0bWwJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvcmVzb3VyY2VzL3Jlc2l6YWJsZWdyZWVuZGl2Lmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsOCBAQAorPGJvZHkgc3R5bGU9ImJhY2tncm91bmQtY29s b3I6IHdoaXRlIj4KKyA8ZGl2IGlkPSIxIiBzdHlsZT0id2lkdGg6IDUwJTsgaGVpZ2h0OiA1MCU7 IGJhY2tncm91bmQtY29sb3I6IGdyZWVuIi8+CisgPHNjcmlwdD4KKyAgZnVuY3Rpb24gcmVzaXpl RGl2KCkgeworICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIjEiKS5zZXRBdHRyaWJ1dGUo InN0eWxlIiwgIndpZHRoOiAxNTAlOyBoZWlnaHQ6IDE1MCU7IGJhY2tncm91bmQtY29sb3I6IGdy ZWVuIik7CisgIH0KKyA8L3NjcmlwdD4KKzwvYm9keT4K 95536 2011-05-31 20:35:56 -0700 2011-10-19 23:15:30 -0700 Proposed Patch, per Jocelyn's suggestion. patchForW57798-4.patch text/plain 8694 carol SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NzcxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDUtMzEgIENhcm9sIFN6 YWJvICA8Y2Fyb2xAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDaGFuZ2VkIFRpbGVkQmFja2luZ1N0b3JlOjphZGp1c3RWaXNpYmxl UmVjdCB0byB0YWtlIGludG8gYWNjb3VudAorICAgICAgICBjb250ZW50c1NpemUsIHRoZSBzYW1l IHdheSBhcyBpdCBpcyBkb25lIHdoZW4gdGlsZXMgYXJlIGdlbmVyYXRlZC4KKworICAgICAgICBU aWxlZCBCYWNraW5nIFN0b3JlIGRvZXMgbm90IHJlZ2VuZXJhdGUgdGlsZXMgd2hlbiBpdCBzaG91 bGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Nzk4 CisKKyAgICAgICAgVGhpcyBpcyBhbiBpc3N1ZSB0aGF0IHJlcXVpcmVzIGEgY2VydGFpbiBzZXF1 ZW5jZSBvZiBBUEkgY2FsbHMgd2hpY2gKKyAgICAgICAgbWF5IG5vdCBiZSBlYXNpbHkgc2ltdWxh dGVkIGZyb20gRHVtcFJlbmRlclRyZWUsIGJ1dCB3aGljaCBpcyAKKyAgICAgICAgZWFzaWx5IHJl cHJvZHVjZWQgd2l0aCBRdFRlc3QuIFRoaXMgaXMgd2h5IEkgaGF2ZSBwcm92aWRlZCBvbmx5Cisg ICAgICAgIGEgUXQgc3BlY2lmaWMgdGVzdCBkZXNwaXRlIHRoaXMgYmVpbmcgYSBnZW5lcmljIHBy b2JsZW0uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZEJhY2tpbmdTdG9yZTo6YWRqdXN0VmlzaWJsZVJl Y3QpOgorICAgICAgICBDaGFuZ2VkIHRvIHRha2UgaW50byBhY2NvdW50IENvbnRlbnRzU2l6ZS4K KyAgICAgICAgKFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlOjp2aXNpYmxlQ29udGVudHNSZWN0 KToKKyAgICAgICAgQWRkZWQgdG8gcmV0dXJuIHRoZSBpbnRlcnNlY3Rpb24gb2YgdGhlIHZpZXdw b3J0J3MgdmlzaWJsZSByZWN0IHdpdGgKKyAgICAgICAgdGhlIENvbnRlbnRzUmVjdC4KKyAgICAg ICAgKFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlOjpjcmVhdGVUaWxlcyk6CisgICAgICAgIENo YW5nZWQgdG8gdGFrZSBpbnRvIGFjY291bnQgdGhlIENvbnRlbnRzU2l6ZSB3aGVuIGNhbGN1bGF0 aW5nIHRoZQorICAgICAgICBwcmV2aW91c2x5IHZpc2libGUgcmVjdC4KKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5oOgorCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuY3BwCShy ZXZpc2lvbiA4Nzc2NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVk QmFja2luZ1N0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU1LDcgKzE1NSw3IEBAIHZvaWQg VGlsZWRCYWNraW5nU3RvcmU6OnBhaW50KEdyYXBoaWNzQ28KIAogdm9pZCBUaWxlZEJhY2tpbmdT dG9yZTo6YWRqdXN0VmlzaWJsZVJlY3QoKQogewotICAgIEludFJlY3QgdmlzaWJsZVJlY3QgPSBt YXBGcm9tQ29udGVudHMobV9jbGllbnQtPnRpbGVkQmFja2luZ1N0b3JlVmlzaWJsZVJlY3QoKSk7 CisgICAgSW50UmVjdCB2aXNpYmxlUmVjdCA9IHZpc2libGVDb250ZW50c1JlY3QoKTsKICAgICBp ZiAobV9wcmV2aW91c1Zpc2libGVSZWN0ID09IHZpc2libGVSZWN0KQogICAgICAgICByZXR1cm47 CiAgICAgbV9wcmV2aW91c1Zpc2libGVSZWN0ID0gdmlzaWJsZVJlY3Q7CkBAIC0xNjMsNiArMTYz LDExIEBAIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OmFkanVzdFZpc2libGVSZWMKICAgICBzdGFy dFRpbGVDcmVhdGlvblRpbWVyKCk7CiB9CiAKK0ludFJlY3QgVGlsZWRCYWNraW5nU3RvcmU6OnZp c2libGVDb250ZW50c1JlY3QoKQoreworICAgIHJldHVybiBtYXBGcm9tQ29udGVudHMoaW50ZXJz ZWN0aW9uKG1fY2xpZW50LT50aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCksIG1fY2xpZW50 LT50aWxlZEJhY2tpbmdTdG9yZUNvbnRlbnRzUmVjdCgpKSk7Cit9CisKIHZvaWQgVGlsZWRCYWNr aW5nU3RvcmU6OnNldENvbnRlbnRzU2NhbGUoZmxvYXQgc2NhbGUpCiB7CiAgICAgaWYgKG1fcGVu ZGluZ1NjYWxlID09IG1fY29udGVudHNTY2FsZSkgewpAQCAtMjAxLDcgKzIwNiw3IEBAIHZvaWQg VGlsZWRCYWNraW5nU3RvcmU6OmNyZWF0ZVRpbGVzKCkKICAgICBpZiAobV9jb250ZW50c0Zyb3pl bikKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIEludFJlY3QgdmlzaWJsZVJlY3QgPSBtYXBG cm9tQ29udGVudHMobV9jbGllbnQtPnRpbGVkQmFja2luZ1N0b3JlVmlzaWJsZVJlY3QoKSk7Cisg ICAgSW50UmVjdCB2aXNpYmxlUmVjdCA9IHZpc2libGVDb250ZW50c1JlY3QoKTsKICAgICBtX3By ZXZpb3VzVmlzaWJsZVJlY3QgPSB2aXNpYmxlUmVjdDsKIAogICAgIGlmICh2aXNpYmxlUmVjdC5p c0VtcHR5KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJh Y2tpbmdTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL1RpbGVkQmFja2luZ1N0b3JlLmgJKHJldmlzaW9uIDg3NzY0KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuaAkod29ya2luZyBjb3B5KQpA QCAtOTgsNiArOTgsNyBAQCBwcml2YXRlOgogICAgIGRvdWJsZSB0aWxlRGlzdGFuY2UoY29uc3Qg SW50UmVjdCYgdmlld3BvcnQsIGNvbnN0IFRpbGU6OkNvb3JkaW5hdGUmKTsKICAgICAKICAgICB2 b2lkIHBhaW50Q2hlY2tlclBhdHRlcm4oR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYs IGNvbnN0IFRpbGU6OkNvb3JkaW5hdGUmKTsKKyAgICBJbnRSZWN0IHZpc2libGVDb250ZW50c1Jl Y3QoKTsKIAogcHJpdmF0ZToKICAgICBUaWxlZEJhY2tpbmdTdG9yZUNsaWVudCogbV9jbGllbnQ7 CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gODc3NzEpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDExLTA1LTMxICBD YXJvbCBTemFibyAgPGNhcm9sQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvdmlkZWQgdGVzdCBmb3IgdGhpcyBidWcuIENoYW5n ZWQgdGhlIG5hbWUgb2YgdGhlIHJlc291cmNlIEkgYWRkZWQKKyAgICAgICAgZm9yIGEgcHJldmlv dXMgdGVzdCBzbyB0aGF0IHRoZSBuYW1lIGlzIGRlc2NyaXB0aXZlIHN1Y2ggdGhhdCBpdCBjYW4K KyAgICAgICAgYmUgc2hhcmVkIGFjcm9zcyBzZXZlcmFsIHRlc3RzLgorICAgICAgICBUaWxlZCBC YWNraW5nIFN0b3JlIGRvZXMgbm90IHJlZ2VuZXJhdGUgdGlsZXMgd2hlbiBpdCBzaG91bGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Nzk4CisKKyAg ICAgICAgKiB0ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoK KyAgICAgICAgKHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpidWc1Nzc5OCk6CisgICAgICAgICh0c3Rf UUdyYXBoaWNzV2ViVmlldzo6YnVnNTY5MjkpOgorICAgICAgICAqIHRlc3RzL3FncmFwaGljc3dl YnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcucXJjOgorCiAyMDExLTA1LTMxICBSYWZhZWwgQnJh bmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QW5kcmVhcyBLbGluZy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vi dmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAkocmV2 aXNpb24gODc3NjQpCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcv dHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw3IEBA IHByaXZhdGUgc2xvdHM6CiAjZW5kaWYKICAgICB2b2lkIHJlbmRlckhpbnRzKCk7CiAjaWYgZGVm aW5lZChFTkFCTEVfVElMRURfQkFDS0lOR19TVE9SRSkgJiYgRU5BQkxFX1RJTEVEX0JBQ0tJTkdf U1RPUkUKKyAgICB2b2lkIGJ1ZzU3Nzk4KCk7CiAgICAgdm9pZCBidWc1NjkyOSgpOwogI2VuZGlm CiAjaWYgZGVmaW5lZChFTkFCTEVfV0VCR0wpICYmIEVOQUJMRV9XRUJHTApAQCAtMTk5LDYgKzIw MCwzNSBAQCB2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3Ojp3aWRnZXRzUmVuZGVyCiB9CiAKICNp ZiBkZWZpbmVkKEVOQUJMRV9USUxFRF9CQUNLSU5HX1NUT1JFKSAmJiBFTkFCTEVfVElMRURfQkFD S0lOR19TVE9SRQordm9pZCB0c3RfUUdyYXBoaWNzV2ViVmlldzo6YnVnNTc3OTgoKQoreworICAg IC8vIFdoZW4gY29udGVudCBzaXplIGdyb3dzIGZyb20gbGVzcyB0aGFuIHZpZXdwb3J0IHNpemUg dG8gbW9yZSB0aGFuIHRoYXQsIHRpbGVzIG1heSBuZWVkIHRvIGJlIHJlZ2VuZXJhdGVkLgorCisg ICAgUUdyYXBoaWNzV2ViVmlldyogd2ViVmlldyA9IG5ldyBRR3JhcGhpY3NXZWJWaWV3KCk7Cisg ICAgd2ViVmlldy0+c2V0R2VvbWV0cnkoUVJlY3RGKDAuMCwgMC4wLCAxMDAuMCwgMTAwLjApKTsK KyAgICBRR3JhcGhpY3NWaWV3IHZpZXcobmV3IFFHcmFwaGljc1NjZW5lKCkpOworICAgIHZpZXcu c2NlbmUoKS0+c2V0UGFyZW50KCZ2aWV3KTsKKyAgICB2aWV3LnNjZW5lKCktPmFkZEl0ZW0od2Vi Vmlldyk7CisgICAgd2ViVmlldy0+c2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5n czo6VGlsZWRCYWNraW5nU3RvcmVFbmFibGVkLCB0cnVlKTsKKyAgICBRU3R5bGVPcHRpb25HcmFw aGljc0l0ZW0gb3B0aW9uOworICAgIG9wdGlvbi5leHBvc2VkUmVjdCA9IHZpZXcuc2NlbmVSZWN0 KCk7CisgICAgUUltYWdlIGltZyh2aWV3LndpZHRoKCksIHZpZXcuaGVpZ2h0KCksCisgICAgUUlt YWdlOjpGb3JtYXRfQVJHQjMyX1ByZW11bHRpcGxpZWQpOworICAgIFFQYWludGVyIHBhaW50ZXIo JmltZyk7CisgICAgLy8gVGhpcyB3aWxsIG5vdCBwYWludCBhbnl0aGluZyBhcyB0aGUgdGlsZXMg YXJlIG5vdCByZWFkeSwgYnV0IHdpbGwgdHJpZ2dlciB0aWxlIGNyZWF0aW9uIHdpdGggc2l6ZSAo MCwgMCkuCisgICAgd2ViVmlldy0+cGFpbnQoJnBhaW50ZXIsICZvcHRpb24pOworICAgIFFBcHBs aWNhdGlvbjo6cHJvY2Vzc0V2ZW50cygpOworICAgIFFVcmwgdXJsKCJxcmM6Ly8vcmVzb3VyY2Vz L2dyZWVuZGl2Lmh0bWwiKTsKKyAgICB3ZWJWaWV3LT5sb2FkKHVybCk7CisgICAgUVZFUklGWSh3 YWl0Rm9yU2lnbmFsKHdlYlZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKSk7CisgICAg Ly8gVGhpcyBzaG91bGQgdHJpZ2dlciB0aGUgcmVjcmVhdGlvbiBvZiB0aGUgdGlsZXMuCisgICAg d2ViVmlldy0+cGFpbnQoJnBhaW50ZXIsICZvcHRpb24pOworICAgIFFBcHBsaWNhdGlvbjo6cHJv Y2Vzc0V2ZW50cygpOworICAgIHBhaW50ZXIuZmlsbFJlY3Qob3B0aW9uLmV4cG9zZWRSZWN0LCBR dDo6cmVkKTsgLy8gVGhpcyBpcyBoZXJlIHRvIGVuc3VyZSBmYWlsdXJlIGlmIHBhaW50IGRvZXMg bm90IHBhaW50IGFueXRoaW5nCisgICAgd2ViVmlldy0+cGFpbnQoJnBhaW50ZXIsICZvcHRpb24p OworICAgIFFDT01QQVJFKGltZy5waXhlbChvcHRpb24uZXhwb3NlZFJlY3Qud2lkdGgoKSAvIDQs IG9wdGlvbi5leHBvc2VkUmVjdC5oZWlnaHQoKSAvIDQpLCBxUmdiYSgwLCAxMjgsIDAsIDI1NSkp OworfQorCiB2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpidWc1NjkyOSgpCiB7CiAgICAgLy8g V2hlbiByZW5kZXJpbmcgZnJvbSB0aWxlcyBzeWNocm9ub3VzIGxheW91dCBzaG91bGQgbm90IGJl IHRyaWdnZXJlZApAQCAtMjEwLDcgKzI0MCw3IEBAIHZvaWQgdHN0X1FHcmFwaGljc1dlYlZpZXc6 OmJ1ZzU2OTI5KCkKICAgICB2aWV3LnNjZW5lKCktPnNldFBhcmVudCgmdmlldyk7CiAgICAgdmll dy5zY2VuZSgpLT5hZGRJdGVtKHdlYlZpZXcpOwogICAgIHdlYlZpZXctPnNldHRpbmdzKCktPnNl dEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OlRpbGVkQmFja2luZ1N0b3JlRW5hYmxlZCwgdHJ1ZSk7 Ci0gICAgUVVybCB1cmwoInFyYzovLy9yZXNvdXJjZXMvNTY5MjkuaHRtbCIpOworICAgIFFVcmwg dXJsKCJxcmM6Ly8vcmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWwiKTsKICAgICB3ZWJWaWV3LT5sb2Fk KHVybCk7CiAgICAgUVZFUklGWSh3YWl0Rm9yU2lnbmFsKHdlYlZpZXcsIFNJR05BTChsb2FkRmlu aXNoZWQoYm9vbCkpKSk7CiAgICAgUVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtIG9wdGlvbjsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBoaWNz d2Vidmlldy5xcmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhp Y3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LnFyYwkocmV2aXNpb24gODc3NjQpCisrKyBT b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZp ZXcucXJjCSh3b3JraW5nIGNvcHkpCkBAIC0zLDYgKzMsNiBAQAogICAgICAgICA8ZmlsZT5yZXNv dXJjZXMvaW5wdXRfdHlwZXMuaHRtbDwvZmlsZT4KICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3Bv aW50aW5nX3JpZ2h0Lmh0bWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy9wb2ludGlu Z191cC5odG1sPC9maWxlPgotICAgICAgICA8ZmlsZT5yZXNvdXJjZXMvNTY5MjkuaHRtbDwvZmls ZT4KKyAgICAgICAgPGZpbGU+cmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWw8L2ZpbGU+CiAgICAgPC9x cmVzb3VyY2U+CiA8L1JDQz4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNz d2Vidmlldy9yZXNvdXJjZXMvNTY5MjkuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvcmVzb3VyY2VzLzU2OTI5Lmh0bWwJKHJldmlzaW9u IDg3NzY0KQorKysgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3Jlc291 cmNlcy81NjkyOS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xLDggKzAsMCBAQAotPGJvZHkgc3R5 bGU9ImJhY2tncm91bmQtY29sb3I6IHdoaXRlIj4KLSA8ZGl2IGlkPSIxIiBzdHlsZT0id2lkdGg6 IDUwJTsgaGVpZ2h0OiA1MCU7IGJhY2tncm91bmQtY29sb3I6IGdyZWVuIi8+Ci0gPHNjcmlwdD4K LSAgZnVuY3Rpb24gcmVzaXplRGl2KCkgewotICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo IjEiKS5zZXRBdHRyaWJ1dGUoInN0eWxlIiwgIndpZHRoOiAxNTAlOyBoZWlnaHQ6IDE1MCU7IGJh Y2tncm91bmQtY29sb3I6IGdyZWVuIik7Ci0gIH0KLSA8L3NjcmlwdD4KLTwvYm9keT4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy9yZXNvdXJjZXMvZ3JlZW5k aXYuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dl YnZpZXcvcmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWwJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2Vi S2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvcmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsOCBAQAorPGJvZHkgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6 IHdoaXRlIj4KKyA8ZGl2IGlkPSIxIiBzdHlsZT0id2lkdGg6IDUwJTsgaGVpZ2h0OiA1MCU7IGJh Y2tncm91bmQtY29sb3I6IGdyZWVuIi8+CisgPHNjcmlwdD4KKyAgZnVuY3Rpb24gcmVzaXplRGl2 KCkgeworICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIjEiKS5zZXRBdHRyaWJ1dGUoInN0 eWxlIiwgIndpZHRoOiAxNTAlOyBoZWlnaHQ6IDE1MCU7IGJhY2tncm91bmQtY29sb3I6IGdyZWVu Iik7CisgIH0KKyA8L3NjcmlwdD4KKzwvYm9keT4K 111727 2011-10-19 23:15:30 -0700 2011-10-20 00:21:57 -0700 Merged reviewed patch with latest code patchForW57798-5.patch text/plain 8788 carol SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3OTEyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMTAtMTkgIENhcm9sIFN6 YWJvICA8Y2Fyb2xAd2Via2l0Lm9yZz4KKworICAgICAgICBUaWxlZCBCYWNraW5nIFN0b3JlIGRv ZXMgbm90IHJlZ2VuZXJhdGUgdGlsZXMgd2hlbiBpdCBzaG91bGQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Nzk4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQ2hhbmdlZCBUaWxlZEJhY2tpbmdTdG9yZTo6YWRq dXN0VmlzaWJsZVJlY3QgdG8gdGFrZSBpbnRvIGFjY291bnQKKyAgICAgICAgY29udGVudHNTaXpl LCB0aGUgc2FtZSB3YXkgYXMgaXQgaXMgZG9uZSB3aGVuIHRpbGVzIGFyZSBnZW5lcmF0ZWQuCisK KyAgICAgICAgVGhpcyBpcyBhbiBpc3N1ZSB0aGF0IHJlcXVpcmVzIGEgY2VydGFpbiBzZXF1ZW5j ZSBvZiBBUEkgY2FsbHMgd2hpY2gKKyAgICAgICAgbWF5IG5vdCBiZSBlYXNpbHkgc2ltdWxhdGVk IGZyb20gRHVtcFJlbmRlclRyZWUsIGJ1dCB3aGljaCBpcyAKKyAgICAgICAgZWFzaWx5IHJlcHJv ZHVjZWQgd2l0aCBRdFRlc3QuIFRoaXMgaXMgd2h5IEkgaGF2ZSBwcm92aWRlZCBvbmx5CisgICAg ICAgIGEgUXQgc3BlY2lmaWMgdGVzdCBkZXNwaXRlIHRoaXMgYmVpbmcgYSBnZW5lcmljIHByb2Js ZW0uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpUaWxlZEJhY2tpbmdTdG9yZTo6YWRqdXN0VmlzaWJsZVJlY3Qp OgorICAgICAgICBDaGFuZ2VkIHRvIHRha2UgaW50byBhY2NvdW50IENvbnRlbnRzU2l6ZS4KKyAg ICAgICAgKFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlOjp2aXNpYmxlQ29udGVudHNSZWN0KToK KyAgICAgICAgQWRkZWQgdG8gcmV0dXJuIHRoZSBpbnRlcnNlY3Rpb24gb2YgdGhlIHZpZXdwb3J0 J3MgdmlzaWJsZSByZWN0IHdpdGgKKyAgICAgICAgdGhlIENvbnRlbnRzUmVjdC4KKyAgICAgICAg KFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlOjpjcmVhdGVUaWxlcyk6CisgICAgICAgIENoYW5n ZWQgdG8gdGFrZSBpbnRvIGFjY291bnQgdGhlIENvbnRlbnRzU2l6ZSB3aGVuIGNhbGN1bGF0aW5n IHRoZQorICAgICAgICBwcmV2aW91c2x5IHZpc2libGUgcmVjdC4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5oOgorCiAyMDExLTEwLTE5ICBSYXltb25kIFRv eSAgPHJ0b3lAZ29vZ2xlLmNvbT4KIAogICAgICAgICBGbHVzaCBkZW5vcm1hbHMgdG8gemVybyBv biBXaW5kb3dzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRC YWNraW5nU3RvcmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmNwcAkocmV2aXNpb24gOTc5MTIpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE3Myw3ICsxNzMsNyBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpwYWludChH cmFwaGljc0NvCiAKIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OmFkanVzdFZpc2libGVSZWN0KCkK IHsKLSAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gbWFwRnJvbUNvbnRlbnRzKG1fY2xpZW50LT50 aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCkpOworICAgIEludFJlY3QgdmlzaWJsZVJlY3Qg PSB2aXNpYmxlQ29udGVudHNSZWN0KCk7CiAgICAgaWYgKG1fcHJldmlvdXNWaXNpYmxlUmVjdCA9 PSB2aXNpYmxlUmVjdCkKICAgICAgICAgcmV0dXJuOwogICAgIG1fcHJldmlvdXNWaXNpYmxlUmVj dCA9IHZpc2libGVSZWN0OwpAQCAtMTgxLDYgKzE4MSwxMSBAQCB2b2lkIFRpbGVkQmFja2luZ1N0 b3JlOjphZGp1c3RWaXNpYmxlUmVjCiAgICAgc3RhcnRUaWxlQ3JlYXRpb25UaW1lcigpOwogfQog CitJbnRSZWN0IFRpbGVkQmFja2luZ1N0b3JlOjp2aXNpYmxlQ29udGVudHNSZWN0KCkKK3sKKyAg ICByZXR1cm4gbWFwRnJvbUNvbnRlbnRzKGludGVyc2VjdGlvbihtX2NsaWVudC0+dGlsZWRCYWNr aW5nU3RvcmVWaXNpYmxlUmVjdCgpLCBtX2NsaWVudC0+dGlsZWRCYWNraW5nU3RvcmVDb250ZW50 c1JlY3QoKSkpOworfQorCiB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpzZXRDb250ZW50c1NjYWxl KGZsb2F0IHNjYWxlKQogewogICAgIGlmIChtX3BlbmRpbmdTY2FsZSA9PSBtX2NvbnRlbnRzU2Nh bGUpIHsKQEAgLTI0Miw3ICsyNDcsNyBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpjcmVhdGVU aWxlcygpCiAgICAgaWYgKG1fY29udGVudHNGcm96ZW4pCiAgICAgICAgIHJldHVybjsKICAgICAK LSAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gbWFwRnJvbUNvbnRlbnRzKG1fY2xpZW50LT50aWxl ZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCkpOworICAgIEludFJlY3QgdmlzaWJsZVJlY3QgPSB2 aXNpYmxlQ29udGVudHNSZWN0KCk7CiAgICAgbV9wcmV2aW91c1Zpc2libGVSZWN0ID0gdmlzaWJs ZVJlY3Q7CiAKICAgICBpZiAodmlzaWJsZVJlY3QuaXNFbXB0eSgpKQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5oCShy ZXZpc2lvbiA5NzkxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVk QmFja2luZ1N0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw2ICsxMDUsNyBAQCBwcml2YXRl OgogICAgIEludFJlY3QgY29udGVudHNSZWN0KCkgY29uc3Q7CiAgICAgCiAgICAgdm9pZCBwYWlu dENoZWNrZXJQYXR0ZXJuKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmLCBjb25zdCBU aWxlOjpDb29yZGluYXRlJik7CisgICAgSW50UmVjdCB2aXNpYmxlQ29udGVudHNSZWN0KCk7CiAK IHByaXZhdGU6CiAgICAgVGlsZWRCYWNraW5nU3RvcmVDbGllbnQqIG1fY2xpZW50OwpJbmRleDog U291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3OTEyKQorKysgU291cmNlL1dlYktpdC9xdC9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0xMC0xOSAgQ2Fyb2wgU3ph Ym8gIDxjYXJvbEB3ZWJraXQub3JnPgorCisgICAgICAgIFRpbGVkIEJhY2tpbmcgU3RvcmUgZG9l cyBub3QgcmVnZW5lcmF0ZSB0aWxlcyB3aGVuIGl0IHNob3VsZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc3OTgKKworICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KKworICAgICAgICBQcm92aWRlZCB0ZXN0IGZvciB0aGlzIGJ1Zy4gQ2hh bmdlZCB0aGUgbmFtZSBvZiB0aGUgcmVzb3VyY2UgSSBhZGRlZAorICAgICAgICBmb3IgYSBwcmV2 aW91cyB0ZXN0IHNvIHRoYXQgdGhlIG5hbWUgaXMgZGVzY3JpcHRpdmUgc3VjaCB0aGF0IGl0IGNh bgorICAgICAgICBiZSBzaGFyZWQgYWNyb3NzIHNldmVyYWwgdGVzdHMuCisKKyAgICAgICAgKiB0 ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAg KHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpidWc1Nzc5OCk6CisgICAgICAgICh0c3RfUUdyYXBoaWNz V2ViVmlldzo6YnVnNTY5MjkpOgorICAgICAgICAqIHRlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0 X3FncmFwaGljc3dlYnZpZXcucXJjOgorCiAyMDExLTEwLTE4ICBUb3IgQXJuZSBWZXN0YsO4ICA8 dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIE1lcmdlIFFNTCBwbHVn aW4gZm9yIFdlYktpdDIgd2l0aCB0aGUgb3JpZ2luYWwgV2ViS2l0MSBwbHVnaW4KSW5kZXg6IFNv dXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmll dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2 aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAkocmV2aXNpb24gOTc5MTIpCisrKyBTb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0OSw3IEBAIHByaXZhdGUgc2xvdHM6CiAjZW5kaWYK ICAgICB2b2lkIHJlbmRlckhpbnRzKCk7CiAjaWYgZGVmaW5lZChXVEZfVVNFX1RJTEVEX0JBQ0tJ TkdfU1RPUkUpICYmIFdURl9VU0VfVElMRURfQkFDS0lOR19TVE9SRQorICAgIHZvaWQgYnVnNTc3 OTgoKTsKICAgICB2b2lkIGJ1ZzU2OTI5KCk7CiAjZW5kaWYKICNpZiBkZWZpbmVkKEVOQUJMRV9X RUJHTCkgJiYgRU5BQkxFX1dFQkdMCkBAIC0yMDEsNiArMjAyLDM1IEBAIHZvaWQgdHN0X1FHcmFw aGljc1dlYlZpZXc6OndpZGdldHNSZW5kZXIKIH0KIAogI2lmIGRlZmluZWQoV1RGX1VTRV9USUxF RF9CQUNLSU5HX1NUT1JFKSAmJiBXVEZfVVNFX1RJTEVEX0JBQ0tJTkdfU1RPUkUKK3ZvaWQgdHN0 X1FHcmFwaGljc1dlYlZpZXc6OmJ1ZzU3Nzk4KCkKK3sKKyAgICAvLyBXaGVuIGNvbnRlbnQgc2l6 ZSBncm93cyBmcm9tIGxlc3MgdGhhbiB2aWV3cG9ydCBzaXplIHRvIG1vcmUgdGhhbiB0aGF0LCB0 aWxlcyBtYXkgbmVlZCB0byBiZSByZWdlbmVyYXRlZC4KKworICAgIFFHcmFwaGljc1dlYlZpZXcq IHdlYlZpZXcgPSBuZXcgUUdyYXBoaWNzV2ViVmlldygpOworICAgIHdlYlZpZXctPnNldEdlb21l dHJ5KFFSZWN0RigwLjAsIDAuMCwgMTAwLjAsIDEwMC4wKSk7CisgICAgUUdyYXBoaWNzVmlldyB2 aWV3KG5ldyBRR3JhcGhpY3NTY2VuZSgpKTsKKyAgICB2aWV3LnNjZW5lKCktPnNldFBhcmVudCgm dmlldyk7CisgICAgdmlldy5zY2VuZSgpLT5hZGRJdGVtKHdlYlZpZXcpOworICAgIHdlYlZpZXct PnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OlRpbGVkQmFja2luZ1N0b3Jl RW5hYmxlZCwgdHJ1ZSk7CisgICAgUVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtIG9wdGlvbjsKKyAg ICBvcHRpb24uZXhwb3NlZFJlY3QgPSB2aWV3LnNjZW5lUmVjdCgpOworICAgIFFJbWFnZSBpbWco dmlldy53aWR0aCgpLCB2aWV3LmhlaWdodCgpLAorICAgIFFJbWFnZTo6Rm9ybWF0X0FSR0IzMl9Q cmVtdWx0aXBsaWVkKTsKKyAgICBRUGFpbnRlciBwYWludGVyKCZpbWcpOworICAgIC8vIFRoaXMg d2lsbCBub3QgcGFpbnQgYW55dGhpbmcgYXMgdGhlIHRpbGVzIGFyZSBub3QgcmVhZHksIGJ1dCB3 aWxsIHRyaWdnZXIgdGlsZSBjcmVhdGlvbiB3aXRoIHNpemUgKDAsIDApLgorICAgIHdlYlZpZXct PnBhaW50KCZwYWludGVyLCAmb3B0aW9uKTsKKyAgICBRQXBwbGljYXRpb246OnByb2Nlc3NFdmVu dHMoKTsKKyAgICBRVXJsIHVybCgicXJjOi8vL3Jlc291cmNlcy9ncmVlbmRpdi5odG1sIik7Cisg ICAgd2ViVmlldy0+bG9hZCh1cmwpOworICAgIFFWRVJJRlkod2FpdEZvclNpZ25hbCh3ZWJWaWV3 LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkpOworICAgIC8vIFRoaXMgc2hvdWxkIHRyaWdn ZXIgdGhlIHJlY3JlYXRpb24gb2YgdGhlIHRpbGVzLgorICAgIHdlYlZpZXctPnBhaW50KCZwYWlu dGVyLCAmb3B0aW9uKTsKKyAgICBRQXBwbGljYXRpb246OnByb2Nlc3NFdmVudHMoKTsKKyAgICBw YWludGVyLmZpbGxSZWN0KG9wdGlvbi5leHBvc2VkUmVjdCwgUXQ6OnJlZCk7IC8vIFRoaXMgaXMg aGVyZSB0byBlbnN1cmUgZmFpbHVyZSBpZiBwYWludCBkb2VzIG5vdCBwYWludCBhbnl0aGluZwor ICAgIHdlYlZpZXctPnBhaW50KCZwYWludGVyLCAmb3B0aW9uKTsKKyAgICBRQ09NUEFSRShpbWcu cGl4ZWwob3B0aW9uLmV4cG9zZWRSZWN0LndpZHRoKCkgLyA0LCBvcHRpb24uZXhwb3NlZFJlY3Qu aGVpZ2h0KCkgLyA0KSwgcVJnYmEoMCwgMTI4LCAwLCAyNTUpKTsKK30KKwogdm9pZCB0c3RfUUdy YXBoaWNzV2ViVmlldzo6YnVnNTY5MjkoKQogewogICAgIC8vIFdoZW4gcmVuZGVyaW5nIGZyb20g dGlsZXMgc3ljaHJvbm91cyBsYXlvdXQgc2hvdWxkIG5vdCBiZSB0cmlnZ2VyZWQKQEAgLTIxMiw3 ICsyNDIsNyBAQCB2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpidWc1NjkyOSgpCiAgICAgdmll dy5zY2VuZSgpLT5zZXRQYXJlbnQoJnZpZXcpOwogICAgIHZpZXcuc2NlbmUoKS0+YWRkSXRlbSh3 ZWJWaWV3KTsKICAgICB3ZWJWaWV3LT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRp bmdzOjpUaWxlZEJhY2tpbmdTdG9yZUVuYWJsZWQsIHRydWUpOwotICAgIFFVcmwgdXJsKCJxcmM6 Ly8vcmVzb3VyY2VzLzU2OTI5Lmh0bWwiKTsKKyAgICBRVXJsIHVybCgicXJjOi8vL3Jlc291cmNl cy9ncmVlbmRpdi5odG1sIik7CiAgICAgd2ViVmlldy0+bG9hZCh1cmwpOwogICAgIFFWRVJJRlko d2FpdEZvclNpZ25hbCh3ZWJWaWV3LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkpOwogICAg IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbSBvcHRpb247CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcucXJjCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBo aWNzd2Vidmlldy5xcmMJKHJldmlzaW9uIDk3OTEyKQorKysgU291cmNlL1dlYktpdC9xdC90ZXN0 cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LnFyYwkod29ya2luZyBjb3B5 KQpAQCAtMyw2ICszLDYgQEAKICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL2lucHV0X3R5cGVzLmh0 bWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy9wb2ludGluZ19yaWdodC5odG1sPC9m aWxlPgogICAgICAgICA8ZmlsZT5yZXNvdXJjZXMvcG9pbnRpbmdfdXAuaHRtbDwvZmlsZT4KLSAg ICAgICAgPGZpbGU+cmVzb3VyY2VzLzU2OTI5Lmh0bWw8L2ZpbGU+CisgICAgICAgIDxmaWxlPnJl c291cmNlcy9ncmVlbmRpdi5odG1sPC9maWxlPgogICAgIDwvcXJlc291cmNlPgogPC9SQ0M+Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvcmVzb3VyY2VzLzU2 OTI5Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3 ZWJ2aWV3L3Jlc291cmNlcy81NjkyOS5odG1sCShyZXZpc2lvbiA5NzkxMikKKysrIFNvdXJjZS9X ZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy9yZXNvdXJjZXMvNTY5MjkuaHRtbAkod29y a2luZyBjb3B5KQpAQCAtMSw4ICswLDAgQEAKLTxib2R5IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9y OiB3aGl0ZSI+Ci0gPGRpdiBpZD0iMSIgc3R5bGU9IndpZHRoOiA1MCU7IGhlaWdodDogNTAlOyBi YWNrZ3JvdW5kLWNvbG9yOiBncmVlbiIvPgotIDxzY3JpcHQ+Ci0gIGZ1bmN0aW9uIHJlc2l6ZURp digpIHsKLSAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCIxIikuc2V0QXR0cmlidXRlKCJz dHlsZSIsICJ3aWR0aDogMTUwJTsgaGVpZ2h0OiAxNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVl biIpOwotICB9Ci0gPC9zY3JpcHQ+Ci08L2JvZHk+CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L3Rl c3RzL3FncmFwaGljc3dlYnZpZXcvcmVzb3VyY2VzL2dyZWVuZGl2Lmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3Jlc291cmNlcy9ncmVl bmRpdi5odG1sCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhp Y3N3ZWJ2aWV3L3Jlc291cmNlcy9ncmVlbmRpdi5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsx LDggQEAKKzxib2R5IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZSI+CisgPGRpdiBpZD0i MSIgc3R5bGU9IndpZHRoOiA1MCU7IGhlaWdodDogNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVl biIvPgorIDxzY3JpcHQ+CisgIGZ1bmN0aW9uIHJlc2l6ZURpdigpIHsKKyAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCIxIikuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJ3aWR0aDogMTUwJTsg aGVpZ2h0OiAxNTAlOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbiIpOworICB9CisgPC9zY3JpcHQ+ Cis8L2JvZHk+Cg==