94123 2012-08-15 10:43:13 -0700 [BlackBerry] Reload valid page from Error Page keeps history ViewState and zoom. 2012-08-16 12:56:11 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kpiascik kpiascik jkjiang mifenton tonikitoo webkit.review.bot oldest_to_newest 696122 0 kpiascik 2012-08-15 10:43:13 -0700 [BlackBerry] Reload valid page from Error Page keeps history ViewState and zoom. 696245 1 158613 kpiascik 2012-08-15 12:10:10 -0700 Created attachment 158613 Patch 696250 2 158613 rwlbuis 2012-08-15 12:15:08 -0700 Comment on attachment 158613 Patch Looks good. 696272 3 158617 kpiascik 2012-08-15 12:36:19 -0700 Created attachment 158617 Patch 696293 4 158617 tonikitoo 2012-08-15 12:55:37 -0700 Comment on attachment 158617 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158617&action=review It looks ok. I have some questions. Also , patch does not seem to apply against ToT > Source/WebKit/blackberry/Api/WebPage.cpp:-1101 > - m_userScalable = m_webSettings->isUserScalable(); > - resetScales(); could you explain this part in the changelog? > Source/WebKit/blackberry/Api/WebPage.cpp:1781 > + if (m_mainFrame && m_mainFrame->loader() && m_mainFrame->loader()->shouldRestoreScrollPositionAndViewState() > + && m_mainFrame->loader()->client() && m_mainFrame->loader()->client()->shouldRestoreViewState()) I think you have extra 4-spaces on the bottom line. > Source/WebKit/blackberry/Api/WebPage.cpp:1905 > + // This checks to make sure we're not calling updateViewportSize > + // during WebPagePrivate::init(). > + if (m_backingStore) > + updateViewportSize(); I would have done this chunk on it own patch. > Source/WebKit/blackberry/Api/WebPage.cpp:3593 > + m_userScalable = m_webSettings->isUserScalable(); > + resetScales(); could you explain this part in the changelog? 696299 5 158617 kpiascik 2012-08-15 13:02:32 -0700 Comment on attachment 158617 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158617&action=review >> Source/WebKit/blackberry/Api/WebPage.cpp:-1101 >> - resetScales(); > > could you explain this part in the changelog? This is explained in the ChangeLog. "Have the minimum, maximum and initial scale reset whenever the viewport properties are changed. We also reset user scalable at this time. We need to do this in the case of the error page since it's scales and user scalable would persist if you refresh and get a valid page." >> Source/WebKit/blackberry/Api/WebPage.cpp:1905 >> + updateViewportSize(); > > I would have done this chunk on it own patch. This was never an issue until I moved the call site of resetScales() >> Source/WebKit/blackberry/Api/WebPage.cpp:3593 >> + resetScales(); > > could you explain this part in the changelog? This is explained in the ChangeLog. see above 697228 6 158843 kpiascik 2012-08-16 09:47:01 -0700 Created attachment 158843 Patch 697295 7 158843 tonikitoo 2012-08-16 11:19:45 -0700 Comment on attachment 158843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158843&action=review > Source/WebKit/blackberry/ChangeLog:13 > + the user scalalbe flag if we're reloading from an error page. scalable* > Source/WebKit/blackberry/ChangeLog:24 > + new memeber variable m_shouldRestoreViewState based on the ViewState's member > Source/WebKit/blackberry/Api/WebPage.cpp:1908 > - updateViewportSize(); > + // This checks to make sure we're not calling updateViewportSize > + // during WebPagePrivate::init(). > + if (m_backingStore) > + updateViewportSize(); lets move this check to within ::updateViewportSize? 697336 8 158869 kpiascik 2012-08-16 11:56:49 -0700 Created attachment 158869 Patch Fixed requested changes 697391 9 158869 webkit.review.bot 2012-08-16 12:56:08 -0700 Comment on attachment 158869 Patch Clearing flags on attachment: 158869 Committed r125803: <http://trac.webkit.org/changeset/125803> 697393 10 webkit.review.bot 2012-08-16 12:56:11 -0700 All reviewed patches have been landed. Closing bug. 158613 2012-08-15 12:10:10 -0700 2012-08-15 12:36:17 -0700 Patch bug-94123-20120815150953.patch text/plain 9147 kpiascik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTgxNWE1ODI5N2ZiMDNl NWQ3M2UyN2UwNmI3OTU4MWM1NGNkMDA0OC4uZDU0YzVjNjYyMTc2NzE0OWVjYmQ2M2UxMmVkOTA3 NDkwZTgxMTA2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTE1ICBLb25y YWQgUGlhc2NpayAgPGtwaWFzY2lrQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJl bG9hZCB2YWxpZCBwYWdlIGZyb20gRXJyb3IgUGFnZSBrZWVwcyBoaXN0b3J5IFZpZXdTdGF0ZSBh bmQgem9vbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk0MTIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmV2aWV3ZWQgaW50ZXJuYWxseSBieSBMZW8gWWFuZy4KKyAgICAgICAgUFIgMTc4MzA1CisKKyAg ICAgICAgQWRkIGEgbWV0aG9kIHRvIGNoZWNrIHdoZXRoZXIgd2Ugc2hvdWxkIHJlc3RvcmUgdGhl IHZpZXcgc3RhdGUgdG8gdGhlCisgICAgICAgIEZyYW1lTG9hZGVyQ2xpZW50LiAgVGhpcyBpcyBu ZWNlc3NhcnkgYmVjYXVzZSB3ZSBkb24ndCBoYXZlIHdheSB0bworICAgICAgICBkZXRlcm1pbmUg aWYgdGhlIGxhc3QgcGFnZSBsb2FkZWQgd2FzIGFuIGVycm9yIHBhZ2Ugb3V0c2lkZSBvZiB0aGUK KyAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQuCisKKyAgICAgICAgTm90IHRlc3RhYmxlIHVzaW5n IGxheW91dCB0ZXN0cy4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnQ6OnNob3VsZFJlc3RvcmVWaWV3U3Rh dGUpOgorCiAyMDEyLTA4LTEzICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CiAKICAg ICAgICAgW0JsYWNrQmVycnldIEhhcmR3YXJlIGFjY2VsZXJhdGVkIHNjcm9sbGluZyBvZiA8c2Vs ZWN0PiBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCAyMTUwZmJlNzA3 NmU1NTExMzFiNTUyYjkxZTQzMWMzZThkYTYxNTc4Li44OGY0N2Y1MzAyMGU4MjY0YjZlYzdmODQ5 MTEwM2ViYzI4ZTc1MjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzOCBAQAorMjAxMi0wOC0xNSAgS29ucmFkIFBpYXNjaWsgIDxrcGlhc2Npa0ByaW0uY29tPgor CisgICAgICAgIFtCbGFja0JlcnJ5XSBSZWxvYWQgdmFsaWQgcGFnZSBmcm9tIEVycm9yIFBhZ2Ug a2VlcHMgaGlzdG9yeSBWaWV3U3RhdGUgYW5kIHpvb20uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDEyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldmlld2VkIGludGVybmFsbHkgYnkgTGVvIFlhbmcu CisgICAgICAgIFBSIDE3ODMwNQorCisgICAgICAgIFByZXZlbnQgdGhlIFZpZXdTdGF0ZSBmcm9t IGJlaW5nIHNhdmVkIGlmIHRoZSBsYXN0IHBhZ2UgbG9hZGVkIHdhcyBhbgorICAgICAgICBlcnJv ciBwYWdlLgorICAgICAgICBIYXZlIHRoZSBtaW5pbXVtLCBtYXhpbXVtIGFuZCBpbml0aWFsIHNj YWxlIHJlc2V0IHdoZW5ldmVyIHRoZQorICAgICAgICB2aWV3cG9ydCBwcm9wZXJ0aWVzIGFyZSBj aGFuZ2VkLiAgV2UgYWxzbyByZXNldCB1c2VyIHNjYWxhYmxlIGF0IHRoaXMKKyAgICAgICAgdGlt ZS4gIFdlIG5lZWQgdG8gZG8gdGhpcyBpbiB0aGUgY2FzZSBvZiB0aGUgZXJyb3IgcGFnZSBzaW5j ZSBpdCdzCisgICAgICAgIHNjYWxlcyBhbmQgdXNlciBzY2FsYWJsZSB3b3VsZCBwZXJzaXN0IGlm IHlvdSByZWZyZXNoIGFuZCBnZXQgYSB2YWxpZAorICAgICAgICBwYWdlLgorICAgICAgICBJbiB6 b29tVG9Jbml0aWFsU2NhbGVPbkxvYWQgd2UgbmVlZCB0byBjaGVjayBpZiB3ZSdyZSByZWxvYWRp bmcgZnJvbQorICAgICAgICBhbiBlcnJvciBwYWdlLiAgVGhpcyBpcyBkb25lIGJ5IGNhbGxpbmcg c2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSBvbiB0aGUKKyAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQu ICBUaGlzIHByb3Blcmx5IHNldHMgc2hvdWxkWm9vbSBhbmQgYWxsb3dzIHVzIHRvCisgICAgICAg IHpvb21Ub0ZpdCBpbnN0ZWFkIG9mIHN0YXlpbmcgYXQgaW5pdGlhbCBzY2FsZSAxLjAuCisKKyAg ICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Oldl YlBhZ2VQcml2YXRlOjpzZXRMb2FkU3RhdGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpXZWJQYWdlUHJpdmF0ZTo6em9vbVRvSW5pdGlhbFNjYWxlT25Mb2FkKToKKyAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OnJlc2V0U2NhbGVzKToKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmRpc3BhdGNoVmlld3BvcnRQcm9w ZXJ0aWVzRGlkQ2hhbmdlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRC bGFja0JlcnJ5OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzYXZlVmlld1N0YXRlVG9JdGVtKToKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6cmVzdG9yZVZpZXdTdGF0ZSk6 CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Lmg6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnNob3VsZFJl c3RvcmVWaWV3U3RhdGUpOgorICAgICAgICAoRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5KToK KwogMjAxMi0wOC0xMyAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAg IFtCbGFja0JlcnJ5XSBSb3VuZGluZyBlcnJvciBzb21ld2hlcmUgd2hlbiB0cmFuc2xhdGluZyBD b21wb3NpdGluZ0xheWVyICdzIGZvciBpbi1yZWdpb24gc2Nyb2xsaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDY3Mjg0OWRiZDAzZTdlNzc2ZjhiNjM0 NWQ1NmQwZjQ2YTViYTIxMGMuLjJkZjg3NjZhOGI3MGVmMmU4ZjI1YmRiMjhlOTZlOWYzZGMyZjgy OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCkBAIC0zNTcs NiArMzU3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIHZvaWQgbG9h ZEljb25FeHRlcm5hbGx5KGNvbnN0IFN0cmluZyYgb3JpZ2luYWxQYWdlVXJsLCBjb25zdCBTdHJp bmcmIGZpbmFsUGFnZVVybCwgY29uc3QgU3RyaW5nJiBpY29uVXJsKSB7IH0KIAogICAgICAgICB2 aXJ0dWFsIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2luRm9yTmV3RG9j dW1lbnQoY29uc3QgS1VSTCYpID0gMDsKKyAgICAgICAgdmlydHVhbCBib29sIHNob3VsZFJlc3Rv cmVWaWV3U3RhdGUoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAjZW5kaWYKICAgICB9OwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA1MWQ3MWI1ZDU5OGNh YWJkMWQwMTMyYjZlNTA2NTA4MzQwY2E2YmU0Li5mYjg4NDI2ODM1Y2VmMWQ4MjNiNWJhY2ZhNjNk M2U1ODFjYThiYmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAK QEAgLTEwOTcsOCArMTA5Nyw2IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZShM b2FkU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAgICAgZnJhbWVMb2FkVHlwZSA9IG1fbWFpbkZy YW1lLT5sb2FkZXIoKS0+bG9hZFR5cGUoKTsKICAgICAgICAgICAgIGlmICghKChtX2RpZFJlc3Rv cmVGcm9tUGFnZUNhY2hlICYmIGRvY3VtZW50SGFzVmlld3BvcnRBcmd1bWVudHMpIHx8IChmcmFt ZUxvYWRUeXBlID09IEZyYW1lTG9hZFR5cGVSZWxvYWQgfHwgZnJhbWVMb2FkVHlwZSA9PSBGcmFt ZUxvYWRUeXBlUmVsb2FkRnJvbU9yaWdpbikpKSB7CiAgICAgICAgICAgICAgICAgbV92aWV3cG9y dEFyZ3VtZW50cyA9IFZpZXdwb3J0QXJndW1lbnRzKCk7Ci0gICAgICAgICAgICAgICAgbV91c2Vy U2NhbGFibGUgPSBtX3dlYlNldHRpbmdzLT5pc1VzZXJTY2FsYWJsZSgpOwotICAgICAgICAgICAg ICAgIHJlc2V0U2NhbGVzKCk7CiAKICAgICAgICAgICAgICAgICAvLyBBdCB0aGUgbW9tZW50IHdl IGNvbW1pdCBhIG5ldyBsb2FkLCBzZXQgdGhlIHZpZXdwb3J0IGFyZ3VtZW50cwogICAgICAgICAg ICAgICAgIC8vIHRvIGFueSBmYWxsYmFjayB2YWx1ZXMuIElmIHRoZXJlIGlzIGEgbWV0YSB2aWV3 cG9ydCBpbiB0aGUKQEAgLTE3NzcsNyArMTc3NSwxMCBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjp6 b29tVG9Jbml0aWFsU2NhbGVPbkxvYWQoKQogCiAgICAgLy8gSWYgdGhpcyBsb2FkIHNob3VsZCBy ZXN0b3JlIHZpZXcgc3RhdGUsIGRvbid0IHpvb20gdG8gaW5pdGlhbCBzY2FsZQogICAgIC8vIGJ1 dCBpbnN0ZWFkIGxldCB0aGUgSGlzdG9yeUl0ZW0ncyBzYXZlZCB2aWV3cG9ydCByZWlnbiBzdXBy ZW1lLgotICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+bG9hZGVyKCkgJiYgbV9t YWluRnJhbWUtPmxvYWRlcigpLT5zaG91bGRSZXN0b3JlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3Rh dGUoKSkKKyAgICAvLyBGSVhNRSBsb29rIGludG8gaW5jb3Jwb3JhdGluZyBGcmFtZUxvYWRlckNs aWVudDo6c2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSBhcworICAgIC8vIGEgcGFydCBvZiBGcmFtZUxv YWRlcjo6c2hvdWxkUmVzdG9yZVNjcm9sbFBvc2l0aW9uQW5kVmlld1N0YXRlLgorICAgIGlmICht X21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+bG9hZGVyKCkgJiYgbV9tYWluRnJhbWUtPmxvYWRl cigpLT5zaG91bGRSZXN0b3JlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3RhdGUoKQorICAgICAgICAg ICAgJiYgbV9tYWluRnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSAmJiBtX21haW5GcmFtZS0+bG9h ZGVyKCktPmNsaWVudCgpLT5zaG91bGRSZXN0b3JlVmlld1N0YXRlKCkpCiAgICAgICAgIHNob3Vs ZFpvb20gPSBmYWxzZTsKIAogICAgIGlmIChzaG91bGRab29tICYmIHNob3VsZFpvb21Ub0luaXRp YWxTY2FsZU9uTG9hZCgpKSB7CkBAIC0xODk4LDcgKzE4OTksMTAgQEAgdm9pZCBXZWJQYWdlUHJp dmF0ZTo6cmVzZXRTY2FsZXMoKQogCiAgICAgLy8gV2UgaGF2ZSB0byBsZXQgV2ViQ29yZSBrbm93 IGFib3V0IHVwZGF0ZWQgZnJhbWVyZWN0IG5vdyB0aGF0IHdlJ3ZlCiAgICAgLy8gcmVzZXQgb3Vy IHNjYWxlcy4gU2VlOiBSSU0gQnVnICM0MDEuCi0gICAgdXBkYXRlVmlld3BvcnRTaXplKCk7Cisg ICAgLy8gVGhpcyBjaGVjayB0byBtYWtlIHN1cmUgd2UncmUgbm90IGNhbGxpbmcgdXBkYXRlVmll d3BvcnRTaXplCisgICAgLy8gZHVyaW5nIFdlYlBhZ2VQcml2YXRlOjppbml0KCkuCisgICAgaWYg KG1fYmFja2luZ1N0b3JlKQorICAgICAgICB1cGRhdGVWaWV3cG9ydFNpemUoKTsKIH0KIAogSW50 UG9pbnQgV2ViUGFnZVByaXZhdGU6OnRyYW5zZm9ybWVkU2Nyb2xsUG9zaXRpb24oKSBjb25zdApA QCAtMzU4NSw2ICszNTg5LDggQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6ZGlkUmVjZWl2ZVRvdWNo RXZlbnRNb2RlKFRvdWNoRXZlbnRNb2RlIG1vZGUpCiAKIHZvaWQgV2ViUGFnZVByaXZhdGU6OmRp c3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRz JiBhcmd1bWVudHMpCiB7CisgICAgbV91c2VyU2NhbGFibGUgPSBtX3dlYlNldHRpbmdzLT5pc1Vz ZXJTY2FsYWJsZSgpOworICAgIHJlc2V0U2NhbGVzKCk7CiAgICAgaWYgKGFyZ3VtZW50cyA9PSBt X3ZpZXdwb3J0QXJndW1lbnRzKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNr QmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggNzhiYTMzN2RlYTBlNGMxN2YxNWNlMjNi MGUxYzI0ZjQ5YTFhZWEyMy4uMTdiOWViMTU0MGEzY2EzYWVjMjI3ODUyYmJmMzMxZmVhNmMzZmIw MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTU0 MSw2ICs1NDEsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6ZGlzcGF0Y2hE aWRDb21taXRMb2FkKCkKICAgICAgICAgLy8gU3Vic3RpdHV0ZURhdGEgaW4gZGlzcGF0Y2hEaWRG YWlsUHJvdmlzaW9uYWxMb2FkKS4KICAgICAgICAgaWYgKG1fbG9hZGluZ0Vycm9yUGFnZSkgewog ICAgICAgICAgICAgbV9sb2FkaW5nRXJyb3JQYWdlID0gZmFsc2U7CisgICAgICAgICAgICBpZiAo SGlzdG9yeUl0ZW0qIGl0ZW0gPSBtX2ZyYW1lLT5sb2FkZXIoKS0+aGlzdG9yeSgpLT5jdXJyZW50 SXRlbSgpKQorICAgICAgICAgICAgICAgIGl0ZW0tPnZpZXdTdGF0ZSgpLnNob3VsZFNhdmVWaWV3 U3RhdGUgPSBmYWxzZTsKICAgICAgICAgICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fY2xpZW50LT5u b3RpZnlMb2FkRmFpbGVkQmVmb3JlQ29tbWl0KAogICAgICAgICAgICAgICAgIG9yaWdpbmFsVXJs LmNoYXJhY3RlcnMoKSwgb3JpZ2luYWxVcmwubGVuZ3RoKCksCiAgICAgICAgICAgICAgICAgICAg IHVybC5jaGFyYWN0ZXJzKCksIHVybC5sZW5ndGgoKSwgdG9rZW4uY2hhcmFjdGVycygpLCB0b2tl bi5sZW5ndGgoKSk7CkBAIC0xMDE2LDcgKzEwMTgsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeTo6c2F2ZVZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRlbSogaXRlbSkKIAogICAg IEFTU0VSVChpdGVtKTsKICAgICBIaXN0b3J5SXRlbVZpZXdTdGF0ZSYgdmlld1N0YXRlID0gaXRl bS0+dmlld1N0YXRlKCk7Ci0gICAgaWYgKHZpZXdTdGF0ZS5zaG91bGRTYXZlVmlld1N0YXRlKSB7 CisgICAgbV9zaG91bGRSZXN0b3JlVmlld1N0YXRlID0gdmlld1N0YXRlLnNob3VsZFNhdmVWaWV3 U3RhdGU7CisgICAgaWYgKG1fc2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSkgewogICAgICAgICB2aWV3 U3RhdGUub3JpZW50YXRpb24gPSBtX3dlYlBhZ2VQcml2YXRlLT5tYWluRnJhbWUoKS0+b3JpZW50 YXRpb24oKTsKICAgICAgICAgdmlld1N0YXRlLmlzWm9vbVRvRml0U2NhbGUgPSBtX3dlYlBhZ2VQ cml2YXRlLT5jdXJyZW50U2NhbGUoKSA9PSBtX3dlYlBhZ2VQcml2YXRlLT56b29tVG9GaXRTY2Fs ZSgpOwogICAgICAgICB2aWV3U3RhdGUuc2NhbGUgPSBtX3dlYlBhZ2VQcml2YXRlLT5jdXJyZW50 U2NhbGUoKTsKQEAgLTEwMjksNiArMTAzMiw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5OjpzYXZlVmlld1N0YXRlVG9JdGVtKEhpc3RvcnlJdGVtKiBpdGVtKQogCiB2b2lkIEZy YW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6cmVzdG9yZVZpZXdTdGF0ZSgpCiB7CisgICAgaWYg KCFtX3Nob3VsZFJlc3RvcmVWaWV3U3RhdGUpCisgICAgICAgIHJldHVybjsKICAgICBpZiAoIWlz TWFpbkZyYW1lKCkpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5o IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50QmxhY2tCZXJyeS5oCmluZGV4IGUxYWM2OTIzMzI4MDgwYWVjNDBkNTNlYTY0ZmU0OTUzNTNi YTIwZTAuLjdiYzJkNjkxMDUxOTM3ZGQ1YWU4ZGIzZmI0MmJjOWUwMjk0ZDUyY2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmgKQEAgLTE3OSw2ICsxNzksOCBAQCBw dWJsaWM6CiAKICAgICB2b2lkIHN1cHByZXNzQ2hpbGRGcmFtZUNyZWF0aW9uKCkgeyBtX2NoaWxk RnJhbWVDcmVhdGlvblN1cHByZXNzZWQgPSB0cnVlOyB9CiAKKyAgICB2aXJ0dWFsIGJvb2wgc2hv dWxkUmVzdG9yZVZpZXdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkUmVzdG9yZVZpZXdT dGF0ZTsgfQorCiBwcml2YXRlOgogICAgIHZvaWQgcmVjZWl2ZWREYXRhKERvY3VtZW50TG9hZGVy KiwgY29uc3QgY2hhciosIGludCk7CiAgICAgdm9pZCBkaWRGaW5pc2hPckZhaWxMb2FkaW5nKGNv bnN0IFJlc291cmNlRXJyb3ImKTsKQEAgLTIxNSw2ICsyMTcsOCBAQCBwcml2YXRlOgogICAgIGJv b2wgbV9jYW5jZWxMb2FkT25OZXh0RGF0YTsKIAogICAgIGJvb2wgbV93YXNQcm92aXNpb25hbExv YWRUcmlnZ2VyZWRCeVVzZXJHZXN0dXJlOworCisgICAgYm9vbCBtX3Nob3VsZFJlc3RvcmVWaWV3 U3RhdGU7CiB9OwogCiB9IC8vIFdlYkNvcmUK 158617 2012-08-15 12:36:19 -0700 2012-08-16 09:46:58 -0700 Patch bug-94123-20120815153602.patch text/plain 9446 kpiascik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTgxNWE1ODI5N2ZiMDNl NWQ3M2UyN2UwNmI3OTU4MWM1NGNkMDA0OC4uNmNiZWRmZjk3ZmI1YjYzZTNmZDU3ZTkyY2ZiODE0 MGY1ZGQ0YTIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTE1ICBLb25y YWQgUGlhc2NpayAgPGtwaWFzY2lrQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJl bG9hZCB2YWxpZCBwYWdlIGZyb20gRXJyb3IgUGFnZSBrZWVwcyBoaXN0b3J5IFZpZXdTdGF0ZSBh bmQgem9vbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk0MTIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmV2aWV3ZWQgaW50ZXJuYWxseSBieSBMZW8gWWFuZy4KKyAgICAgICAgUFIgMTc4MzA1CisKKyAg ICAgICAgQWRkIGEgbWV0aG9kIHRvIGNoZWNrIHdoZXRoZXIgd2Ugc2hvdWxkIHJlc3RvcmUgdGhl IHZpZXcgc3RhdGUgdG8gdGhlCisgICAgICAgIEZyYW1lTG9hZGVyQ2xpZW50LiAgVGhpcyBpcyBu ZWNlc3NhcnkgYmVjYXVzZSB3ZSBkb24ndCBoYXZlIGEgd2F5IHRvCisgICAgICAgIGRldGVybWlu ZSBpZiB0aGUgbGFzdCBwYWdlIGxvYWRlZCB3YXMgYW4gZXJyb3IgcGFnZSBvdXRzaWRlIG9mIHRo ZQorICAgICAgICBGcmFtZUxvYWRlckNsaWVudC4KKworICAgICAgICBOb3QgdGVzdGFibGUgdXNp bmcgbGF5b3V0IHRlc3RzLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50Lmg6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6c2hvdWxkUmVzdG9yZVZpZXdT dGF0ZSk6CisKIDIwMTItMDgtMTMgIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KIAog ICAgICAgICBbQmxhY2tCZXJyeV0gSGFyZHdhcmUgYWNjZWxlcmF0ZWQgc2Nyb2xsaW5nIG9mIDxz ZWxlY3Q+IGNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDIxNTBmYmU3 MDc2ZTU1MTEzMWI1NTJiOTFlNDMxYzNlOGRhNjE1NzguLjg4ZjQ3ZjUzMDIwZTgyNjRiNmVjN2Y4 NDkxMTAzZWJjMjhlNzUyNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDM4IEBACisyMDEyLTA4LTE1ICBLb25yYWQgUGlhc2NpayAgPGtwaWFzY2lrQHJpbS5jb20+ CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbG9hZCB2YWxpZCBwYWdlIGZyb20gRXJyb3IgUGFn ZSBrZWVwcyBoaXN0b3J5IFZpZXdTdGF0ZSBhbmQgem9vbS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0MTIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgaW50ZXJuYWxseSBieSBMZW8gWWFu Zy4KKyAgICAgICAgUFIgMTc4MzA1CisKKyAgICAgICAgUHJldmVudCB0aGUgVmlld1N0YXRlIGZy b20gYmVpbmcgc2F2ZWQgaWYgdGhlIGxhc3QgcGFnZSBsb2FkZWQgd2FzIGFuCisgICAgICAgIGVy cm9yIHBhZ2UuCisgICAgICAgIEhhdmUgdGhlIG1pbmltdW0sIG1heGltdW0gYW5kIGluaXRpYWwg c2NhbGUgcmVzZXQgd2hlbmV2ZXIgdGhlCisgICAgICAgIHZpZXdwb3J0IHByb3BlcnRpZXMgYXJl IGNoYW5nZWQuICBXZSBhbHNvIHJlc2V0IHVzZXIgc2NhbGFibGUgYXQgdGhpcworICAgICAgICB0 aW1lLiAgV2UgbmVlZCB0byBkbyB0aGlzIGluIHRoZSBjYXNlIG9mIHRoZSBlcnJvciBwYWdlIHNp bmNlIGl0J3MKKyAgICAgICAgc2NhbGVzIGFuZCB1c2VyIHNjYWxhYmxlIHdvdWxkIHBlcnNpc3Qg aWYgeW91IHJlZnJlc2ggYW5kIGdldCBhIHZhbGlkCisgICAgICAgIHBhZ2UuCisgICAgICAgIElu IHpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCB3ZSBuZWVkIHRvIGNoZWNrIGlmIHdlJ3JlIHJlbG9h ZGluZyBmcm9tCisgICAgICAgIGFuIGVycm9yIHBhZ2UuICBUaGlzIGlzIGRvbmUgYnkgY2FsbGlu ZyBzaG91bGRSZXN0b3JlVmlld1N0YXRlIG9uIHRoZQorICAgICAgICBGcmFtZUxvYWRlckNsaWVu dC4gIFRoaXMgcHJvcGVybHkgc2V0cyBzaG91bGRab29tIGFuZCBhbGxvd3MgdXMgdG8KKyAgICAg ICAgem9vbVRvRml0IGluc3RlYWQgb2Ygc3RheWluZyBhdCBpbml0aWFsIHNjYWxlIDEuMC4KKwor ICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6 V2ViUGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OldlYlBhZ2VQcml2YXRlOjp6b29tVG9Jbml0aWFsU2NhbGVPbkxvYWQpOgorICAgICAgICAo QmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6cmVzZXRTY2FsZXMpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6ZGlzcGF0Y2hWaWV3cG9ydFBy b3BlcnRpZXNEaWRDaGFuZ2UpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVu dEJsYWNrQmVycnk6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnNhdmVWaWV3U3RhdGVUb0l0ZW0pOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpyZXN0b3JlVmlld1N0YXRl KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnku aDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6c2hvdWxk UmVzdG9yZVZpZXdTdGF0ZSk6CisgICAgICAgIChGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkp OgorCiAyMDEyLTA4LTEzICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CiAKICAgICAg ICAgW0JsYWNrQmVycnldIFJvdW5kaW5nIGVycm9yIHNvbWV3aGVyZSB3aGVuIHRyYW5zbGF0aW5n IENvbXBvc2l0aW5nTGF5ZXIgJ3MgZm9yIGluLXJlZ2lvbiBzY3JvbGxpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggNjcyODQ5ZGJkMDNlN2U3NzZmOGI2 MzQ1ZDU2ZDBmNDZhNWJhMjEwYy4uMmRmODc2NmE4YjcwZWYyZThmMjViZGIyOGU5NmU5ZjNkYzJm ODI5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTM1 Nyw2ICszNTcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBs b2FkSWNvbkV4dGVybmFsbHkoY29uc3QgU3RyaW5nJiBvcmlnaW5hbFBhZ2VVcmwsIGNvbnN0IFN0 cmluZyYgZmluYWxQYWdlVXJsLCBjb25zdCBTdHJpbmcmIGljb25VcmwpIHsgfQogCiAgICAgICAg IHZpcnR1YWwgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gc2VjdXJpdHlPcmlnaW5Gb3JOZXdE b2N1bWVudChjb25zdCBLVVJMJikgPSAwOworICAgICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkUmVz dG9yZVZpZXdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KICNlbmRpZgogICAgIH07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IDUxZDcxYjVkNTk4 Y2FhYmQxZDAxMzJiNmU1MDY1MDgzNDBjYTZiZTQuLmMwYmM1NzU0NWZiODlhMzIyZTJmMDYyYzJh YTVkNDhkN2U1MjdlMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv V2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNw cApAQCAtMTA5Nyw4ICsxMDk3LDYgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6c2V0TG9hZFN0YXRl KExvYWRTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICBmcmFtZUxvYWRUeXBlID0gbV9tYWlu RnJhbWUtPmxvYWRlcigpLT5sb2FkVHlwZSgpOwogICAgICAgICAgICAgaWYgKCEoKG1fZGlkUmVz dG9yZUZyb21QYWdlQ2FjaGUgJiYgZG9jdW1lbnRIYXNWaWV3cG9ydEFyZ3VtZW50cykgfHwgKGZy YW1lTG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlwZVJlbG9hZCB8fCBmcmFtZUxvYWRUeXBlID09IEZy YW1lTG9hZFR5cGVSZWxvYWRGcm9tT3JpZ2luKSkpIHsKICAgICAgICAgICAgICAgICBtX3ZpZXdw b3J0QXJndW1lbnRzID0gVmlld3BvcnRBcmd1bWVudHMoKTsKLSAgICAgICAgICAgICAgICBtX3Vz ZXJTY2FsYWJsZSA9IG1fd2ViU2V0dGluZ3MtPmlzVXNlclNjYWxhYmxlKCk7Ci0gICAgICAgICAg ICAgICAgcmVzZXRTY2FsZXMoKTsKIAogICAgICAgICAgICAgICAgIC8vIEF0IHRoZSBtb21lbnQg d2UgY29tbWl0IGEgbmV3IGxvYWQsIHNldCB0aGUgdmlld3BvcnQgYXJndW1lbnRzCiAgICAgICAg ICAgICAgICAgLy8gdG8gYW55IGZhbGxiYWNrIHZhbHVlcy4gSWYgdGhlcmUgaXMgYSBtZXRhIHZp ZXdwb3J0IGluIHRoZQpAQCAtMTc3Nyw3ICsxNzc1LDEwIEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6 Onpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCgpCiAKICAgICAvLyBJZiB0aGlzIGxvYWQgc2hvdWxk IHJlc3RvcmUgdmlldyBzdGF0ZSwgZG9uJ3Qgem9vbSB0byBpbml0aWFsIHNjYWxlCiAgICAgLy8g YnV0IGluc3RlYWQgbGV0IHRoZSBIaXN0b3J5SXRlbSdzIHNhdmVkIHZpZXdwb3J0IHJlaWduIHN1 cHJlbWUuCi0gICAgaWYgKG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5sb2FkZXIoKSAmJiBt X21haW5GcmFtZS0+bG9hZGVyKCktPnNob3VsZFJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdT dGF0ZSgpKQorICAgIC8vIEZJWE1FIGxvb2sgaW50byBpbmNvcnBvcmF0aW5nIEZyYW1lTG9hZGVy Q2xpZW50OjpzaG91bGRSZXN0b3JlVmlld1N0YXRlIGFzCisgICAgLy8gYSBwYXJ0IG9mIEZyYW1l TG9hZGVyOjpzaG91bGRSZXN0b3JlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3RhdGUuCisgICAgaWYg KG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5sb2FkZXIoKSAmJiBtX21haW5GcmFtZS0+bG9h ZGVyKCktPnNob3VsZFJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpCisgICAgICAg ICAgICAmJiBtX21haW5GcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpICYmIG1fbWFpbkZyYW1lLT5s b2FkZXIoKS0+Y2xpZW50KCktPnNob3VsZFJlc3RvcmVWaWV3U3RhdGUoKSkKICAgICAgICAgc2hv dWxkWm9vbSA9IGZhbHNlOwogCiAgICAgaWYgKHNob3VsZFpvb20gJiYgc2hvdWxkWm9vbVRvSW5p dGlhbFNjYWxlT25Mb2FkKCkpIHsKQEAgLTE4OTgsNyArMTg5OSwxMCBAQCB2b2lkIFdlYlBhZ2VQ cml2YXRlOjpyZXNldFNjYWxlcygpCiAKICAgICAvLyBXZSBoYXZlIHRvIGxldCBXZWJDb3JlIGtu b3cgYWJvdXQgdXBkYXRlZCBmcmFtZXJlY3Qgbm93IHRoYXQgd2UndmUKICAgICAvLyByZXNldCBv dXIgc2NhbGVzLiBTZWU6IFJJTSBCdWcgIzQwMS4KLSAgICB1cGRhdGVWaWV3cG9ydFNpemUoKTsK KyAgICAvLyBUaGlzIGNoZWNrcyB0byBtYWtlIHN1cmUgd2UncmUgbm90IGNhbGxpbmcgdXBkYXRl Vmlld3BvcnRTaXplCisgICAgLy8gZHVyaW5nIFdlYlBhZ2VQcml2YXRlOjppbml0KCkuCisgICAg aWYgKG1fYmFja2luZ1N0b3JlKQorICAgICAgICB1cGRhdGVWaWV3cG9ydFNpemUoKTsKIH0KIAog SW50UG9pbnQgV2ViUGFnZVByaXZhdGU6OnRyYW5zZm9ybWVkU2Nyb2xsUG9zaXRpb24oKSBjb25z dApAQCAtMzU4NSw2ICszNTg5LDggQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6ZGlkUmVjZWl2ZVRv dWNoRXZlbnRNb2RlKFRvdWNoRXZlbnRNb2RlIG1vZGUpCiAKIHZvaWQgV2ViUGFnZVByaXZhdGU6 OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1l bnRzJiBhcmd1bWVudHMpCiB7CisgICAgbV91c2VyU2NhbGFibGUgPSBtX3dlYlNldHRpbmdzLT5p c1VzZXJTY2FsYWJsZSgpOworICAgIHJlc2V0U2NhbGVzKCk7CiAgICAgaWYgKGFyZ3VtZW50cyA9 PSBtX3ZpZXdwb3J0QXJndW1lbnRzKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJs YWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggNzhiYTMzN2RlYTBlNGMxN2YxNWNl MjNiMGUxYzI0ZjQ5YTFhZWEyMy4uODllYmFhNjEzYTIyZmQ3MjAyNDlmN2IzOGMwMzczYmRlOWIw ZTliOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAg LTEwMSw2ICsxMDEsNyBAQCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OkZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeSgpCiAgICAgLCBtX2hhc1NlbnRSZXNwb25zZVRvUGx1Z2luKGZhbHNl KQogICAgICwgbV9jYW5jZWxMb2FkT25OZXh0RGF0YShmYWxzZSkKICAgICAsIG1fd2FzUHJvdmlz aW9uYWxMb2FkVHJpZ2dlcmVkQnlVc2VyR2VzdHVyZSh0cnVlKSAvLyBUbyBhdm9pZCBhZmZlY3Rp bmcgdGhlIGZpcnN0IGxvYWQuCisgICAgLCBtX3Nob3VsZFJlc3RvcmVWaWV3U3RhdGUodHJ1ZSkK IHsKIH0KIApAQCAtNTQxLDYgKzU0Miw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFja0Jl cnJ5OjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQogICAgICAgICAvLyBTdWJzdGl0dXRlRGF0YSBp biBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQpLgogICAgICAgICBpZiAobV9sb2FkaW5n RXJyb3JQYWdlKSB7CiAgICAgICAgICAgICBtX2xvYWRpbmdFcnJvclBhZ2UgPSBmYWxzZTsKKyAg ICAgICAgICAgIGlmIChIaXN0b3J5SXRlbSogaXRlbSA9IG1fZnJhbWUtPmxvYWRlcigpLT5oaXN0 b3J5KCktPmN1cnJlbnRJdGVtKCkpCisgICAgICAgICAgICAgICAgaXRlbS0+dmlld1N0YXRlKCku c2hvdWxkU2F2ZVZpZXdTdGF0ZSA9IGZhbHNlOwogICAgICAgICAgICAgbV93ZWJQYWdlUHJpdmF0 ZS0+bV9jbGllbnQtPm5vdGlmeUxvYWRGYWlsZWRCZWZvcmVDb21taXQoCiAgICAgICAgICAgICAg ICAgb3JpZ2luYWxVcmwuY2hhcmFjdGVycygpLCBvcmlnaW5hbFVybC5sZW5ndGgoKSwKICAgICAg ICAgICAgICAgICAgICAgdXJsLmNoYXJhY3RlcnMoKSwgdXJsLmxlbmd0aCgpLCB0b2tlbi5jaGFy YWN0ZXJzKCksIHRva2VuLmxlbmd0aCgpKTsKQEAgLTEwMTYsNyArMTAxOSw4IEBAIHZvaWQgRnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzYXZlVmlld1N0YXRlVG9JdGVtKEhpc3RvcnlJdGVt KiBpdGVtKQogCiAgICAgQVNTRVJUKGl0ZW0pOwogICAgIEhpc3RvcnlJdGVtVmlld1N0YXRlJiB2 aWV3U3RhdGUgPSBpdGVtLT52aWV3U3RhdGUoKTsKLSAgICBpZiAodmlld1N0YXRlLnNob3VsZFNh dmVWaWV3U3RhdGUpIHsKKyAgICBtX3Nob3VsZFJlc3RvcmVWaWV3U3RhdGUgPSB2aWV3U3RhdGUu c2hvdWxkU2F2ZVZpZXdTdGF0ZTsKKyAgICBpZiAobV9zaG91bGRSZXN0b3JlVmlld1N0YXRlKSB7 CiAgICAgICAgIHZpZXdTdGF0ZS5vcmllbnRhdGlvbiA9IG1fd2ViUGFnZVByaXZhdGUtPm1haW5G cmFtZSgpLT5vcmllbnRhdGlvbigpOwogICAgICAgICB2aWV3U3RhdGUuaXNab29tVG9GaXRTY2Fs ZSA9IG1fd2ViUGFnZVByaXZhdGUtPmN1cnJlbnRTY2FsZSgpID09IG1fd2ViUGFnZVByaXZhdGUt Pnpvb21Ub0ZpdFNjYWxlKCk7CiAgICAgICAgIHZpZXdTdGF0ZS5zY2FsZSA9IG1fd2ViUGFnZVBy aXZhdGUtPmN1cnJlbnRTY2FsZSgpOwpAQCAtMTAyOSw2ICsxMDMzLDggQEAgdm9pZCBGcmFtZUxv YWRlckNsaWVudEJsYWNrQmVycnk6OnNhdmVWaWV3U3RhdGVUb0l0ZW0oSGlzdG9yeUl0ZW0qIGl0 ZW0pCiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpyZXN0b3JlVmlld1N0YXRl KCkKIHsKKyAgICBpZiAoIW1fc2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSkKKyAgICAgICAgcmV0dXJu OwogICAgIGlmICghaXNNYWluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmgKaW5kZXggZTFhYzY5MjMzMjgwODBhZWM0MGQ1 M2VhNjRmZTQ5NTM1M2JhMjBlMC4uN2JjMmQ2OTEwNTE5MzdkZDVhZThkYjNmYjQyYmM5ZTAyOTRk NTJjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaApAQCAtMTc5 LDYgKzE3OSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc3VwcHJlc3NDaGlsZEZyYW1lQ3JlYXRp b24oKSB7IG1fY2hpbGRGcmFtZUNyZWF0aW9uU3VwcHJlc3NlZCA9IHRydWU7IH0KIAorICAgIHZp cnR1YWwgYm9vbCBzaG91bGRSZXN0b3JlVmlld1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zaG91 bGRSZXN0b3JlVmlld1N0YXRlOyB9CisKIHByaXZhdGU6CiAgICAgdm9pZCByZWNlaXZlZERhdGEo RG9jdW1lbnRMb2FkZXIqLCBjb25zdCBjaGFyKiwgaW50KTsKICAgICB2b2lkIGRpZEZpbmlzaE9y RmFpbExvYWRpbmcoY29uc3QgUmVzb3VyY2VFcnJvciYpOwpAQCAtMjE1LDYgKzIxNyw4IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBtX2NhbmNlbExvYWRPbk5leHREYXRhOwogCiAgICAgYm9vbCBtX3dh c1Byb3Zpc2lvbmFsTG9hZFRyaWdnZXJlZEJ5VXNlckdlc3R1cmU7CisKKyAgICBib29sIG1fc2hv dWxkUmVzdG9yZVZpZXdTdGF0ZTsKIH07CiAKIH0gLy8gV2ViQ29yZQo= 158843 2012-08-16 09:47:01 -0700 2012-08-16 11:56:47 -0700 Patch bug-94123-20120816124643.patch text/plain 7610 kpiascik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAyMTUwZmJlNzA3NmU1NTExMzFiNTUyYjkxZTQzMWMzZThkYTYxNTc4Li4wOGI3MGEyNTBk ODg1N2ZiNDI2YjljOGZmYzVmZDliOTY2OTlmODBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMi0wOC0xNiAgS29ucmFkIFBpYXNjaWsgIDxrcGlh c2Npa0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZWxvYWQgdmFsaWQgcGFnZSBm cm9tIEVycm9yIFBhZ2Uga2VlcHMgaGlzdG9yeSBWaWV3U3RhdGUgYW5kIHpvb20uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDEyMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldmlld2VkIGludGVybmFs bHkgYnkgTGVvIFlhbmcsIEphY2t5IEppYW5nLgorICAgICAgICBQUiAxNzgzMDUKKworICAgICAg ICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFn ZVByaXZhdGU6OnNldExvYWRTdGF0ZSk6UmVzZXQgdGhlIHNjYWxlcyBhbmQKKyAgICAgICAgdGhl IHVzZXIgc2NhbGFsYmUgZmxhZyBpZiB3ZSdyZSByZWxvYWRpbmcgZnJvbSBhbiBlcnJvciBwYWdl LgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6em9vbVRvSW5p dGlhbFNjYWxlT25Mb2FkKToKKyAgICAgICAgUHJvcGVybHkgc2V0IHRoZSBzaG91bGRab29tIGZs YWcgaWYgd2UncmUgbm90IGdvaW5nIHRvIHJlc3RvcmUgdGhlCisgICAgICAgIHZpZXcgc3RhdGUu CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpyZXNldFNjYWxl cyk6IERvbid0IHVwZGF0ZSB0aGUKKyAgICAgICAgdmlld3BvcnQgc2l6ZSBpZiB3ZSdyZSBzdGls bCBpbiB0aGUgV2ViUGFnZVByaXZhdGU6OmluaXQgbWV0aG9kLgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJy eSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3Bh dGNoRGlkQ29tbWl0TG9hZCk6IFNldCB0aGUKKyAgICAgICAgVmlld1N0YXRlJ3Mgc2hvdWxkU2F2 ZVZpZXdTdGF0ZSBmbGFnIGlmIHdlJ3JlIGNvbWluZyBmcm9tIGFuIGVycm9yIHBhZ2UuCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnNhdmVWaWV3U3RhdGVU b0l0ZW0pOiBTZXQgdGhlCisgICAgICAgIG5ldyBtZW1lYmVyIHZhcmlhYmxlIG1fc2hvdWxkUmVz dG9yZVZpZXdTdGF0ZSBiYXNlZCBvbiB0aGUgVmlld1N0YXRlJ3MKKyAgICAgICAgc2hvdWxkU2F2 ZVZpZXdTdGF0ZSBmbGFnLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5OjpyZXN0b3JlVmlld1N0YXRlKTogQWRkZWQgZWFybHkKKyAgICAgICAgcmV0dXJuIGlm IG1fc2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSBpcyBmYWxzZS4KKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaDogQWRkIG5ldyBtZXRob2QgdG8gaGF2 ZQorICAgICAgICB0aGUgY2xpZW50IHRyYWNrIHdoZXRoZXIgd2Ugc2hvdWxkIHJlc3RvcmUgdGhl IHZpZXcgc3RhdGUuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnk6OnNob3VsZFJlc3RvcmVWaWV3U3RhdGUpOgorICAgICAgICAoRnJhbWVMb2FkZXJDbGllbnRC bGFja0JlcnJ5KToKKwogMjAxMi0wOC0xMyAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29t PgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBSb3VuZGluZyBlcnJvciBzb21ld2hlcmUgd2hlbiB0 cmFuc2xhdGluZyBDb21wb3NpdGluZ0xheWVyICdzIGZvciBpbi1yZWdpb24gc2Nyb2xsaW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA1MWQ3MWI1ZDU5OGNh YWJkMWQwMTMyYjZlNTA2NTA4MzQwY2E2YmU0Li5jNmU3OTA3NjBjNjIyYjQ0NGY5ZGNmNzY2NGM3 YzNiMTBlMTU0ZmU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAK QEAgLTEwOTUsNyArMTA5NSw5IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZShM b2FkU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAgICAgZG9jdW1lbnRIYXNWaWV3cG9ydEFyZ3Vt ZW50cyA9IHRydWU7CiAgICAgICAgICAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUt PmxvYWRlcigpKQogICAgICAgICAgICAgICAgIGZyYW1lTG9hZFR5cGUgPSBtX21haW5GcmFtZS0+ bG9hZGVyKCktPmxvYWRUeXBlKCk7Ci0gICAgICAgICAgICBpZiAoISgobV9kaWRSZXN0b3JlRnJv bVBhZ2VDYWNoZSAmJiBkb2N1bWVudEhhc1ZpZXdwb3J0QXJndW1lbnRzKSB8fCAoZnJhbWVMb2Fk VHlwZSA9PSBGcmFtZUxvYWRUeXBlUmVsb2FkIHx8IGZyYW1lTG9hZFR5cGUgPT0gRnJhbWVMb2Fk VHlwZVJlbG9hZEZyb21PcmlnaW4pKSkgeworICAgICAgICAgICAgRnJhbWVMb2FkZXJDbGllbnRC bGFja0JlcnJ5KiBmcmFtZUxvYWRlckNsaWVudCA9IHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xp ZW50QmxhY2tCZXJyeSo+KG1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpOworICAgICAg ICAgICAgaWYgKCEoKG1fZGlkUmVzdG9yZUZyb21QYWdlQ2FjaGUgJiYgZG9jdW1lbnRIYXNWaWV3 cG9ydEFyZ3VtZW50cykKKyAgICAgICAgICAgICAgICB8fCAoKGZyYW1lTG9hZFR5cGUgPT0gRnJh bWVMb2FkVHlwZVJlbG9hZCB8fCBmcmFtZUxvYWRUeXBlID09IEZyYW1lTG9hZFR5cGVSZWxvYWRG cm9tT3JpZ2luKSAmJiBmcmFtZUxvYWRlckNsaWVudC0+c2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSgp KSkpIHsKICAgICAgICAgICAgICAgICBtX3ZpZXdwb3J0QXJndW1lbnRzID0gVmlld3BvcnRBcmd1 bWVudHMoKTsKICAgICAgICAgICAgICAgICBtX3VzZXJTY2FsYWJsZSA9IG1fd2ViU2V0dGluZ3Mt PmlzVXNlclNjYWxhYmxlKCk7CiAgICAgICAgICAgICAgICAgcmVzZXRTY2FsZXMoKTsKQEAgLTE3 NzcsNyArMTc3OSw5IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6Onpvb21Ub0luaXRpYWxTY2FsZU9u TG9hZCgpCiAKICAgICAvLyBJZiB0aGlzIGxvYWQgc2hvdWxkIHJlc3RvcmUgdmlldyBzdGF0ZSwg ZG9uJ3Qgem9vbSB0byBpbml0aWFsIHNjYWxlCiAgICAgLy8gYnV0IGluc3RlYWQgbGV0IHRoZSBI aXN0b3J5SXRlbSdzIHNhdmVkIHZpZXdwb3J0IHJlaWduIHN1cHJlbWUuCi0gICAgaWYgKG1fbWFp bkZyYW1lICYmIG1fbWFpbkZyYW1lLT5sb2FkZXIoKSAmJiBtX21haW5GcmFtZS0+bG9hZGVyKCkt PnNob3VsZFJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpKQorICAgIEZyYW1lTG9h ZGVyQ2xpZW50QmxhY2tCZXJyeSogZnJhbWVMb2FkZXJDbGllbnQgPSBzdGF0aWNfY2FzdDxGcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnkqPihtX21haW5GcmFtZS0+bG9hZGVyKCktPmNsaWVudCgp KTsKKyAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmxvYWRlcigpICYmIG1fbWFp bkZyYW1lLT5sb2FkZXIoKS0+c2hvdWxkUmVzdG9yZVNjcm9sbFBvc2l0aW9uQW5kVmlld1N0YXRl KCkKKyAgICAgICAgJiYgZnJhbWVMb2FkZXJDbGllbnQgJiYgZnJhbWVMb2FkZXJDbGllbnQtPnNo b3VsZFJlc3RvcmVWaWV3U3RhdGUoKSkKICAgICAgICAgc2hvdWxkWm9vbSA9IGZhbHNlOwogCiAg ICAgaWYgKHNob3VsZFpvb20gJiYgc2hvdWxkWm9vbVRvSW5pdGlhbFNjYWxlT25Mb2FkKCkpIHsK QEAgLTE4OTgsNyArMTkwMiwxMCBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpyZXNldFNjYWxlcygp CiAKICAgICAvLyBXZSBoYXZlIHRvIGxldCBXZWJDb3JlIGtub3cgYWJvdXQgdXBkYXRlZCBmcmFt ZXJlY3Qgbm93IHRoYXQgd2UndmUKICAgICAvLyByZXNldCBvdXIgc2NhbGVzLiBTZWU6IFJJTSBC dWcgIzQwMS4KLSAgICB1cGRhdGVWaWV3cG9ydFNpemUoKTsKKyAgICAvLyBUaGlzIGNoZWNrcyB0 byBtYWtlIHN1cmUgd2UncmUgbm90IGNhbGxpbmcgdXBkYXRlVmlld3BvcnRTaXplCisgICAgLy8g ZHVyaW5nIFdlYlBhZ2VQcml2YXRlOjppbml0KCkuCisgICAgaWYgKG1fYmFja2luZ1N0b3JlKQor ICAgICAgICB1cGRhdGVWaWV3cG9ydFNpemUoKTsKIH0KIAogSW50UG9pbnQgV2ViUGFnZVByaXZh dGU6OnRyYW5zZm9ybWVkU2Nyb2xsUG9zaXRpb24oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tC ZXJyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAppbmRleCA3OGJhMzM3ZGVhMGU0YzE3ZjE1Y2UyM2Iw ZTFjMjRmNDlhMWFlYTIzLi44OWViYWE2MTNhMjJmZDcyMDI0OWY3YjM4YzAzNzNiZGU5YjBlOWI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAtMTAx LDYgKzEwMSw3IEBAIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6RnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5KCkKICAgICAsIG1faGFzU2VudFJlc3BvbnNlVG9QbHVnaW4oZmFsc2UpCiAg ICAgLCBtX2NhbmNlbExvYWRPbk5leHREYXRhKGZhbHNlKQogICAgICwgbV93YXNQcm92aXNpb25h bExvYWRUcmlnZ2VyZWRCeVVzZXJHZXN0dXJlKHRydWUpIC8vIFRvIGF2b2lkIGFmZmVjdGluZyB0 aGUgZmlyc3QgbG9hZC4KKyAgICAsIG1fc2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSh0cnVlKQogewog fQogCkBAIC01NDEsNiArNTQyLDggQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6 OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiAgICAgICAgIC8vIFN1YnN0aXR1dGVEYXRhIGluIGRp c3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZCkuCiAgICAgICAgIGlmIChtX2xvYWRpbmdFcnJv clBhZ2UpIHsKICAgICAgICAgICAgIG1fbG9hZGluZ0Vycm9yUGFnZSA9IGZhbHNlOworICAgICAg ICAgICAgaWYgKEhpc3RvcnlJdGVtKiBpdGVtID0gbV9mcmFtZS0+bG9hZGVyKCktPmhpc3Rvcnko KS0+Y3VycmVudEl0ZW0oKSkKKyAgICAgICAgICAgICAgICBpdGVtLT52aWV3U3RhdGUoKS5zaG91 bGRTYXZlVmlld1N0YXRlID0gZmFsc2U7CiAgICAgICAgICAgICBtX3dlYlBhZ2VQcml2YXRlLT5t X2NsaWVudC0+bm90aWZ5TG9hZEZhaWxlZEJlZm9yZUNvbW1pdCgKICAgICAgICAgICAgICAgICBv cmlnaW5hbFVybC5jaGFyYWN0ZXJzKCksIG9yaWdpbmFsVXJsLmxlbmd0aCgpLAogICAgICAgICAg ICAgICAgICAgICB1cmwuY2hhcmFjdGVycygpLCB1cmwubGVuZ3RoKCksIHRva2VuLmNoYXJhY3Rl cnMoKSwgdG9rZW4ubGVuZ3RoKCkpOwpAQCAtMTAxNiw3ICsxMDE5LDggQEAgdm9pZCBGcmFtZUxv YWRlckNsaWVudEJsYWNrQmVycnk6OnNhdmVWaWV3U3RhdGVUb0l0ZW0oSGlzdG9yeUl0ZW0qIGl0 ZW0pCiAKICAgICBBU1NFUlQoaXRlbSk7CiAgICAgSGlzdG9yeUl0ZW1WaWV3U3RhdGUmIHZpZXdT dGF0ZSA9IGl0ZW0tPnZpZXdTdGF0ZSgpOwotICAgIGlmICh2aWV3U3RhdGUuc2hvdWxkU2F2ZVZp ZXdTdGF0ZSkgeworICAgIG1fc2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSA9IHZpZXdTdGF0ZS5zaG91 bGRTYXZlVmlld1N0YXRlOworICAgIGlmIChtX3Nob3VsZFJlc3RvcmVWaWV3U3RhdGUpIHsKICAg ICAgICAgdmlld1N0YXRlLm9yaWVudGF0aW9uID0gbV93ZWJQYWdlUHJpdmF0ZS0+bWFpbkZyYW1l KCktPm9yaWVudGF0aW9uKCk7CiAgICAgICAgIHZpZXdTdGF0ZS5pc1pvb21Ub0ZpdFNjYWxlID0g bV93ZWJQYWdlUHJpdmF0ZS0+Y3VycmVudFNjYWxlKCkgPT0gbV93ZWJQYWdlUHJpdmF0ZS0+em9v bVRvRml0U2NhbGUoKTsKICAgICAgICAgdmlld1N0YXRlLnNjYWxlID0gbV93ZWJQYWdlUHJpdmF0 ZS0+Y3VycmVudFNjYWxlKCk7CkBAIC0xMDI5LDYgKzEwMzMsOCBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeTo6c2F2ZVZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRlbSogaXRlbSkK IAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnJlc3RvcmVWaWV3U3RhdGUoKQog eworICAgIGlmICghbV9zaG91bGRSZXN0b3JlVmlld1N0YXRlKQorICAgICAgICByZXR1cm47CiAg ICAgaWYgKCFpc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJs YWNrQmVycnkuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaAppbmRleCBlMWFjNjkyMzMyODA4MGFlYzQwZDUzZWE2 NGZlNDk1MzUzYmEyMGUwLi5kMGFiYjAzN2FiZDU1N2Y5NWQ3MTVhNDk5NDU1ZWQ1OTVjYTRmYjQx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5oCkBAIC0xNzksNiAr MTc5LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBzdXBwcmVzc0NoaWxkRnJhbWVDcmVhdGlvbigp IHsgbV9jaGlsZEZyYW1lQ3JlYXRpb25TdXBwcmVzc2VkID0gdHJ1ZTsgfQogCisgICAgYm9vbCBz aG91bGRSZXN0b3JlVmlld1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRSZXN0b3JlVmll d1N0YXRlOyB9CisKIHByaXZhdGU6CiAgICAgdm9pZCByZWNlaXZlZERhdGEoRG9jdW1lbnRMb2Fk ZXIqLCBjb25zdCBjaGFyKiwgaW50KTsKICAgICB2b2lkIGRpZEZpbmlzaE9yRmFpbExvYWRpbmco Y29uc3QgUmVzb3VyY2VFcnJvciYpOwpAQCAtMjE1LDYgKzIxNyw4IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX2NhbmNlbExvYWRPbk5leHREYXRhOwogCiAgICAgYm9vbCBtX3dhc1Byb3Zpc2lvbmFs TG9hZFRyaWdnZXJlZEJ5VXNlckdlc3R1cmU7CisKKyAgICBib29sIG1fc2hvdWxkUmVzdG9yZVZp ZXdTdGF0ZTsKIH07CiAKIH0gLy8gV2ViQ29yZQo= 158869 2012-08-16 11:56:49 -0700 2012-08-16 12:56:08 -0700 Patch bug-94123-20120816145631.patch text/plain 7634 kpiascik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAyMTUwZmJlNzA3NmU1NTExMzFiNTUyYjkxZTQzMWMzZThkYTYxNTc4Li4zNWQ1ZGM0OGJh ZTY5ZjY4MjUwNWI5MGFmMDc5NTI1YTYwNjcyN2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMi0wOC0xNiAgS29ucmFkIFBpYXNjaWsgIDxrcGlh c2Npa0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZWxvYWQgdmFsaWQgcGFnZSBm cm9tIEVycm9yIFBhZ2Uga2VlcHMgaGlzdG9yeSBWaWV3U3RhdGUgYW5kIHpvb20uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDEyMworCisgICAgICAg IFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCisKKyAgICAgICAgUmV2aWV3ZWQgaW50ZXJuYWxs eSBieSBMZW8gWWFuZywgSmFja3kgSmlhbmcuCisgICAgICAgIFBSIDE3ODMwNQorCisgICAgICAg ICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdl UHJpdmF0ZTo6c2V0TG9hZFN0YXRlKTpSZXNldCB0aGUgc2NhbGVzIGFuZAorICAgICAgICB0aGUg dXNlciBzY2FsYWJsZSBmbGFnIGlmIHdlJ3JlIHJlbG9hZGluZyBmcm9tIGFuIGVycm9yIHBhZ2Uu CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjp1cGRhdGVWaWV3 cG9ydFNpemUpOiBEb24ndCB1cGRhdGUgdGhlCisgICAgICAgIHZpZXdwb3J0IHNpemUgaWYgd2Un cmUgc3RpbGwgaW4gdGhlIFdlYlBhZ2VQcml2YXRlOjppbml0IG1ldGhvZC4KKyAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6Onpvb21Ub0luaXRpYWxTY2FsZU9uTG9h ZCk6CisgICAgICAgIFByb3Blcmx5IHNldCB0aGUgc2hvdWxkWm9vbSBmbGFnIGlmIHdlJ3JlIG5v dCBnb2luZyB0byByZXN0b3JlIHRoZQorICAgICAgICB2aWV3IHN0YXRlLgorICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OkZyYW1lTG9hZGVyQ2xpZW50Qmxh Y2tCZXJyeSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6 OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCk6IFNldCB0aGUKKyAgICAgICAgVmlld1N0YXRlJ3Mgc2hv dWxkU2F2ZVZpZXdTdGF0ZSBmbGFnIGlmIHdlJ3JlIGNvbWluZyBmcm9tIGFuIGVycm9yIHBhZ2Uu CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnNhdmVWaWV3 U3RhdGVUb0l0ZW0pOiBTZXQgdGhlCisgICAgICAgIG5ldyBtZW1iZXIgdmFyaWFibGUgbV9zaG91 bGRSZXN0b3JlVmlld1N0YXRlIGJhc2VkIG9uIHRoZSBWaWV3U3RhdGUncworICAgICAgICBzaG91 bGRTYXZlVmlld1N0YXRlIGZsYWcuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVu dEJsYWNrQmVycnk6OnJlc3RvcmVWaWV3U3RhdGUpOiBBZGRlZCBlYXJseQorICAgICAgICByZXR1 cm4gaWYgbV9zaG91bGRSZXN0b3JlVmlld1N0YXRlIGlzIGZhbHNlLgorICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5oOiBBZGQgbmV3IG1ldGhvZCB0 byBoYXZlCisgICAgICAgIHRoZSBjbGllbnQgdHJhY2sgd2hldGhlciB3ZSBzaG91bGQgcmVzdG9y ZSB0aGUgdmlldyBzdGF0ZS4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50Qmxh Y2tCZXJyeTo6c2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSk6CisgICAgICAgIChGcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnkpOgorCiAyMDEyLTA4LTEzICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJp bS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFJvdW5kaW5nIGVycm9yIHNvbWV3aGVyZSB3 aGVuIHRyYW5zbGF0aW5nIENvbXBvc2l0aW5nTGF5ZXIgJ3MgZm9yIGluLXJlZ2lvbiBzY3JvbGxp bmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IDUxZDcxYjVk NTk4Y2FhYmQxZDAxMzJiNmU1MDY1MDgzNDBjYTZiZTQuLjk1NmU4YTA2NDUzOTFhMjg4Y2Y2ZDkz YzQwZTQ2MmVjMDFhOWM0NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl LmNwcApAQCAtMTA5NSw3ICsxMDk1LDkgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6c2V0TG9hZFN0 YXRlKExvYWRTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICBkb2N1bWVudEhhc1ZpZXdwb3J0 QXJndW1lbnRzID0gdHJ1ZTsKICAgICAgICAgICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21haW5G cmFtZS0+bG9hZGVyKCkpCiAgICAgICAgICAgICAgICAgZnJhbWVMb2FkVHlwZSA9IG1fbWFpbkZy YW1lLT5sb2FkZXIoKS0+bG9hZFR5cGUoKTsKLSAgICAgICAgICAgIGlmICghKChtX2RpZFJlc3Rv cmVGcm9tUGFnZUNhY2hlICYmIGRvY3VtZW50SGFzVmlld3BvcnRBcmd1bWVudHMpIHx8IChmcmFt ZUxvYWRUeXBlID09IEZyYW1lTG9hZFR5cGVSZWxvYWQgfHwgZnJhbWVMb2FkVHlwZSA9PSBGcmFt ZUxvYWRUeXBlUmVsb2FkRnJvbU9yaWdpbikpKSB7CisgICAgICAgICAgICBGcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnkqIGZyYW1lTG9hZGVyQ2xpZW50ID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5Kj4obV9tYWluRnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSk7Cisg ICAgICAgICAgICBpZiAoISgobV9kaWRSZXN0b3JlRnJvbVBhZ2VDYWNoZSAmJiBkb2N1bWVudEhh c1ZpZXdwb3J0QXJndW1lbnRzKQorICAgICAgICAgICAgICAgIHx8ICgoZnJhbWVMb2FkVHlwZSA9 PSBGcmFtZUxvYWRUeXBlUmVsb2FkIHx8IGZyYW1lTG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlwZVJl bG9hZEZyb21PcmlnaW4pICYmIGZyYW1lTG9hZGVyQ2xpZW50LT5zaG91bGRSZXN0b3JlVmlld1N0 YXRlKCkpKSkgewogICAgICAgICAgICAgICAgIG1fdmlld3BvcnRBcmd1bWVudHMgPSBWaWV3cG9y dEFyZ3VtZW50cygpOwogICAgICAgICAgICAgICAgIG1fdXNlclNjYWxhYmxlID0gbV93ZWJTZXR0 aW5ncy0+aXNVc2VyU2NhbGFibGUoKTsKICAgICAgICAgICAgICAgICByZXNldFNjYWxlcygpOwpA QCAtMTYwNyw2ICsxNjA5LDEwIEBAIGJvb2wgV2ViUGFnZVByaXZhdGU6Omhhc1ZpcnR1YWxWaWV3 cG9ydCgpIGNvbnN0CiAKIHZvaWQgV2ViUGFnZVByaXZhdGU6OnVwZGF0ZVZpZXdwb3J0U2l6ZShi b29sIHNldEZpeGVkUmVwb3J0ZWRTaXplLCBib29sIHNlbmRSZXNpemVFdmVudCkKIHsKKyAgICAv LyBUaGlzIGNoZWNrcyB0byBtYWtlIHN1cmUgd2UncmUgbm90IGNhbGxpbmcgdXBkYXRlVmlld3Bv cnRTaXplCisgICAgLy8gZHVyaW5nIFdlYlBhZ2VQcml2YXRlOjppbml0KCkuCisgICAgaWYgKCFt X2JhY2tpbmdTdG9yZSkKKyAgICAgICAgcmV0dXJuOwogICAgIEFTU0VSVChtX21haW5GcmFtZS0+ dmlldygpKTsKICAgICBpZiAoc2V0Rml4ZWRSZXBvcnRlZFNpemUpCiAgICAgICAgIG1fbWFpbkZy YW1lLT52aWV3KCktPnNldEZpeGVkUmVwb3J0ZWRTaXplKGFjdHVhbFZpc2libGVTaXplKCkpOwpA QCAtMTc3Nyw3ICsxNzgzLDkgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6em9vbVRvSW5pdGlhbFNj YWxlT25Mb2FkKCkKIAogICAgIC8vIElmIHRoaXMgbG9hZCBzaG91bGQgcmVzdG9yZSB2aWV3IHN0 YXRlLCBkb24ndCB6b29tIHRvIGluaXRpYWwgc2NhbGUKICAgICAvLyBidXQgaW5zdGVhZCBsZXQg dGhlIEhpc3RvcnlJdGVtJ3Mgc2F2ZWQgdmlld3BvcnQgcmVpZ24gc3VwcmVtZS4KLSAgICBpZiAo bV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmxvYWRlcigpICYmIG1fbWFpbkZyYW1lLT5sb2Fk ZXIoKS0+c2hvdWxkUmVzdG9yZVNjcm9sbFBvc2l0aW9uQW5kVmlld1N0YXRlKCkpCisgICAgRnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5KiBmcmFtZUxvYWRlckNsaWVudCA9IHN0YXRpY19jYXN0 PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeSo+KG1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+Y2xp ZW50KCkpOworICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+bG9hZGVyKCkgJiYg bV9tYWluRnJhbWUtPmxvYWRlcigpLT5zaG91bGRSZXN0b3JlU2Nyb2xsUG9zaXRpb25BbmRWaWV3 U3RhdGUoKQorICAgICAgICAmJiBmcmFtZUxvYWRlckNsaWVudCAmJiBmcmFtZUxvYWRlckNsaWVu dC0+c2hvdWxkUmVzdG9yZVZpZXdTdGF0ZSgpKQogICAgICAgICBzaG91bGRab29tID0gZmFsc2U7 CiAKICAgICBpZiAoc2hvdWxkWm9vbSAmJiBzaG91bGRab29tVG9Jbml0aWFsU2NhbGVPbkxvYWQo KSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAppbmRleCA3 OGJhMzM3ZGVhMGU0YzE3ZjE1Y2UyM2IwZTFjMjRmNDlhMWFlYTIzLi44OWViYWE2MTNhMjJmZDcy MDI0OWY3YjM4YzAzNzNiZGU5YjBlOWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5LmNwcApAQCAtMTAxLDYgKzEwMSw3IEBAIEZyYW1lTG9hZGVyQ2xpZW50Qmxh Y2tCZXJyeTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5KCkKICAgICAsIG1faGFzU2VudFJl c3BvbnNlVG9QbHVnaW4oZmFsc2UpCiAgICAgLCBtX2NhbmNlbExvYWRPbk5leHREYXRhKGZhbHNl KQogICAgICwgbV93YXNQcm92aXNpb25hbExvYWRUcmlnZ2VyZWRCeVVzZXJHZXN0dXJlKHRydWUp IC8vIFRvIGF2b2lkIGFmZmVjdGluZyB0aGUgZmlyc3QgbG9hZC4KKyAgICAsIG1fc2hvdWxkUmVz dG9yZVZpZXdTdGF0ZSh0cnVlKQogewogfQogCkBAIC01NDEsNiArNTQyLDggQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiAgICAgICAg IC8vIFN1YnN0aXR1dGVEYXRhIGluIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZCkuCiAg ICAgICAgIGlmIChtX2xvYWRpbmdFcnJvclBhZ2UpIHsKICAgICAgICAgICAgIG1fbG9hZGluZ0Vy cm9yUGFnZSA9IGZhbHNlOworICAgICAgICAgICAgaWYgKEhpc3RvcnlJdGVtKiBpdGVtID0gbV9m cmFtZS0+bG9hZGVyKCktPmhpc3RvcnkoKS0+Y3VycmVudEl0ZW0oKSkKKyAgICAgICAgICAgICAg ICBpdGVtLT52aWV3U3RhdGUoKS5zaG91bGRTYXZlVmlld1N0YXRlID0gZmFsc2U7CiAgICAgICAg ICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVudC0+bm90aWZ5TG9hZEZhaWxlZEJlZm9yZUNv bW1pdCgKICAgICAgICAgICAgICAgICBvcmlnaW5hbFVybC5jaGFyYWN0ZXJzKCksIG9yaWdpbmFs VXJsLmxlbmd0aCgpLAogICAgICAgICAgICAgICAgICAgICB1cmwuY2hhcmFjdGVycygpLCB1cmwu bGVuZ3RoKCksIHRva2VuLmNoYXJhY3RlcnMoKSwgdG9rZW4ubGVuZ3RoKCkpOwpAQCAtMTAxNiw3 ICsxMDE5LDggQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnNhdmVWaWV3U3Rh dGVUb0l0ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0pCiAKICAgICBBU1NFUlQoaXRlbSk7CiAgICAgSGlz dG9yeUl0ZW1WaWV3U3RhdGUmIHZpZXdTdGF0ZSA9IGl0ZW0tPnZpZXdTdGF0ZSgpOwotICAgIGlm ICh2aWV3U3RhdGUuc2hvdWxkU2F2ZVZpZXdTdGF0ZSkgeworICAgIG1fc2hvdWxkUmVzdG9yZVZp ZXdTdGF0ZSA9IHZpZXdTdGF0ZS5zaG91bGRTYXZlVmlld1N0YXRlOworICAgIGlmIChtX3Nob3Vs ZFJlc3RvcmVWaWV3U3RhdGUpIHsKICAgICAgICAgdmlld1N0YXRlLm9yaWVudGF0aW9uID0gbV93 ZWJQYWdlUHJpdmF0ZS0+bWFpbkZyYW1lKCktPm9yaWVudGF0aW9uKCk7CiAgICAgICAgIHZpZXdT dGF0ZS5pc1pvb21Ub0ZpdFNjYWxlID0gbV93ZWJQYWdlUHJpdmF0ZS0+Y3VycmVudFNjYWxlKCkg PT0gbV93ZWJQYWdlUHJpdmF0ZS0+em9vbVRvRml0U2NhbGUoKTsKICAgICAgICAgdmlld1N0YXRl LnNjYWxlID0gbV93ZWJQYWdlUHJpdmF0ZS0+Y3VycmVudFNjYWxlKCk7CkBAIC0xMDI5LDYgKzEw MzMsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6c2F2ZVZpZXdTdGF0ZVRv SXRlbShIaXN0b3J5SXRlbSogaXRlbSkKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnk6OnJlc3RvcmVWaWV3U3RhdGUoKQogeworICAgIGlmICghbV9zaG91bGRSZXN0b3JlVmlld1N0 YXRlKQorICAgICAgICByZXR1cm47CiAgICAgaWYgKCFpc01haW5GcmFtZSgpKQogICAgICAgICBy ZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaAppbmRleCBl MWFjNjkyMzMyODA4MGFlYzQwZDUzZWE2NGZlNDk1MzUzYmEyMGUwLi5kMGFiYjAzN2FiZDU1N2Y5 NWQ3MTVhNDk5NDU1ZWQ1OTVjYTRmYjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmgKKysrIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeS5oCkBAIC0xNzksNiArMTc5LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBzdXBw cmVzc0NoaWxkRnJhbWVDcmVhdGlvbigpIHsgbV9jaGlsZEZyYW1lQ3JlYXRpb25TdXBwcmVzc2Vk ID0gdHJ1ZTsgfQogCisgICAgYm9vbCBzaG91bGRSZXN0b3JlVmlld1N0YXRlKCkgY29uc3QgeyBy ZXR1cm4gbV9zaG91bGRSZXN0b3JlVmlld1N0YXRlOyB9CisKIHByaXZhdGU6CiAgICAgdm9pZCBy ZWNlaXZlZERhdGEoRG9jdW1lbnRMb2FkZXIqLCBjb25zdCBjaGFyKiwgaW50KTsKICAgICB2b2lk IGRpZEZpbmlzaE9yRmFpbExvYWRpbmcoY29uc3QgUmVzb3VyY2VFcnJvciYpOwpAQCAtMjE1LDYg KzIxNyw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2NhbmNlbExvYWRPbk5leHREYXRhOwogCiAg ICAgYm9vbCBtX3dhc1Byb3Zpc2lvbmFsTG9hZFRyaWdnZXJlZEJ5VXNlckdlc3R1cmU7CisKKyAg ICBib29sIG1fc2hvdWxkUmVzdG9yZVZpZXdTdGF0ZTsKIH07CiAKIH0gLy8gV2ViQ29yZQo=