90547 2012-07-04 05:50:25 -0700 [Qt][WK2] Improve visible content rect update 2014-02-03 03:21:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 90550 1 abecsi abecsi cmarcelo gustavo hausmann kenneth menard philn webkit.review.bot xan.lopez zoltan oldest_to_newest 662897 0 abecsi 2012-07-04 05:50:25 -0700 [Qt][WK2] Improve visible content rect update 662899 1 150780 abecsi 2012-07-04 05:52:32 -0700 Created attachment 150780 Patch 663234 2 150780 kenneth 2012-07-04 19:31:25 -0700 Comment on attachment 150780 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150780&action=review > Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp:715 > + // A zero trajectoryVector indicates that tiles all around the viewport are requested. > + if (!trajectoryVector.isNull() && m_lastVisibleContentsRect == currentVisibleContentsRect) Good catch > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1230 > > + IntSize currentVisibleContentSize; > + if (const FrameView* view = m_frame->coreFrame()->view()) > + currentVisibleContentSize = view->visibleContentRect().size(); > + So what if the current page is zoomed in, then this wont be correct for the new loaded one. If you know about the viewport meta at this point you can calculate the first visible contents rect given the real viewport rect > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1239 > + // The HistoryController will update the scroll position later if needed. > + m_frame->coreFrame()->view()->setFixedVisibleContentRect(IntRect(IntPoint::zero(), currentVisibleContentSize)); Sure, but doesnt that mean that we can be smarter here? probably doesnt matter > Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:515 > - if (trajectoryVector != FloatPoint::zero()) > - toWebGraphicsLayer(m_nonCompositedContentLayer.get())->setVisibleContentRectTrajectoryVector(trajectoryVector); > + toWebGraphicsLayer(m_nonCompositedContentLayer.get())->setVisibleContentRectTrajectoryVector(trajectoryVector); Add comment that it can be zero here? 664048 3 151070 abecsi 2012-07-06 06:06:39 -0700 Created attachment 151070 updated patch 664052 4 151070 gyuyoung.kim 2012-07-06 06:13:15 -0700 Comment on attachment 151070 updated patch Attachment 151070 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13145446 664064 5 151073 abecsi 2012-07-06 06:27:00 -0700 Created attachment 151073 updated patch Fixed Gtk and EFL builds. 664070 6 151073 gyuyoung.kim 2012-07-06 06:32:10 -0700 Comment on attachment 151073 updated patch Attachment 151073 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13143448 664071 7 151073 buildbot 2012-07-06 06:33:19 -0700 Comment on attachment 151073 updated patch Attachment 151073 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13145448 664074 8 151073 buildbot 2012-07-06 06:37:44 -0700 Comment on attachment 151073 updated patch Attachment 151073 did not pass win-ews (win): Output: http://queues.webkit.org/results/13153308 664079 9 151077 abecsi 2012-07-06 06:41:36 -0700 Created attachment 151077 updated patch Another attempt to fix the build on non-Qt platforms. 664090 10 abecsi 2012-07-06 07:03:09 -0700 (In reply to comment #2) > (From update of attachment 150780 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=150780&action=review [snip] > > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1230 > > > > + IntSize currentVisibleContentSize; > > + if (const FrameView* view = m_frame->coreFrame()->view()) > > + currentVisibleContentSize = view->visibleContentRect().size(); > > + > > So what if the current page is zoomed in, then this wont be correct for the new loaded one. > > If you know about the viewport meta at this point you can calculate the first visible contents rect given the real viewport rect > Fixed. At this point during page load the only way I could get the actual viewport size was through WebPage, so I had to remove the TILED_BACKING_STORE guards from the needed functions. I also checked ViewportArguments which is empty here, so is there another way of getting the viewport size? > > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1239 > > + // The HistoryController will update the scroll position later if needed. > > + m_frame->coreFrame()->view()->setFixedVisibleContentRect(IntRect(IntPoint::zero(), currentVisibleContentSize)); > > Sure, but doesnt that mean that we can be smarter here? probably doesnt matter Setting a position here would be wrong, since (except when reloading) the loaded page could be a completely new one, so HistoryController should do the positioning if needed. > > > Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:515 > > - if (trajectoryVector != FloatPoint::zero()) > > - toWebGraphicsLayer(m_nonCompositedContentLayer.get())->setVisibleContentRectTrajectoryVector(trajectoryVector); > > + toWebGraphicsLayer(m_nonCompositedContentLayer.get())->setVisibleContentRectTrajectoryVector(trajectoryVector); > > Add comment that it can be zero here? Done. 684204 11 151077 abecsi 2012-08-01 08:44:05 -0700 Comment on attachment 151077 updated patch Remove patch from review queue, since part of it already landed in bug 92750 and the patch landed for bug 90550 seems to have fixed my test case. Trying to find a new one. 975498 12 jturcotte 2014-02-03 03:21:33 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it and remove [Qt] from the summary. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 150780 2012-07-04 05:52:32 -0700 2012-07-06 06:06:39 -0700 Patch bug-90547-20120704145234.patch text/plain 7133 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxODQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDkxM2YyZGQ4NDM4Yjhi YTU4NTliZDUwZTZiZWM0YmFmNjc1OGIwNi4uNjA0ZjdjNGFjMGU2OGZmZjc4NDQwNDE4NGY3ZmUy NTUyM2JlOGNlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA3LTA0ICBBbmRy YXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAbm9raWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBJ bXByb3ZlIHZpc2libGUgY29udGVudCByZWN0IHVwZGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA1NDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBdm9pZCB0aGUgZXh0cmEgd29yayBvZiBjb21wdXRp bmcgdGhlIHZpc2libGUgcmVjdCBtdWx0aXBsZQorICAgICAgICB0aW1lcyB3aXRoaW4gdGhlIG5v dGlmaWNhdGlvbiBmdW5jdGlvbiBhbmQgc2V0IGEgY29ycmVjdAorICAgICAgICBmaXhlZCB2aXNp YmxlIGNvbnRlbnQgcmVjdCBkdXJpbmcgcGFnZSBsb2FkLgorICAgICAgICBBbHNvIG1ha2Ugc3Vy ZSB0aGF0IG5vdGlmaWNhdGlvbnMgd2l0aCBhIG51bGwgdHJhamVjdG9yeQorICAgICAgICB2ZWN0 b3IgcmVhY2ggdGhlIGJhY2tpbmcgc3RvcmUgc2luY2UgYSBudWxsIHZlY3RvciBtZWFucworICAg ICAgICB0aGF0IGFsbCB0aWxlcyBhcm91bmQgdGhlIHZpZXdwb3J0IHdlcmUgcmVxdWVzdGVkLgor CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6Vmlld3BvcnRVcGRhdGVEZWZlcnJlcjo6flZpZXdwb3J0VXBkYXRlRGVmZXJyZXIp OgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SGFuZGxlcjo6aW5mb3JtVmlzaWJsZUNvbnRl bnRDaGFuZ2UpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SGFuZGxlcjo6dmlld3BvcnRJ dGVtU2l6ZUNoYW5nZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxl ci5oOgorICAgICAgICAoUXRWaWV3cG9ydEhhbmRsZXIpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUNvb3JkaW5hdG9yL0xheWVy VHJlZUNvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlQ29vcmRpbmF0 b3I6OnNldFZpc2libGVDb250ZW50c1JlY3QpOgorCiAyMDEyLTA3LTA0ICBDaHJpc3RvcGhlIER1 bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF1bV0syXSBF d2tfVmlldyBzaG91bGQgcmVwb3J0IGxvYWQgZXJyb3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAppbmRleCBhMWY1NmQxODk4NGU4MjU4 OWE4ZjNjZDFhZjFmYjNiNDg3ZWU2YzJjLi5kMTRiMDhjYzAwNTc3MGM2YjZlYjcwODlkNjk5NTlh ZWNhNzM5YjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdw b3J0SGFuZGxlci5jcHAKQEAgLTg5LDcgKzg5LDcgQEAgcHVibGljOgogICAgICAgICBoYW5kbGVy LT5yZXN1bWVQYWdlQ29udGVudCgpOwogCiAgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGF0IHRpbGVz IGFsbCBhcm91bmQgdGhlIHZpZXdwb3J0IHdpbGwgYmUgcmVxdWVzdGVkLgotICAgICAgICBoYW5k bGVyLT5pbmZvcm1WaXNpYmxlQ29udGVudENoYW5nZShRUG9pbnRGKCkpOworICAgICAgICBoYW5k bGVyLT5pbmZvcm1WaXNpYmxlQ29udGVudENoYW5nZSgpOwogICAgIH0KIAogcHJpdmF0ZToKQEAg LTcwOSw3ICs3MDksMTAgQEAgdm9pZCBRdFZpZXdwb3J0SGFuZGxlcjo6aW5mb3JtVmlzaWJsZUNv bnRlbnRDaGFuZ2UoY29uc3QgUVBvaW50RiYgdHJhamVjdG9yeVZlY3QKICAgICBpZiAoIWRyYXdp bmdBcmVhKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9sYXN0VmlzaWJsZUNvbnRlbnRz UmVjdCA9PSB2aXNpYmxlQ29udGVudHNSZWN0KCkpCisgICAgY29uc3QgUVJlY3QgY3VycmVudFZp c2libGVDb250ZW50c1JlY3QgPSB2aXNpYmxlQ29udGVudHNSZWN0KCk7CisKKyAgICAvLyBBIHpl cm8gdHJhamVjdG9yeVZlY3RvciBpbmRpY2F0ZXMgdGhhdCB0aWxlcyBhbGwgYXJvdW5kIHRoZSB2 aWV3cG9ydCBhcmUgcmVxdWVzdGVkLgorICAgIGlmICghdHJhamVjdG9yeVZlY3Rvci5pc051bGwo KSAmJiBtX2xhc3RWaXNpYmxlQ29udGVudHNSZWN0ID09IGN1cnJlbnRWaXNpYmxlQ29udGVudHNS ZWN0KQogICAgICAgICByZXR1cm47CiAKICAgICBxcmVhbCBzY2FsZSA9IG1fcGFnZUl0ZW0tPmNv bnRlbnRzU2NhbGUoKTsKQEAgLTcxNyw5ICs3MjAsOSBAQCB2b2lkIFF0Vmlld3BvcnRIYW5kbGVy OjppbmZvcm1WaXNpYmxlQ29udGVudENoYW5nZShjb25zdCBRUG9pbnRGJiB0cmFqZWN0b3J5VmVj dAogICAgIGlmIChzY2FsZSAhPSBtX2xhc3RDb21taXR0ZWRTY2FsZSkKICAgICAgICAgZW1pdCBt X3ZpZXdwb3J0SXRlbS0+ZXhwZXJpbWVudGFsKCktPnRlc3QoKS0+Y29udGVudHNTY2FsZUNvbW1p dHRlZCgpOwogICAgIG1fbGFzdENvbW1pdHRlZFNjYWxlID0gc2NhbGU7Ci0gICAgbV9sYXN0Vmlz aWJsZUNvbnRlbnRzUmVjdCA9IHZpc2libGVDb250ZW50c1JlY3QoKTsKKyAgICBtX2xhc3RWaXNp YmxlQ29udGVudHNSZWN0ID0gY3VycmVudFZpc2libGVDb250ZW50c1JlY3Q7CiAKLSAgICBkcmF3 aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxlQ29udGVudHNSZWN0KCksIHNj YWxlLCB0cmFqZWN0b3J5VmVjdG9yLCBtX3ZpZXdwb3J0SXRlbS0+Y29udGVudFBvcygpKTsKKyAg ICBkcmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjdXJyZW50VmlzaWJsZUNvbnRl bnRzUmVjdCwgc2NhbGUsIHRyYWplY3RvcnlWZWN0b3IsIG1fdmlld3BvcnRJdGVtLT5jb250ZW50 UG9zKCkpOwogCiAgICAgLy8gRW5zdXJlIHRoYXQgdXBkYXRlUGFpbnROb2RlIGlzIGFsd2F5cyBj YWxsZWQgYmVmb3JlIHBhaW50aW5nLgogICAgIG1fcGFnZUl0ZW0tPnVwZGF0ZSgpOwpAQCAtNzM2 LDcgKzczOSw3IEBAIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6OnZpZXdwb3J0SXRlbVNpemVDaGFu Z2VkKCkKICAgICAvLyBpdCBjYW4gcmVzaXplIHRoZSBjb250ZW50IGFjY29yZGluZ2x5LgogICAg IG1fd2ViUGFnZVByb3h5LT5zZXRWaWV3cG9ydFNpemUodmlld3BvcnRTaXplKTsKIAotICAgIGlu Zm9ybVZpc2libGVDb250ZW50Q2hhbmdlKFFQb2ludEYoKSk7CisgICAgaW5mb3JtVmlzaWJsZUNv bnRlbnRDaGFuZ2UoKTsKIH0KIAogdm9pZCBRdFZpZXdwb3J0SGFuZGxlcjo6c2NhbGVDb250ZW50 KGNvbnN0IFFQb2ludEYmIGNlbnRlckluQ1NTQ29vcmRpbmF0ZXMsIHFyZWFsIGNzc1NjYWxlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVy LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuaAppbmRl eCBlNGE4YzUxZmI3NTc1ZDZlZTdkNDI0ODE5Mzk0MmIzYWZlMWEyYmRkLi41MTM2NTM2YjY5ZmJk MjMyNTdmMmNmMDRkNzI0YWQ5NTMzMDRjMjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuaApAQCAtMTY4LDcgKzE2OCw3IEBAIHByaXZhdGU6 CiAgICAgUVBvaW50RiBtX2xhc3RTY3JvbGxQb3NpdGlvbjsKICAgICBxcmVhbCBtX3BpbmNoU3Rh cnRTY2FsZTsKICAgICBxcmVhbCBtX2xhc3RDb21taXR0ZWRTY2FsZTsKLSAgICBRUmVjdEYgbV9s YXN0VmlzaWJsZUNvbnRlbnRzUmVjdDsKKyAgICBRUmVjdCBtX2xhc3RWaXNpYmxlQ29udGVudHNS ZWN0OwogICAgIHFyZWFsIG1fem9vbU91dFNjYWxlOwogICAgIFFMaXN0PFNjYWxlU3RhY2tJdGVt PiBtX3NjYWxlU3RhY2s7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRl eCA5YTdkMjkzNzdhZjE4OGRhZWRhZWJhNmNiNjFlZTBmODZhOGZhNzFkLi4zZDBlYmYzZTUyMjgy MjRiNDBkMTg1MjM2YzI1Y2JkMDAzOWU3ZDVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcApAQCAtMTIyNCw2ICsxMjI0LDEwIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6 OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQogICAgIGJvb2wgaXNNYWluRnJhbWUg PSB3ZWJQYWdlLT5tYWluV2ViRnJhbWUoKSA9PSBtX2ZyYW1lOwogICAgIGJvb2wgc2hvdWxkVXNl Rml4ZWRMYXlvdXQgPSBpc01haW5GcmFtZSAmJiB3ZWJQYWdlLT51c2VGaXhlZExheW91dCgpOwog CisgICAgSW50U2l6ZSBjdXJyZW50VmlzaWJsZUNvbnRlbnRTaXplOworICAgIGlmIChjb25zdCBG cmFtZVZpZXcqIHZpZXcgPSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpKQorICAgICAgICBj dXJyZW50VmlzaWJsZUNvbnRlbnRTaXplID0gdmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6 ZSgpOworCiAgICAgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UgPSBtX2ZyYW1lLT5j b3JlRnJhbWUoKS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNlKCk7CiAgICAg bV9mcmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9uID0gaXNNYWluRnJhbWUgJiYgV2ViUHJvY2Vz czo6c2hhcmVkKCkuc2hvdWxkVXNlQ3VzdG9tUmVwcmVzZW50YXRpb25Gb3JSZXNwb25zZShyZXNw b25zZSk7CiAgICAgbV9mcmFtZUNhbWVGcm9tUGFnZUNhY2hlID0gZmFsc2U7CkBAIC0xMjMxLDcg KzEyMzUsOCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0 ZWRGb3JOZXdQYWdlKCkKICAgICBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+Y3JlYXRlVmlldyh3ZWJQ YWdlLT5zaXplKCksIGJhY2tncm91bmRDb2xvciwgLyogdHJhbnNwYXJlbnQgKi8gZmFsc2UsIElu dFNpemUoKSwgc2hvdWxkVXNlRml4ZWRMYXlvdXQpOwogICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgp LT52aWV3KCktPnNldFRyYW5zcGFyZW50KCF3ZWJQYWdlLT5kcmF3c0JhY2tncm91bmQoKSk7CiAg ICAgaWYgKHNob3VsZFVzZUZpeGVkTGF5b3V0KQotICAgICAgICBtX2ZyYW1lLT5jb3JlRnJhbWUo KS0+dmlldygpLT5zZXRGaXhlZFZpc2libGVDb250ZW50UmVjdCh3ZWJQYWdlLT5ib3VuZHMoKSk7 CisgICAgICAgIC8vIFRoZSBIaXN0b3J5Q29udHJvbGxlciB3aWxsIHVwZGF0ZSB0aGUgc2Nyb2xs IHBvc2l0aW9uIGxhdGVyIGlmIG5lZWRlZC4KKyAgICAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCkt PnZpZXcoKS0+c2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3QoSW50UmVjdChJbnRQb2ludDo6emVy bygpLCBjdXJyZW50VmlzaWJsZUNvbnRlbnRTaXplKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpZFNhdmVUb1BhZ2VDYWNoZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlQ29vcmRpbmF0b3IvTGF5ZXJUcmVlQ29vcmRp bmF0b3IuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUNv b3JkaW5hdG9yL0xheWVyVHJlZUNvb3JkaW5hdG9yLmNwcAppbmRleCBmM2U4NzM1ZTVjMWI2NTAz YTcyMDQxNjk3YmQ1ZDI4NjQ3ODQwODJkLi45MzUyNmJhY2Q4NjBlYTg0NmQ5OGVhODkzYzQ0Nzcw ZTM5MTVjNGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv TGF5ZXJUcmVlQ29vcmRpbmF0b3IvTGF5ZXJUcmVlQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVDb29yZGluYXRvci9MYXllclRy ZWVDb29yZGluYXRvci5jcHAKQEAgLTUxMiw4ICs1MTIsNyBAQCB2b2lkIExheWVyVHJlZUNvb3Jk aW5hdG9yOjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QsIGZsb2F0 IHNjYQogICAgIGJvb2wgY29udGVudHNSZWN0RGlkQ2hhbmdlID0gcmVjdCAhPSBtX3Zpc2libGVD b250ZW50c1JlY3Q7CiAgICAgYm9vbCBjb250ZW50c1NjYWxlRGlkQ2hhbmdlID0gc2NhbGUgIT0g bV9jb250ZW50c1NjYWxlOwogCi0gICAgaWYgKHRyYWplY3RvcnlWZWN0b3IgIT0gRmxvYXRQb2lu dDo6emVybygpKQotICAgICAgICB0b1dlYkdyYXBoaWNzTGF5ZXIobV9ub25Db21wb3NpdGVkQ29u dGVudExheWVyLmdldCgpKS0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0VHJhamVjdG9yeVZlY3Rvcih0 cmFqZWN0b3J5VmVjdG9yKTsKKyAgICB0b1dlYkdyYXBoaWNzTGF5ZXIobV9ub25Db21wb3NpdGVk Q29udGVudExheWVyLmdldCgpKS0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0VHJhamVjdG9yeVZlY3Rv cih0cmFqZWN0b3J5VmVjdG9yKTsKIAogICAgIGlmIChjb250ZW50c1JlY3REaWRDaGFuZ2UgfHwg Y29udGVudHNTY2FsZURpZENoYW5nZSkgewogICAgICAgICBtX3Zpc2libGVDb250ZW50c1JlY3Qg PSByZWN0Owo= 151070 2012-07-06 06:06:39 -0700 2012-07-06 06:27:00 -0700 updated patch 0001-PATCH.patch text/plain 10777 abecsi RnJvbSBjYmU1NTA4NGIwMjE3OGVmMDExOTE4MWE2ODdmNmQ5MGE5N2NhNzE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyYXMgQmVjc2kgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+ CkRhdGU6IEZyaSwgNiBKdWwgMjAxMiAxNTowNTo0NCArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIFBB VENICgotLS0KIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAzNSArKysrKysrKysrKysrKysrKysrKwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAgICAgICAgICAgfCAgICAyIC0tCiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmggICAgICAgICAgICB8ICAgIDIgLS0KIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHAgIHwgICAxMyArKysrKy0tLQogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmggICAgfCAgICAyICst CiAuLi4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwICAgICAgICB8ICAg IDggKysrLS0KIC4uLi9MYXllclRyZWVDb29yZGluYXRvci9MYXllclRyZWVDb29yZGluYXRvci5j cHAgIHwgICAgNCArLS0KIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcCAgICAgIHwgICAgNSArKy0KIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmggICAgICAgIHwgICAgNCArLS0KIDkgZmlsZXMgY2hhbmdlZCwgNTUgaW5zZXJ0aW9u cygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDhmMDUyYjcuLjU0Y2U1NTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMi0wNy0wNiAgQW5kcmFzIEJlY3NpICA8YW5k cmFzLmJlY3NpQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gSW1wcm92ZSB2aXNpYmxl IGNvbnRlbnQgcmVjdCB1cGRhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTkwNTQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQXZvaWQgdGhlIGV4dHJhIHdvcmsgb2YgY29tcHV0aW5nIHRoZSB2aXNpYmxl IHJlY3QgbXVsdGlwbGUKKyAgICAgICAgdGltZXMgd2l0aGluIHRoZSBub3RpZmljYXRpb24gZnVu Y3Rpb24gaW4gUXRWaWV3cG9ydEhhbmRsZXIKKyAgICAgICAgYW5kIHNldCBhIGNvcnJlY3QgZml4 ZWQgdmlzaWJsZSBjb250ZW50IHJlY3QgZHVyaW5nIHBhZ2UgbG9hZC4KKyAgICAgICAgQWxzbyBt YWtlIHN1cmUgdGhhdCBub3RpZmljYXRpb25zIHdpdGggYSBudWxsIHRyYWplY3RvcnkKKyAgICAg ICAgdmVjdG9yIHJlYWNoIHRoZSBiYWNraW5nIHN0b3JlIHNpbmNlIGEgbnVsbCB2ZWN0b3IgbWVh bnMKKyAgICAgICAgdGhhdCBhbGwgdGlsZXMgYXJvdW5kIHRoZSB2aWV3cG9ydCB3ZXJlIHJlcXVl c3RlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldFZpZXdwb3J0U2l6ZSk6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViUGFnZVByb3h5KToKKyAgICAgICAgKiBV SVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3 cG9ydFVwZGF0ZURlZmVycmVyOjp+Vmlld3BvcnRVcGRhdGVEZWZlcnJlcik6CisgICAgICAgIChX ZWJLaXQ6OlF0Vmlld3BvcnRIYW5kbGVyOjppbmZvcm1WaXNpYmxlQ29udGVudENoYW5nZSk6Cisg ICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRIYW5kbGVyOjp2aWV3cG9ydEl0ZW1TaXplQ2hhbmdl ZCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmg6CisgICAgICAg IChRdFZpZXdwb3J0SGFuZGxlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9h ZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlQ29vcmRpbmF0b3IvTGF5ZXJUcmVlQ29vcmRpbmF0 b3IuY3BwOgorICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVDb29yZGluYXRvcjo6c2V0VmlzaWJs ZUNvbnRlbnRzUmVjdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5 b3V0U2l6ZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpz ZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6 CisgICAgICAgIChXZWJQYWdlKToKKwogMjAxMi0wNy0wNSAgQ2hyaXN0b3BoZSBEdW1leiAgPGNo cmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtXSzJdW0VGTF0gRXdrX1ZpZXcg bmVlZHMgdG8gcmVwb3J0IGxvYWQgc3RhdHVzIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggODU3MDllZi4uZWNmY2M4MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTkwMiw3ICs5MDIsNiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUVkaXRDb21tYW5kKGNvbnN0IFN0cmluZyYgY29tbWFuZE5h bWUpCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpFeGVjdXRlRWRpdENv bW1hbmQoY29tbWFuZE5hbWUpLCBtX3BhZ2VJRCk7CiB9CiAgICAgCi0jaWYgVVNFKFRJTEVEX0JB Q0tJTkdfU1RPUkUpCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0IElu dFNpemUmIHNpemUpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCkBAIC05MTAsNyArOTA5LDYgQEAg dm9pZCBXZWJQYWdlUHJveHk6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQog CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRWaWV3cG9ydFNpemUo c2l6ZSksIG1fcGFnZUlEKTsKIH0KLSNlbmRpZgogCiAjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkK IHZvaWQgV2ViUGFnZVByb3h5OjpkcmFnRW50ZXJlZChEcmFnRGF0YSogZHJhZ0RhdGEsIGNvbnN0 IFN0cmluZyYgZHJhZ1N0b3JhZ2VOYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCmluZGV4IDU3YWI4NmMuLmNlNzM2YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKQEAgLTQxMSw5ICs0MTEsNyBAQCBwdWJsaWM6CiAjaWYgVVNFKENBSVJP KSAmJiAhUExBVEZPUk0oV0lOX0NBSVJPKQogICAgIFBsYXRmb3JtV2lkZ2V0IHZpZXdXaWRnZXQo KTsKICNlbmRpZgotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIHZvaWQgc2V0Vmll d3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKLSNlbmRpZgogCiAgICAgdm9pZCBo YW5kbGVNb3VzZUV2ZW50KGNvbnN0IE5hdGl2ZVdlYk1vdXNlRXZlbnQmKTsKICAgICB2b2lkIGhh bmRsZVdoZWVsRXZlbnQoY29uc3QgTmF0aXZlV2ViV2hlZWxFdmVudCYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHAKaW5kZXggYTFmNTZk MS4uZDE0YjA4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEhhbmRsZXIuY3BwCkBAIC04OSw3ICs4OSw3IEBAIHB1YmxpYzoKICAgICAgICAgaGFuZGxl ci0+cmVzdW1lUGFnZUNvbnRlbnQoKTsKIAogICAgICAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aWxl cyBhbGwgYXJvdW5kIHRoZSB2aWV3cG9ydCB3aWxsIGJlIHJlcXVlc3RlZC4KLSAgICAgICAgaGFu ZGxlci0+aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoUVBvaW50RigpKTsKKyAgICAgICAgaGFu ZGxlci0+aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoKTsKICAgICB9CiAKIHByaXZhdGU6CkBA IC03MDksNyArNzA5LDEwIEBAIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6OmluZm9ybVZpc2libGVD b250ZW50Q2hhbmdlKGNvbnN0IFFQb2ludEYmIHRyYWplY3RvcnlWZWN0CiAgICAgaWYgKCFkcmF3 aW5nQXJlYSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fbGFzdFZpc2libGVDb250ZW50 c1JlY3QgPT0gdmlzaWJsZUNvbnRlbnRzUmVjdCgpKQorICAgIGNvbnN0IFFSZWN0IGN1cnJlbnRW aXNpYmxlQ29udGVudHNSZWN0ID0gdmlzaWJsZUNvbnRlbnRzUmVjdCgpOworCisgICAgLy8gQSB6 ZXJvIHRyYWplY3RvcnlWZWN0b3IgaW5kaWNhdGVzIHRoYXQgdGlsZXMgYWxsIGFyb3VuZCB0aGUg dmlld3BvcnQgYXJlIHJlcXVlc3RlZC4KKyAgICBpZiAoIXRyYWplY3RvcnlWZWN0b3IuaXNOdWxs KCkgJiYgbV9sYXN0VmlzaWJsZUNvbnRlbnRzUmVjdCA9PSBjdXJyZW50VmlzaWJsZUNvbnRlbnRz UmVjdCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcXJlYWwgc2NhbGUgPSBtX3BhZ2VJdGVtLT5j b250ZW50c1NjYWxlKCk7CkBAIC03MTcsOSArNzIwLDkgQEAgdm9pZCBRdFZpZXdwb3J0SGFuZGxl cjo6aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoY29uc3QgUVBvaW50RiYgdHJhamVjdG9yeVZl Y3QKICAgICBpZiAoc2NhbGUgIT0gbV9sYXN0Q29tbWl0dGVkU2NhbGUpCiAgICAgICAgIGVtaXQg bV92aWV3cG9ydEl0ZW0tPmV4cGVyaW1lbnRhbCgpLT50ZXN0KCktPmNvbnRlbnRzU2NhbGVDb21t aXR0ZWQoKTsKICAgICBtX2xhc3RDb21taXR0ZWRTY2FsZSA9IHNjYWxlOwotICAgIG1fbGFzdFZp c2libGVDb250ZW50c1JlY3QgPSB2aXNpYmxlQ29udGVudHNSZWN0KCk7CisgICAgbV9sYXN0Vmlz aWJsZUNvbnRlbnRzUmVjdCA9IGN1cnJlbnRWaXNpYmxlQ29udGVudHNSZWN0OwogCi0gICAgZHJh d2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZUNvbnRlbnRzUmVjdCgpLCBz Y2FsZSwgdHJhamVjdG9yeVZlY3RvciwgbV92aWV3cG9ydEl0ZW0tPmNvbnRlbnRQb3MoKSk7Cisg ICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QoY3VycmVudFZpc2libGVDb250 ZW50c1JlY3QsIHNjYWxlLCB0cmFqZWN0b3J5VmVjdG9yLCBtX3ZpZXdwb3J0SXRlbS0+Y29udGVu dFBvcygpKTsKIAogICAgIC8vIEVuc3VyZSB0aGF0IHVwZGF0ZVBhaW50Tm9kZSBpcyBhbHdheXMg Y2FsbGVkIGJlZm9yZSBwYWludGluZy4KICAgICBtX3BhZ2VJdGVtLT51cGRhdGUoKTsKQEAgLTcz Niw3ICs3MzksNyBAQCB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjp2aWV3cG9ydEl0ZW1TaXplQ2hh bmdlZCgpCiAgICAgLy8gaXQgY2FuIHJlc2l6ZSB0aGUgY29udGVudCBhY2NvcmRpbmdseS4KICAg ICBtX3dlYlBhZ2VQcm94eS0+c2V0Vmlld3BvcnRTaXplKHZpZXdwb3J0U2l6ZSk7CiAKLSAgICBp bmZvcm1WaXNpYmxlQ29udGVudENoYW5nZShRUG9pbnRGKCkpOworICAgIGluZm9ybVZpc2libGVD b250ZW50Q2hhbmdlKCk7CiB9CiAKIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6OnNjYWxlQ29udGVu dChjb25zdCBRUG9pbnRGJiBjZW50ZXJJbkNTU0Nvb3JkaW5hdGVzLCBxcmVhbCBjc3NTY2FsZSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxl ci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmgKaW5k ZXggZTRhOGM1MS4uNTEzNjUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0Vmlld3BvcnRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld3BvcnRIYW5kbGVyLmgKQEAgLTE2OCw3ICsxNjgsNyBAQCBwcml2YXRlOgogICAgIFFQ b2ludEYgbV9sYXN0U2Nyb2xsUG9zaXRpb247CiAgICAgcXJlYWwgbV9waW5jaFN0YXJ0U2NhbGU7 CiAgICAgcXJlYWwgbV9sYXN0Q29tbWl0dGVkU2NhbGU7Ci0gICAgUVJlY3RGIG1fbGFzdFZpc2li bGVDb250ZW50c1JlY3Q7CisgICAgUVJlY3QgbV9sYXN0VmlzaWJsZUNvbnRlbnRzUmVjdDsKICAg ICBxcmVhbCBtX3pvb21PdXRTY2FsZTsKICAgICBRTGlzdDxTY2FsZVN0YWNrSXRlbT4gbV9zY2Fs ZVN0YWNrOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggOWE3ZDI5 My4uOWFkNDZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTEyMzAs OCArMTIzMCwxMiBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21t aXR0ZWRGb3JOZXdQYWdlKCkKIAogICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5jcmVhdGVWaWV3 KHdlYlBhZ2UtPnNpemUoKSwgYmFja2dyb3VuZENvbG9yLCAvKiB0cmFuc3BhcmVudCAqLyBmYWxz ZSwgSW50U2l6ZSgpLCBzaG91bGRVc2VGaXhlZExheW91dCk7CiAgICAgbV9mcmFtZS0+Y29yZUZy YW1lKCktPnZpZXcoKS0+c2V0VHJhbnNwYXJlbnQoIXdlYlBhZ2UtPmRyYXdzQmFja2dyb3VuZCgp KTsKLSAgICBpZiAoc2hvdWxkVXNlRml4ZWRMYXlvdXQpCi0gICAgICAgIG1fZnJhbWUtPmNvcmVG cmFtZSgpLT52aWV3KCktPnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KHdlYlBhZ2UtPmJvdW5k cygpKTsKKyAgICBpZiAoc2hvdWxkVXNlRml4ZWRMYXlvdXQpIHsKKyAgICAgICAgSW50UmVjdCB2 aXNpYmxlQ29udGVudFJlY3Qod2ViUGFnZS0+Ym91bmRzKCkpOworICAgICAgICAvLyBUaGUgSGlz dG9yeUNvbnRyb2xsZXIgd2lsbCB1cGRhdGUgdGhlIHNjcm9sbCBwb3NpdGlvbiBsYXRlciBpZiBu ZWVkZWQuCisgICAgICAgIHZpc2libGVDb250ZW50UmVjdC5pbnRlcnNlY3QoSW50UmVjdChJbnRQ b2ludDo6emVybygpLCB3ZWJQYWdlLT52aWV3cG9ydFNpemUoKSkpOworICAgICAgICBtX2ZyYW1l LT5jb3JlRnJhbWUoKS0+dmlldygpLT5zZXRGaXhlZFZpc2libGVDb250ZW50UmVjdCh2aXNpYmxl Q29udGVudFJlY3QpOworICAgIH0KIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlk U2F2ZVRvUGFnZUNhY2hlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9MYXllclRyZWVDb29yZGluYXRvci9MYXllclRyZWVDb29yZGluYXRvci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlQ29vcmRpbmF0b3IvTGF5 ZXJUcmVlQ29vcmRpbmF0b3IuY3BwCmluZGV4IGYzZTg3MzUuLjFhMTU5NTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVDb29yZGluYXRvci9M YXllclRyZWVDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0xheWVyVHJlZUNvb3JkaW5hdG9yL0xheWVyVHJlZUNvb3JkaW5hdG9yLmNwcApAQCAt NTEyLDggKzUxMiw4IEBAIHZvaWQgTGF5ZXJUcmVlQ29vcmRpbmF0b3I6OnNldFZpc2libGVDb250 ZW50c1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhCiAgICAgYm9vbCBjb250ZW50 c1JlY3REaWRDaGFuZ2UgPSByZWN0ICE9IG1fdmlzaWJsZUNvbnRlbnRzUmVjdDsKICAgICBib29s IGNvbnRlbnRzU2NhbGVEaWRDaGFuZ2UgPSBzY2FsZSAhPSBtX2NvbnRlbnRzU2NhbGU7CiAKLSAg ICBpZiAodHJhamVjdG9yeVZlY3RvciAhPSBGbG9hdFBvaW50Ojp6ZXJvKCkpCi0gICAgICAgIHRv V2ViR3JhcGhpY3NMYXllcihtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIuZ2V0KCkpLT5zZXRW aXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKHRyYWplY3RvcnlWZWN0b3IpOworICAg IC8vIEEgemVybyB0cmFqZWN0b3J5VmVjdG9yIGluZGljYXRlcyB0aGF0IHRpbGVzIGFsbCBhcm91 bmQgdGhlIHZpZXdwb3J0IGFyZSByZXF1ZXN0ZWQuCisgICAgdG9XZWJHcmFwaGljc0xheWVyKG1f bm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci5nZXQoKSktPnNldFZpc2libGVDb250ZW50UmVjdFRy YWplY3RvcnlWZWN0b3IodHJhamVjdG9yeVZlY3Rvcik7CiAKICAgICBpZiAoY29udGVudHNSZWN0 RGlkQ2hhbmdlIHx8IGNvbnRlbnRzU2NhbGVEaWRDaGFuZ2UpIHsKICAgICAgICAgbV92aXNpYmxl Q29udGVudHNSZWN0ID0gcmVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAppbmRleCAyNjY3NDZlLi5lMmJjYjVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC05MjMsNiArOTIzLDcgQEAgdm9p ZCBXZWJQYWdlOjpzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCgpCiAgICAgc2V0UmVzaXpl c1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoSW50U2l6ZShzdGF0aWNfY2FzdDxpbnQ+KGF0dHIu bGF5b3V0U2l6ZS53aWR0aCgpKSwgc3RhdGljX2Nhc3Q8aW50PihhdHRyLmxheW91dFNpemUuaGVp Z2h0KCkpKSk7CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VWaWV3 cG9ydFByb3BlcnRpZXMoYXR0cikpOwogfQorI2VuZGlmIC8vIFVTRShUSUxFRF9CQUNLSU5HX1NU T1JFKQogCiB2b2lkIFdlYlBhZ2U6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiBzaXpl KQogewpAQCAtOTMxLDEzICs5MzIsMTEgQEAgdm9pZCBXZWJQYWdlOjpzZXRWaWV3cG9ydFNpemUo Y29uc3QgSW50U2l6ZSYgc2l6ZSkKICAgICBpZiAobV92aWV3cG9ydFNpemUgPT0gc2l6ZSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgIG1fdmlld3BvcnRTaXplID0gc2l6ZTsKKyAgICBtX3ZpZXdw b3J0U2l6ZSA9IHNpemU7CiAKICAgICBzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCgpOwog fQogCi0jZW5kaWYKLQogdm9pZCBXZWJQYWdlOjpzY3JvbGxNYWluRnJhbWVJZk5vdEF0TWF4U2Ny b2xsUG9zaXRpb24oY29uc3QgSW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KQogewogICAgIEZyYW1lKiBm cmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAppbmRleCAxYTEzYjZjLi44ZWFkOGVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTM2Niw5ICszNjYsOSBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZShjb25zdCBX ZWJDb3JlOjpJbnRTaXplJik7CiAgICAgdm9pZCByZXNpemVUb0NvbnRlbnRzSWZOZWVkZWQoKTsK ICAgICB2b2lkIHNlbmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKCk7CisjZW5kaWYKICAgICB2 b2lkIHNldFZpZXdwb3J0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAgICAgV2ViQ29y ZTo6SW50U2l6ZSB2aWV3cG9ydFNpemUoKSBjb25zdCB7IHJldHVybiBtX3ZpZXdwb3J0U2l6ZTsg fQotI2VuZGlmCiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAgICBXZWJDb250ZXh0TWVu dSogY29udGV4dE1lbnUoKTsKQEAgLTgwMiw5ICs4MDIsNyBAQCBwcml2YXRlOgogICAgIEluamVj dGVkQnVuZGxlUGFnZUZ1bGxTY3JlZW5DbGllbnQgbV9mdWxsU2NyZWVuQ2xpZW50OwogI2VuZGlm CiAKLSNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICBXZWJDb3JlOjpJbnRTaXplIG1f dmlld3BvcnRTaXplOwotI2VuZGlmCiAKICAgICBGaW5kQ29udHJvbGxlciBtX2ZpbmRDb250cm9s bGVyOwogI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpICYmIFBMQVRGT1JNKFFUKQotLSAKMS43LjEw LjQKCg== 151073 2012-07-06 06:27:00 -0700 2012-07-06 06:41:36 -0700 updated patch patch.diff text/plain 10605 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4ZjA1MmI3Li45ZTU3ODZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEg QEAKKzIwMTItMDctMDYgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisK KyAgICAgICAgW1F0XVtXSzJdIEltcHJvdmUgdmlzaWJsZSBjb250ZW50IHJlY3QgdXBkYXRlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDU0NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF2b2lkIHRoZSBl eHRyYSB3b3JrIG9mIGNvbXB1dGluZyB0aGUgdmlzaWJsZSByZWN0IG11bHRpcGxlCisgICAgICAg IHRpbWVzIHdpdGhpbiB0aGUgbm90aWZpY2F0aW9uIGZ1bmN0aW9uIGluIFF0Vmlld3BvcnRIYW5k bGVyCisgICAgICAgIGFuZCBzZXQgYSBjb3JyZWN0IGZpeGVkIHZpc2libGUgY29udGVudCByZWN0 IGR1cmluZyBwYWdlIGxvYWQuCisgICAgICAgIEFsc28gbWFrZSBzdXJlIHRoYXQgbm90aWZpY2F0 aW9ucyB3aXRoIGEgbnVsbCB0cmFqZWN0b3J5CisgICAgICAgIHZlY3RvciByZWFjaCB0aGUgYmFj a2luZyBzdG9yZSBzaW5jZSBhIG51bGwgdmVjdG9yIG1lYW5zCisgICAgICAgIHRoYXQgYWxsIHRp bGVzIGFyb3VuZCB0aGUgdmlld3BvcnQgd2VyZSByZXF1ZXN0ZWQuCisgICAgICAgIFNpbmNlIHRo ZSB2aWV3cG9ydCBzaXplIGlzIG9ubHkgYXZhaWxhYmxlIGZyb20gV2ViUGFnZQorICAgICAgICBh dCB0aGlzIHBvaW50IG1vdmUgdGhlIG5lZWRlZCBmdW5jdGlvbnMgb3V0IG9mIHRoZQorICAgICAg ICBUSUxFRF9CQUNLSU5HX1NUT1JFIGd1YXJkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRT aXplKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJQ YWdlUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6On5WaWV3cG9ydFVwZGF0 ZURlZmVycmVyKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6OmluZm9ybVZp c2libGVDb250ZW50Q2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6 OnZpZXdwb3J0SXRlbVNpemVDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEhhbmRsZXIuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRIYW5kbGVyKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZv ck5ld1BhZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVDb29yZGlu YXRvci9MYXllclRyZWVDb29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJl ZUNvb3JkaW5hdG9yOjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmg6CisgICAgICAgIChXZWJQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwogMjAxMi0wNy0wNSAgQ2hyaXN0b3BoZSBE dW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtXSzJdW0VGTF0g RXdrX1ZpZXcgbmVlZHMgdG8gcmVwb3J0IGxvYWQgc3RhdHVzIGNoYW5nZXMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggODU3MDllZi4uZWNmY2M4MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTkwMiw3ICs5MDIs NiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUVkaXRDb21tYW5kKGNvbnN0IFN0cmluZyYg Y29tbWFuZE5hbWUpCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpFeGVj dXRlRWRpdENvbW1hbmQoY29tbWFuZE5hbWUpLCBtX3BhZ2VJRCk7CiB9CiAgICAgCi0jaWYgVVNF KFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRTaXpl KGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCkBAIC05MTAsNyAr OTA5LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXpl JiBzaXplKQogCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRWaWV3 cG9ydFNpemUoc2l6ZSksIG1fcGFnZUlEKTsKIH0KLSNlbmRpZgogCiAjaWYgRU5BQkxFKERSQUdf U1VQUE9SVCkKIHZvaWQgV2ViUGFnZVByb3h5OjpkcmFnRW50ZXJlZChEcmFnRGF0YSogZHJhZ0Rh dGEsIGNvbnN0IFN0cmluZyYgZHJhZ1N0b3JhZ2VOYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCmluZGV4IDU3YWI4NmMuLmNlNzM2YzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTQxMSw5ICs0MTEsNyBAQCBwdWJsaWM6CiAjaWYg VVNFKENBSVJPKSAmJiAhUExBVEZPUk0oV0lOX0NBSVJPKQogICAgIFBsYXRmb3JtV2lkZ2V0IHZp ZXdXaWRnZXQoKTsKICNlbmRpZgotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIHZv aWQgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKLSNlbmRpZgogCiAg ICAgdm9pZCBoYW5kbGVNb3VzZUV2ZW50KGNvbnN0IE5hdGl2ZVdlYk1vdXNlRXZlbnQmKTsKICAg ICB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgTmF0aXZlV2ViV2hlZWxFdmVudCYpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHAKaW5k ZXggYTFmNTZkMS4uZDE0YjA4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwCkBAIC04OSw3ICs4OSw3IEBAIHB1YmxpYzoKICAgICAg ICAgaGFuZGxlci0+cmVzdW1lUGFnZUNvbnRlbnQoKTsKIAogICAgICAgICAvLyBNYWtlIHN1cmUg dGhhdCB0aWxlcyBhbGwgYXJvdW5kIHRoZSB2aWV3cG9ydCB3aWxsIGJlIHJlcXVlc3RlZC4KLSAg ICAgICAgaGFuZGxlci0+aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoUVBvaW50RigpKTsKKyAg ICAgICAgaGFuZGxlci0+aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoKTsKICAgICB9CiAKIHBy aXZhdGU6CkBAIC03MDksNyArNzA5LDEwIEBAIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6OmluZm9y bVZpc2libGVDb250ZW50Q2hhbmdlKGNvbnN0IFFQb2ludEYmIHRyYWplY3RvcnlWZWN0CiAgICAg aWYgKCFkcmF3aW5nQXJlYSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fbGFzdFZpc2li bGVDb250ZW50c1JlY3QgPT0gdmlzaWJsZUNvbnRlbnRzUmVjdCgpKQorICAgIGNvbnN0IFFSZWN0 IGN1cnJlbnRWaXNpYmxlQ29udGVudHNSZWN0ID0gdmlzaWJsZUNvbnRlbnRzUmVjdCgpOworCisg ICAgLy8gQSB6ZXJvIHRyYWplY3RvcnlWZWN0b3IgaW5kaWNhdGVzIHRoYXQgdGlsZXMgYWxsIGFy b3VuZCB0aGUgdmlld3BvcnQgYXJlIHJlcXVlc3RlZC4KKyAgICBpZiAoIXRyYWplY3RvcnlWZWN0 b3IuaXNOdWxsKCkgJiYgbV9sYXN0VmlzaWJsZUNvbnRlbnRzUmVjdCA9PSBjdXJyZW50VmlzaWJs ZUNvbnRlbnRzUmVjdCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcXJlYWwgc2NhbGUgPSBtX3Bh Z2VJdGVtLT5jb250ZW50c1NjYWxlKCk7CkBAIC03MTcsOSArNzIwLDkgQEAgdm9pZCBRdFZpZXdw b3J0SGFuZGxlcjo6aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoY29uc3QgUVBvaW50RiYgdHJh amVjdG9yeVZlY3QKICAgICBpZiAoc2NhbGUgIT0gbV9sYXN0Q29tbWl0dGVkU2NhbGUpCiAgICAg ICAgIGVtaXQgbV92aWV3cG9ydEl0ZW0tPmV4cGVyaW1lbnRhbCgpLT50ZXN0KCktPmNvbnRlbnRz U2NhbGVDb21taXR0ZWQoKTsKICAgICBtX2xhc3RDb21taXR0ZWRTY2FsZSA9IHNjYWxlOwotICAg IG1fbGFzdFZpc2libGVDb250ZW50c1JlY3QgPSB2aXNpYmxlQ29udGVudHNSZWN0KCk7CisgICAg bV9sYXN0VmlzaWJsZUNvbnRlbnRzUmVjdCA9IGN1cnJlbnRWaXNpYmxlQ29udGVudHNSZWN0Owog Ci0gICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZUNvbnRlbnRz UmVjdCgpLCBzY2FsZSwgdHJhamVjdG9yeVZlY3RvciwgbV92aWV3cG9ydEl0ZW0tPmNvbnRlbnRQ b3MoKSk7CisgICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QoY3VycmVudFZp c2libGVDb250ZW50c1JlY3QsIHNjYWxlLCB0cmFqZWN0b3J5VmVjdG9yLCBtX3ZpZXdwb3J0SXRl bS0+Y29udGVudFBvcygpKTsKIAogICAgIC8vIEVuc3VyZSB0aGF0IHVwZGF0ZVBhaW50Tm9kZSBp cyBhbHdheXMgY2FsbGVkIGJlZm9yZSBwYWludGluZy4KICAgICBtX3BhZ2VJdGVtLT51cGRhdGUo KTsKQEAgLTczNiw3ICs3MzksNyBAQCB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjp2aWV3cG9ydEl0 ZW1TaXplQ2hhbmdlZCgpCiAgICAgLy8gaXQgY2FuIHJlc2l6ZSB0aGUgY29udGVudCBhY2NvcmRp bmdseS4KICAgICBtX3dlYlBhZ2VQcm94eS0+c2V0Vmlld3BvcnRTaXplKHZpZXdwb3J0U2l6ZSk7 CiAKLSAgICBpbmZvcm1WaXNpYmxlQ29udGVudENoYW5nZShRUG9pbnRGKCkpOworICAgIGluZm9y bVZpc2libGVDb250ZW50Q2hhbmdlKCk7CiB9CiAKIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6OnNj YWxlQ29udGVudChjb25zdCBRUG9pbnRGJiBjZW50ZXJJbkNTU0Nvb3JkaW5hdGVzLCBxcmVhbCBj c3NTY2FsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdw b3J0SGFuZGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5k bGVyLmgKaW5kZXggZTRhOGM1MS4uNTEzNjUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmgKQEAgLTE2OCw3ICsxNjgsNyBAQCBwcml2YXRl OgogICAgIFFQb2ludEYgbV9sYXN0U2Nyb2xsUG9zaXRpb247CiAgICAgcXJlYWwgbV9waW5jaFN0 YXJ0U2NhbGU7CiAgICAgcXJlYWwgbV9sYXN0Q29tbWl0dGVkU2NhbGU7Ci0gICAgUVJlY3RGIG1f bGFzdFZpc2libGVDb250ZW50c1JlY3Q7CisgICAgUVJlY3QgbV9sYXN0VmlzaWJsZUNvbnRlbnRz UmVjdDsKICAgICBxcmVhbCBtX3pvb21PdXRTY2FsZTsKICAgICBRTGlzdDxTY2FsZVN0YWNrSXRl bT4gbV9zY2FsZVN0YWNrOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5k ZXggOWE3ZDI5My4uOWFkNDZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAK QEAgLTEyMzAsOCArMTIzMCwxMiBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0 aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKIAogICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5j cmVhdGVWaWV3KHdlYlBhZ2UtPnNpemUoKSwgYmFja2dyb3VuZENvbG9yLCAvKiB0cmFuc3BhcmVu dCAqLyBmYWxzZSwgSW50U2l6ZSgpLCBzaG91bGRVc2VGaXhlZExheW91dCk7CiAgICAgbV9mcmFt ZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0VHJhbnNwYXJlbnQoIXdlYlBhZ2UtPmRyYXdzQmFj a2dyb3VuZCgpKTsKLSAgICBpZiAoc2hvdWxkVXNlRml4ZWRMYXlvdXQpCi0gICAgICAgIG1fZnJh bWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KHdlYlBh Z2UtPmJvdW5kcygpKTsKKyAgICBpZiAoc2hvdWxkVXNlRml4ZWRMYXlvdXQpIHsKKyAgICAgICAg SW50UmVjdCB2aXNpYmxlQ29udGVudFJlY3Qod2ViUGFnZS0+Ym91bmRzKCkpOworICAgICAgICAv LyBUaGUgSGlzdG9yeUNvbnRyb2xsZXIgd2lsbCB1cGRhdGUgdGhlIHNjcm9sbCBwb3NpdGlvbiBs YXRlciBpZiBuZWVkZWQuCisgICAgICAgIHZpc2libGVDb250ZW50UmVjdC5pbnRlcnNlY3QoSW50 UmVjdChJbnRQb2ludDo6emVybygpLCB3ZWJQYWdlLT52aWV3cG9ydFNpemUoKSkpOworICAgICAg ICBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpLT5zZXRGaXhlZFZpc2libGVDb250ZW50UmVj dCh2aXNpYmxlQ29udGVudFJlY3QpOworICAgIH0KIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNs aWVudDo6ZGlkU2F2ZVRvUGFnZUNhY2hlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVDb29yZGluYXRvci9MYXllclRyZWVDb29yZGluYXRv ci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlQ29vcmRp bmF0b3IvTGF5ZXJUcmVlQ29vcmRpbmF0b3IuY3BwCmluZGV4IGYzZTg3MzUuLjFhMTU5NTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVDb29y ZGluYXRvci9MYXllclRyZWVDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUNvb3JkaW5hdG9yL0xheWVyVHJlZUNvb3JkaW5hdG9y LmNwcApAQCAtNTEyLDggKzUxMiw4IEBAIHZvaWQgTGF5ZXJUcmVlQ29vcmRpbmF0b3I6OnNldFZp c2libGVDb250ZW50c1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhCiAgICAgYm9v bCBjb250ZW50c1JlY3REaWRDaGFuZ2UgPSByZWN0ICE9IG1fdmlzaWJsZUNvbnRlbnRzUmVjdDsK ICAgICBib29sIGNvbnRlbnRzU2NhbGVEaWRDaGFuZ2UgPSBzY2FsZSAhPSBtX2NvbnRlbnRzU2Nh bGU7CiAKLSAgICBpZiAodHJhamVjdG9yeVZlY3RvciAhPSBGbG9hdFBvaW50Ojp6ZXJvKCkpCi0g ICAgICAgIHRvV2ViR3JhcGhpY3NMYXllcihtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIuZ2V0 KCkpLT5zZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKHRyYWplY3RvcnlWZWN0 b3IpOworICAgIC8vIEEgemVybyB0cmFqZWN0b3J5VmVjdG9yIGluZGljYXRlcyB0aGF0IHRpbGVz IGFsbCBhcm91bmQgdGhlIHZpZXdwb3J0IGFyZSByZXF1ZXN0ZWQuCisgICAgdG9XZWJHcmFwaGlj c0xheWVyKG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci5nZXQoKSktPnNldFZpc2libGVDb250 ZW50UmVjdFRyYWplY3RvcnlWZWN0b3IodHJhamVjdG9yeVZlY3Rvcik7CiAKICAgICBpZiAoY29u dGVudHNSZWN0RGlkQ2hhbmdlIHx8IGNvbnRlbnRzU2NhbGVEaWRDaGFuZ2UpIHsKICAgICAgICAg bV92aXNpYmxlQ29udGVudHNSZWN0ID0gcmVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAyNjY3NDZlLi5lMmJjYjVkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC05MjMsNiArOTIz LDcgQEAgdm9pZCBXZWJQYWdlOjpzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCgpCiAgICAg c2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoSW50U2l6ZShzdGF0aWNfY2FzdDxp bnQ+KGF0dHIubGF5b3V0U2l6ZS53aWR0aCgpKSwgc3RhdGljX2Nhc3Q8aW50PihhdHRyLmxheW91 dFNpemUuaGVpZ2h0KCkpKSk7CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRD aGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoYXR0cikpOwogfQorI2VuZGlmIC8vIFVTRShUSUxFRF9C QUNLSU5HX1NUT1JFKQogCiB2b2lkIFdlYlBhZ2U6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBJbnRT aXplJiBzaXplKQogewpAQCAtOTMxLDEzICs5MzIsMTEgQEAgdm9pZCBXZWJQYWdlOjpzZXRWaWV3 cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkKICAgICBpZiAobV92aWV3cG9ydFNpemUgPT0g c2l6ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgIG1fdmlld3BvcnRTaXplID0gc2l6ZTsKKyAg ICBtX3ZpZXdwb3J0U2l6ZSA9IHNpemU7CiAKICAgICBzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hh bmdlZCgpOwogfQogCi0jZW5kaWYKLQogdm9pZCBXZWJQYWdlOjpzY3JvbGxNYWluRnJhbWVJZk5v dEF0TWF4U2Nyb2xsUG9zaXRpb24oY29uc3QgSW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KQogewogICAg IEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCAxYTEzYjZjLi44ZWFkOGVmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTM2Niw5ICszNjYs OSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6 ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAgICAgdm9pZCByZXNpemVUb0NvbnRlbnRzSWZO ZWVkZWQoKTsKICAgICB2b2lkIHNlbmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKCk7CisjZW5k aWYKICAgICB2b2lkIHNldFZpZXdwb3J0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAg ICAgV2ViQ29yZTo6SW50U2l6ZSB2aWV3cG9ydFNpemUoKSBjb25zdCB7IHJldHVybiBtX3ZpZXdw b3J0U2l6ZTsgfQotI2VuZGlmCiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAgICBXZWJD b250ZXh0TWVudSogY29udGV4dE1lbnUoKTsKQEAgLTgwMiw5ICs4MDIsNyBAQCBwcml2YXRlOgog ICAgIEluamVjdGVkQnVuZGxlUGFnZUZ1bGxTY3JlZW5DbGllbnQgbV9mdWxsU2NyZWVuQ2xpZW50 OwogI2VuZGlmCiAKLSNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICBXZWJDb3JlOjpJ bnRTaXplIG1fdmlld3BvcnRTaXplOwotI2VuZGlmCiAKICAgICBGaW5kQ29udHJvbGxlciBtX2Zp bmRDb250cm9sbGVyOwogI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpICYmIFBMQVRGT1JNKFFUKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz YWdlcy5pbgppbmRleCAzOGYzNmMyLi5mYmMzMzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtMTEzLDkgKzEx Myw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogICAgIFN1c3BlbmRBY3RpdmVET01PYmplY3Rz QW5kQW5pbWF0aW9ucygpCiAgICAgUmVzdW1lQWN0aXZlRE9NT2JqZWN0c0FuZEFuaW1hdGlvbnMo KQogCi0jaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgU2V0Vmlld3BvcnRTaXplKFdl YkNvcmU6OkludFNpemUgc2l6ZSkKLSNlbmRpZgogCiAgICAgQ2xvc2UoKQogICAgIFRyeUNsb3Nl KCkK 151077 2012-07-06 06:41:36 -0700 2012-08-01 08:44:04 -0700 updated patch patch.diff text/plain 10603 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4ZjA1MmI3Li5iMGFiNTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEg QEAKKzIwMTItMDctMDYgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisK KyAgICAgICAgW1F0XVtXSzJdIEltcHJvdmUgdmlzaWJsZSBjb250ZW50IHJlY3QgdXBkYXRlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDU0NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF2b2lkIHRoZSBl eHRyYSB3b3JrIG9mIGNvbXB1dGluZyB0aGUgdmlzaWJsZSByZWN0IG11bHRpcGxlCisgICAgICAg IHRpbWVzIHdpdGhpbiB0aGUgbm90aWZpY2F0aW9uIGZ1bmN0aW9uIGluIFF0Vmlld3BvcnRIYW5k bGVyCisgICAgICAgIGFuZCBzZXQgYSBjb3JyZWN0IGZpeGVkIHZpc2libGUgY29udGVudCByZWN0 IGR1cmluZyBwYWdlIGxvYWQuCisgICAgICAgIFNpbmNlIHRoZSB2aWV3cG9ydCBzaXplIGlzIG9u bHkgYXZhaWxhYmxlIHRocm91Z2ggV2ViUGFnZQorICAgICAgICBkdXJpbmcgcGFnZSBsb2FkIG1v dmUgdGhlIG5lZWRlZCBmdW5jdGlvbnMgb3V0IG9mIHRoZQorICAgICAgICBUSUxFRF9CQUNLSU5H X1NUT1JFIGd1YXJkLgorICAgICAgICBBbHNvIG1ha2Ugc3VyZSB0aGF0IG5vdGlmaWNhdGlvbnMg d2l0aCBhIG51bGwgdHJhamVjdG9yeQorICAgICAgICB2ZWN0b3IgcmVhY2ggdGhlIGJhY2tpbmcg c3RvcmUgc2luY2UgYSBudWxsIHZlY3RvciBtZWFucworICAgICAgICB0aGF0IGFsbCB0aWxlcyBh cm91bmQgdGhlIHZpZXdwb3J0IHdlcmUgcmVxdWVzdGVkLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0Vmll d3BvcnRTaXplKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAg IChXZWJQYWdlUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxl ci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6On5WaWV3cG9y dFVwZGF0ZURlZmVycmVyKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6Omlu Zm9ybVZpc2libGVDb250ZW50Q2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhh bmRsZXI6OnZpZXdwb3J0SXRlbVNpemVDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEhhbmRsZXIuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRIYW5kbGVyKToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1p dHRlZEZvck5ld1BhZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVD b29yZGluYXRvci9MYXllclRyZWVDb29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJLaXQ6Okxh eWVyVHJlZUNvb3JkaW5hdG9yOjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgIChXZWJQYWdlKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwogMjAxMi0wNy0wNSAgQ2hyaXN0 b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtXSzJd W0VGTF0gRXdrX1ZpZXcgbmVlZHMgdG8gcmVwb3J0IGxvYWQgc3RhdHVzIGNoYW5nZXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggODU3MDllZi4uZWNmY2M4 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTkwMiw3 ICs5MDIsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUVkaXRDb21tYW5kKGNvbnN0IFN0 cmluZyYgY29tbWFuZE5hbWUpCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpFeGVjdXRlRWRpdENvbW1hbmQoY29tbWFuZE5hbWUpLCBtX3BhZ2VJRCk7CiB9CiAgICAgCi0j aWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3Bv cnRTaXplKGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCkBAIC05 MTAsNyArOTA5LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBJ bnRTaXplJiBzaXplKQogCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpT ZXRWaWV3cG9ydFNpemUoc2l6ZSksIG1fcGFnZUlEKTsKIH0KLSNlbmRpZgogCiAjaWYgRU5BQkxF KERSQUdfU1VQUE9SVCkKIHZvaWQgV2ViUGFnZVByb3h5OjpkcmFnRW50ZXJlZChEcmFnRGF0YSog ZHJhZ0RhdGEsIGNvbnN0IFN0cmluZyYgZHJhZ1N0b3JhZ2VOYW1lKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDU3YWI4NmMuLmNlNzM2YzMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTQxMSw5ICs0MTEsNyBAQCBwdWJsaWM6 CiAjaWYgVVNFKENBSVJPKSAmJiAhUExBVEZPUk0oV0lOX0NBSVJPKQogICAgIFBsYXRmb3JtV2lk Z2V0IHZpZXdXaWRnZXQoKTsKICNlbmRpZgotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQog ICAgIHZvaWQgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKLSNlbmRp ZgogCiAgICAgdm9pZCBoYW5kbGVNb3VzZUV2ZW50KGNvbnN0IE5hdGl2ZVdlYk1vdXNlRXZlbnQm KTsKICAgICB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgTmF0aXZlV2ViV2hlZWxFdmVudCYp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5k bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5j cHAKaW5kZXggYTFmNTZkMS4uZDE0YjA4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwCkBAIC04OSw3ICs4OSw3IEBAIHB1YmxpYzoK ICAgICAgICAgaGFuZGxlci0+cmVzdW1lUGFnZUNvbnRlbnQoKTsKIAogICAgICAgICAvLyBNYWtl IHN1cmUgdGhhdCB0aWxlcyBhbGwgYXJvdW5kIHRoZSB2aWV3cG9ydCB3aWxsIGJlIHJlcXVlc3Rl ZC4KLSAgICAgICAgaGFuZGxlci0+aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoUVBvaW50Rigp KTsKKyAgICAgICAgaGFuZGxlci0+aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoKTsKICAgICB9 CiAKIHByaXZhdGU6CkBAIC03MDksNyArNzA5LDEwIEBAIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6 OmluZm9ybVZpc2libGVDb250ZW50Q2hhbmdlKGNvbnN0IFFQb2ludEYmIHRyYWplY3RvcnlWZWN0 CiAgICAgaWYgKCFkcmF3aW5nQXJlYSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fbGFz dFZpc2libGVDb250ZW50c1JlY3QgPT0gdmlzaWJsZUNvbnRlbnRzUmVjdCgpKQorICAgIGNvbnN0 IFFSZWN0IGN1cnJlbnRWaXNpYmxlQ29udGVudHNSZWN0ID0gdmlzaWJsZUNvbnRlbnRzUmVjdCgp OworCisgICAgLy8gQSB6ZXJvIHRyYWplY3RvcnlWZWN0b3IgaW5kaWNhdGVzIHRoYXQgdGlsZXMg YWxsIGFyb3VuZCB0aGUgdmlld3BvcnQgYXJlIHJlcXVlc3RlZC4KKyAgICBpZiAoIXRyYWplY3Rv cnlWZWN0b3IuaXNOdWxsKCkgJiYgbV9sYXN0VmlzaWJsZUNvbnRlbnRzUmVjdCA9PSBjdXJyZW50 VmlzaWJsZUNvbnRlbnRzUmVjdCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcXJlYWwgc2NhbGUg PSBtX3BhZ2VJdGVtLT5jb250ZW50c1NjYWxlKCk7CkBAIC03MTcsOSArNzIwLDkgQEAgdm9pZCBR dFZpZXdwb3J0SGFuZGxlcjo6aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoY29uc3QgUVBvaW50 RiYgdHJhamVjdG9yeVZlY3QKICAgICBpZiAoc2NhbGUgIT0gbV9sYXN0Q29tbWl0dGVkU2NhbGUp CiAgICAgICAgIGVtaXQgbV92aWV3cG9ydEl0ZW0tPmV4cGVyaW1lbnRhbCgpLT50ZXN0KCktPmNv bnRlbnRzU2NhbGVDb21taXR0ZWQoKTsKICAgICBtX2xhc3RDb21taXR0ZWRTY2FsZSA9IHNjYWxl OwotICAgIG1fbGFzdFZpc2libGVDb250ZW50c1JlY3QgPSB2aXNpYmxlQ29udGVudHNSZWN0KCk7 CisgICAgbV9sYXN0VmlzaWJsZUNvbnRlbnRzUmVjdCA9IGN1cnJlbnRWaXNpYmxlQ29udGVudHNS ZWN0OwogCi0gICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZUNv bnRlbnRzUmVjdCgpLCBzY2FsZSwgdHJhamVjdG9yeVZlY3RvciwgbV92aWV3cG9ydEl0ZW0tPmNv bnRlbnRQb3MoKSk7CisgICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QoY3Vy cmVudFZpc2libGVDb250ZW50c1JlY3QsIHNjYWxlLCB0cmFqZWN0b3J5VmVjdG9yLCBtX3ZpZXdw b3J0SXRlbS0+Y29udGVudFBvcygpKTsKIAogICAgIC8vIEVuc3VyZSB0aGF0IHVwZGF0ZVBhaW50 Tm9kZSBpcyBhbHdheXMgY2FsbGVkIGJlZm9yZSBwYWludGluZy4KICAgICBtX3BhZ2VJdGVtLT51 cGRhdGUoKTsKQEAgLTczNiw3ICs3MzksNyBAQCB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjp2aWV3 cG9ydEl0ZW1TaXplQ2hhbmdlZCgpCiAgICAgLy8gaXQgY2FuIHJlc2l6ZSB0aGUgY29udGVudCBh Y2NvcmRpbmdseS4KICAgICBtX3dlYlBhZ2VQcm94eS0+c2V0Vmlld3BvcnRTaXplKHZpZXdwb3J0 U2l6ZSk7CiAKLSAgICBpbmZvcm1WaXNpYmxlQ29udGVudENoYW5nZShRUG9pbnRGKCkpOworICAg IGluZm9ybVZpc2libGVDb250ZW50Q2hhbmdlKCk7CiB9CiAKIHZvaWQgUXRWaWV3cG9ydEhhbmRs ZXI6OnNjYWxlQ29udGVudChjb25zdCBRUG9pbnRGJiBjZW50ZXJJbkNTU0Nvb3JkaW5hdGVzLCBx cmVhbCBjc3NTY2FsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SGFuZGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRIYW5kbGVyLmgKaW5kZXggZTRhOGM1MS4uNTEzNjUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmgKQEAgLTE2OCw3ICsxNjgsNyBAQCBw cml2YXRlOgogICAgIFFQb2ludEYgbV9sYXN0U2Nyb2xsUG9zaXRpb247CiAgICAgcXJlYWwgbV9w aW5jaFN0YXJ0U2NhbGU7CiAgICAgcXJlYWwgbV9sYXN0Q29tbWl0dGVkU2NhbGU7Ci0gICAgUVJl Y3RGIG1fbGFzdFZpc2libGVDb250ZW50c1JlY3Q7CisgICAgUVJlY3QgbV9sYXN0VmlzaWJsZUNv bnRlbnRzUmVjdDsKICAgICBxcmVhbCBtX3pvb21PdXRTY2FsZTsKICAgICBRTGlzdDxTY2FsZVN0 YWNrSXRlbT4gbV9zY2FsZVN0YWNrOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAKaW5kZXggOWE3ZDI5My4uOWFkNDZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKQEAgLTEyMzAsOCArMTIzMCwxMiBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0 cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKIAogICAgIG1fZnJhbWUtPmNvcmVGcmFt ZSgpLT5jcmVhdGVWaWV3KHdlYlBhZ2UtPnNpemUoKSwgYmFja2dyb3VuZENvbG9yLCAvKiB0cmFu c3BhcmVudCAqLyBmYWxzZSwgSW50U2l6ZSgpLCBzaG91bGRVc2VGaXhlZExheW91dCk7CiAgICAg bV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0VHJhbnNwYXJlbnQoIXdlYlBhZ2UtPmRy YXdzQmFja2dyb3VuZCgpKTsKLSAgICBpZiAoc2hvdWxkVXNlRml4ZWRMYXlvdXQpCi0gICAgICAg IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0 KHdlYlBhZ2UtPmJvdW5kcygpKTsKKyAgICBpZiAoc2hvdWxkVXNlRml4ZWRMYXlvdXQpIHsKKyAg ICAgICAgSW50UmVjdCB2aXNpYmxlQ29udGVudFJlY3Qod2ViUGFnZS0+Ym91bmRzKCkpOworICAg ICAgICAvLyBUaGUgSGlzdG9yeUNvbnRyb2xsZXIgd2lsbCB1cGRhdGUgdGhlIHNjcm9sbCBwb3Np dGlvbiBsYXRlciBpZiBuZWVkZWQuCisgICAgICAgIHZpc2libGVDb250ZW50UmVjdC5pbnRlcnNl Y3QoSW50UmVjdChJbnRQb2ludDo6emVybygpLCB3ZWJQYWdlLT52aWV3cG9ydFNpemUoKSkpOwor ICAgICAgICBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpLT5zZXRGaXhlZFZpc2libGVDb250 ZW50UmVjdCh2aXNpYmxlQ29udGVudFJlY3QpOworICAgIH0KIH0KIAogdm9pZCBXZWJGcmFtZUxv YWRlckNsaWVudDo6ZGlkU2F2ZVRvUGFnZUNhY2hlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVDb29yZGluYXRvci9MYXllclRyZWVDb29y ZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVl Q29vcmRpbmF0b3IvTGF5ZXJUcmVlQ29vcmRpbmF0b3IuY3BwCmluZGV4IGYzZTg3MzUuLjFhMTU5 NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRy ZWVDb29yZGluYXRvci9MYXllclRyZWVDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUNvb3JkaW5hdG9yL0xheWVyVHJlZUNvb3Jk aW5hdG9yLmNwcApAQCAtNTEyLDggKzUxMiw4IEBAIHZvaWQgTGF5ZXJUcmVlQ29vcmRpbmF0b3I6 OnNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhCiAg ICAgYm9vbCBjb250ZW50c1JlY3REaWRDaGFuZ2UgPSByZWN0ICE9IG1fdmlzaWJsZUNvbnRlbnRz UmVjdDsKICAgICBib29sIGNvbnRlbnRzU2NhbGVEaWRDaGFuZ2UgPSBzY2FsZSAhPSBtX2NvbnRl bnRzU2NhbGU7CiAKLSAgICBpZiAodHJhamVjdG9yeVZlY3RvciAhPSBGbG9hdFBvaW50Ojp6ZXJv KCkpCi0gICAgICAgIHRvV2ViR3JhcGhpY3NMYXllcihtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5 ZXIuZ2V0KCkpLT5zZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKHRyYWplY3Rv cnlWZWN0b3IpOworICAgIC8vIEEgemVybyB0cmFqZWN0b3J5VmVjdG9yIGluZGljYXRlcyB0aGF0 IHRpbGVzIGFsbCBhcm91bmQgdGhlIHZpZXdwb3J0IGFyZSByZXF1ZXN0ZWQuCisgICAgdG9XZWJH cmFwaGljc0xheWVyKG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci5nZXQoKSktPnNldFZpc2li bGVDb250ZW50UmVjdFRyYWplY3RvcnlWZWN0b3IodHJhamVjdG9yeVZlY3Rvcik7CiAKICAgICBp ZiAoY29udGVudHNSZWN0RGlkQ2hhbmdlIHx8IGNvbnRlbnRzU2NhbGVEaWRDaGFuZ2UpIHsKICAg ICAgICAgbV92aXNpYmxlQ29udGVudHNSZWN0ID0gcmVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAyNjY3NDZlLi41ZDM3ZDI5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC05MjMs NiArOTIzLDcgQEAgdm9pZCBXZWJQYWdlOjpzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCgp CiAgICAgc2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoSW50U2l6ZShzdGF0aWNf Y2FzdDxpbnQ+KGF0dHIubGF5b3V0U2l6ZS53aWR0aCgpKSwgc3RhdGljX2Nhc3Q8aW50PihhdHRy LmxheW91dFNpemUuaGVpZ2h0KCkpKSk7CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoYXR0cikpOwogfQorI2VuZGlmIC8vIFVTRShU SUxFRF9CQUNLSU5HX1NUT1JFKQogCiB2b2lkIFdlYlBhZ2U6OnNldFZpZXdwb3J0U2l6ZShjb25z dCBJbnRTaXplJiBzaXplKQogewpAQCAtOTMxLDEyICs5MzIsMTIgQEAgdm9pZCBXZWJQYWdlOjpz ZXRWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkKICAgICBpZiAobV92aWV3cG9ydFNp emUgPT0gc2l6ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgIG1fdmlld3BvcnRTaXplID0gc2l6 ZTsKKyAgICBtX3ZpZXdwb3J0U2l6ZSA9IHNpemU7CiAKKyNpZiBVU0UoVElMRURfQkFDS0lOR19T VE9SRSkKICAgICBzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCgpOwotfQotCiAjZW5kaWYK K30KIAogdm9pZCBXZWJQYWdlOjpzY3JvbGxNYWluRnJhbWVJZk5vdEF0TWF4U2Nyb2xsUG9zaXRp b24oY29uc3QgSW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMWExM2I2Yy4uOGVhZDhlZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0zNjYsOSArMzY2LDkg QEAgcHVibGljOgogICAgIHZvaWQgc2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUo Y29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogICAgIHZvaWQgcmVzaXplVG9Db250ZW50c0lmTmVl ZGVkKCk7CiAgICAgdm9pZCBzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCgpOworI2VuZGlm CiAgICAgdm9pZCBzZXRWaWV3cG9ydFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogICAg IFdlYkNvcmU6OkludFNpemUgdmlld3BvcnRTaXplKCkgY29uc3QgeyByZXR1cm4gbV92aWV3cG9y dFNpemU7IH0KLSNlbmRpZgogCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgV2ViQ29u dGV4dE1lbnUqIGNvbnRleHRNZW51KCk7CkBAIC04MDIsOSArODAyLDcgQEAgcHJpdmF0ZToKICAg ICBJbmplY3RlZEJ1bmRsZVBhZ2VGdWxsU2NyZWVuQ2xpZW50IG1fZnVsbFNjcmVlbkNsaWVudDsK ICNlbmRpZgogCi0jaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgV2ViQ29yZTo6SW50 U2l6ZSBtX3ZpZXdwb3J0U2l6ZTsKLSNlbmRpZgogCiAgICAgRmluZENvbnRyb2xsZXIgbV9maW5k Q29udHJvbGxlcjsKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKSAmJiBQTEFURk9STShRVCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3Nh Z2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW4KaW5kZXggMzhmMzZjMi4uZmJjMzMyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTExMyw5ICsxMTMs NyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIHsKICAgICBTdXNwZW5kQWN0aXZlRE9NT2JqZWN0c0Fu ZEFuaW1hdGlvbnMoKQogICAgIFJlc3VtZUFjdGl2ZURPTU9iamVjdHNBbmRBbmltYXRpb25zKCkK IAotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIFNldFZpZXdwb3J0U2l6ZShXZWJD b3JlOjpJbnRTaXplIHNpemUpCi0jZW5kaWYKIAogICAgIENsb3NlKCkKICAgICBUcnlDbG9zZSgp Cg==