71107 2011-10-28 04:12:47 -0700 [Qt][WK2] Move content to resize (setResizesToContentsUsingLayoutSize) from UI process to Web process 2011-11-02 07:24:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan webkit.review.bot zoltan oldest_to_newest 492370 0 zalan 2011-10-28 04:12:47 -0700 [Qt][WK2] Move content to resize (setResizesToContentsUsingLayoutSize) from UI process to WebProcess 492374 1 112847 zalan 2011-10-28 04:26:32 -0700 Created attachment 112847 Patch 492385 2 112847 kenneth 2011-10-28 05:15:34 -0700 Comment on attachment 112847 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112847&action=review > Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp:118 > if (newGeometry.size() != oldGeometry.size()) { > + WebPageProxy* pageProxy = toImpl(d->page.pageRef()); > + // Let the WebProcess know about the new viewport size, so that > + // it can resize the content accordingly. > + pageProxy->setViewportSize(newGeometry.size().toSize()); > d->updateViewportConstraints(); Maybe we should make a d->updateViewportSize(...) method? Anyway the naming is inconsistent with the rest of the file: WebPageProxy* wkPage = toImpl(page.pageRef()); 492417 3 112855 zalan 2011-10-28 06:37:04 -0700 Created attachment 112855 Patch 492419 4 112855 zalan 2011-10-28 06:39:09 -0700 Comment on attachment 112855 Patch updated patch based on Kenneth's comments. 492422 5 112855 webkit.review.bot 2011-10-28 06:43:31 -0700 Comment on attachment 112855 Patch Rejecting attachment 112855 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ss/API/qt/qtouchwebview.cpp.rej patching file Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h patching file Source/WebKit2/UIProcess/qt/QtTouchWebPageProxy.cpp patching file Source/WebKit2/UIProcess/qt/QtTouchWebPageProxy.h patching file Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp patching file Source/WebKit2/WebProcess/WebPage/WebPage.messages.in Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Kenneth Rohde Christia..." exit_code: 1 Full output: http://queues.webkit.org/results/10241028 494576 6 113308 zalan 2011-11-02 06:13:41 -0700 Created attachment 113308 Patch 494611 7 113308 webkit.review.bot 2011-11-02 07:24:46 -0700 Comment on attachment 113308 Patch Clearing flags on attachment: 113308 Committed r99058: <http://trac.webkit.org/changeset/99058> 494613 8 webkit.review.bot 2011-11-02 07:24:50 -0700 All reviewed patches have been landed. Closing bug. 112847 2011-10-28 04:26:32 -0700 2011-10-28 06:36:58 -0700 Patch bug-71107-20111028132631.patch text/plain 8135 zalan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NzE1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTAtMjggIFphbGFuIEJ1 anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBNb3ZlIGNvbnRl bnQgdG8gcmVzaXplIChzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSkgZnJvbSBV SSBwcm9jZXNzIHRvIFdlYlByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTcxMTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVkdWNlIHRoZSBudW1iZXIgb2YgSVBDIGNhbGxzIHRvIFdlYlByb2Nl c3MgYnkgbW92aW5nIHRoZSBjb250ZW50IHRvIHJlc2l6ZQorICAgICAgICBjYWxscyBmcm9tIFVJ IHByb2Nlc3MgdG8gV2ViIHByb2Nlc3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0 b3VjaHdlYnZpZXcuY3BwOgorICAgICAgICAoUVRvdWNoV2ViVmlld1ByaXZhdGU6OnVwZGF0ZVZp ZXdwb3J0Q29uc3RyYWludHMpOgorICAgICAgICAoUVRvdWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFu Z2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlkQ2hhbmdlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJv eHkuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFRvdWNoV2ViUGFnZVByb3h5Lmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0 aWVzRGlkQ2hhbmdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz YWdlcy5pbjoKKwogMjAxMS0xMC0yOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKCkg dG8gV2ViS2l0MiBHVEsrIEFQSQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHJldmlzaW9uIDk4NzE1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwMiw2ICs4MDIsMTQgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnNldEZpeGVkVmlzaWJsZUNvbnRlbgogCiAgICAgcHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChyZWN0KSwg bV9wYWdlSUQpOwogfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0 IEludFNpemUmIHNpemUpCit7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybjsK KworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Vmlld3BvcnRTaXpl KHNpemUpLCBtX3BhZ2VJRCk7Cit9CiAjZW5kaWYKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRyYWdF bnRlcmVkKERyYWdEYXRhKiBkcmFnRGF0YSwgY29uc3QgU3RyaW5nJiBkcmFnU3RvcmFnZU5hbWUp CkBAIC0xNDMzLDEzICsxNDQxLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlk Q2hhbmdlKAogICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UHJlZmVyZW5j ZXNEaWRDaGFuZ2UocGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPnN0b3JlKCkpLCBtX3BhZ2VJ RCwgbV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbiA/IENvcmVJUEM6OkRpc3BhdGNoTWVz c2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSA6IDApOwogfQogCi0jaWYgVVNFKFRJTEVE X0JBQ0tJTkdfU1RPUkUpCi12b2lkIFdlYlBhZ2VQcm94eTo6c2V0UmVzaXplc1RvQ29udGVudHNV c2luZ0xheW91dFNpemUoY29uc3QgSW50U2l6ZSYgdGFyZ2V0TGF5b3V0U2l6ZSkKLXsKLSAgICBw cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldFJlc2l6ZXNUb0NvbnRlbnRzVXNp bmdMYXlvdXRTaXplKHRhcmdldExheW91dFNpemUpLCBtX3BhZ2VJRCk7Ci19Ci0jZW5kaWYKLQog dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3Vt ZW50RGVjb2RlciogYXJndW1lbnRzKQogewogICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6 TWVzc2FnZUNsYXNzRHJhd2luZ0FyZWFQcm94eT4oKSkgewpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM0Niw2ICszNDYs NyBAQCBwdWJsaWM6CiAjZW5kaWYKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICB2 b2lkIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsK KyAgICB2b2lkIHNldFZpZXdwb3J0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAjZW5k aWYKIAogICAgIHZvaWQgaGFuZGxlTW91c2VFdmVudChjb25zdCBOYXRpdmVXZWJNb3VzZUV2ZW50 Jik7CkBAIC01MDksMTAgKzUxMCw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcHJlZmVyZW5jZXNE aWRDaGFuZ2UoKTsKIAotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgIHZvaWQgc2V0 UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYp OwotI2VuZGlmCi0KICAgICAvLyBDYWxsZWQgYnkgdGhlIFdlYkNvbnRleHRNZW51UHJveHkuCiAg ICAgdm9pZCBjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1E YXRhJik7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x dG91Y2h3ZWJ2aWV3LmNwcAkocmV2aXNpb24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSw5ICs4 MSw2IEBAIHZvaWQgUVRvdWNoV2ViVmlld1ByaXZhdGU6OnVwZGF0ZVZpZXdwb3IKICAgICAvLyBP dmVyd3JpdGUgbWluaW11bSBzY2FsZSB2YWx1ZSB3aXRoIGZpdC10by12aWV3IHZhbHVlLCB1bmxl c3MgdGhlIHRoZSBjb250ZW50IGF1dGhvcgogICAgIC8vIGV4cGxpY2l0bHkgc2F5cyBuby4gTkI6 IFdlIGNhbiBvbmx5IGRvIHRoaXMgd2hlbiB3ZSBrbm93IHdlIGhhdmUgYSB2YWxpZCBzaXplLCBp ZS4KICAgICAvLyBhZnRlciBpbml0aWFsIGxheW91dCBoYXMgY29tcGxldGVkLgotCi0gICAgLy8g RklYTUU6IERvIHRoaXMgb24gdGhlIHdlYiBwcm9jZXNzIHNpZGUuCi0gICAgd2tQYWdlLT5zZXRS ZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZShhdHRyLmxheW91dFNpemUpOwogfQogCiB2 b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29u c3QgV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmIGFyZ3MpCkBAIC0xMTQsNiArMTExLDEwIEBA IHZvaWQgUVRvdWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFuZ2VkKGNvbnMKIHsKICAgICBRU0dJdGVt OjpnZW9tZXRyeUNoYW5nZWQobmV3R2VvbWV0cnksIG9sZEdlb21ldHJ5KTsKICAgICBpZiAobmV3 R2VvbWV0cnkuc2l6ZSgpICE9IG9sZEdlb21ldHJ5LnNpemUoKSkgeworICAgICAgICBXZWJQYWdl UHJveHkqIHBhZ2VQcm94eSA9IHRvSW1wbChkLT5wYWdlLnBhZ2VSZWYoKSk7CisgICAgICAgIC8v IExldCB0aGUgV2ViUHJvY2VzcyBrbm93IGFib3V0IHRoZSBuZXcgdmlld3BvcnQgc2l6ZSwgc28g dGhhdAorICAgICAgICAvLyBpdCBjYW4gcmVzaXplIHRoZSBjb250ZW50IGFjY29yZGluZ2x5Lgor ICAgICAgICBwYWdlUHJveHktPnNldFZpZXdwb3J0U2l6ZShuZXdHZW9tZXRyeS5zaXplKCkudG9T aXplKCkpOwogICAgICAgICBkLT51cGRhdGVWaWV3cG9ydENvbnN0cmFpbnRzKCk7CiAgICAgICAg IGQtPl9xX3ZpZXdwb3J0VXBkYXRlZCgpOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFRvdWNoV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRUb3VjaFdlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDk4 NzE1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJveHku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsMTEgKzEwMiw2IEBAIHZvaWQgUXRUb3VjaFdlYlBh Z2VQcm94eTo6c2V0VmlzaWJsZUNvbnQKICAgICBtX3dlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEo KS0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0VHJhamVjdG9yeVZlY3Rvcih0cmFqZWN0b3J5VmVjdG9y KTsKIH0KIAotdm9pZCBRdFRvdWNoV2ViUGFnZVByb3h5OjpzZXRSZXNpemVzVG9Db250ZW50c1Vz aW5nTGF5b3V0U2l6ZShjb25zdCBRU2l6ZSYgdGFyZ2V0TGF5b3V0U2l6ZSkKLXsKLSAgICBtX3dl YlBhZ2VQcm94eS0+c2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUodGFyZ2V0TGF5 b3V0U2l6ZSk7Ci19Ci0KIHZvaWQgUXRUb3VjaFdlYlBhZ2VQcm94eTo6dG91Y2hFdmVudChRVG91 Y2hFdmVudCogZXZlbnQpCiB7CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFRvdWNoV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJveHkuaAkocmV2 aXNpb24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRUb3VjaFdlYlBh Z2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw2IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUoY29uc3QgUVJlY3RGJiwgZmxvYXQp OwogICAgIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRSZWN0VHJhamVjdG9yeVZlY3Rvcihjb25zdCBR UG9pbnRGJik7Ci0gICAgdm9pZCBzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZShj b25zdCBRU2l6ZSYgdGFyZ2V0TGF5b3V0U2l6ZSk7CiAgICAgdm9pZCBmaW5kWm9vbWFibGVBcmVh Rm9yUG9pbnQoY29uc3QgUVBvaW50Jik7CiAgICAgdm9pZCByZW5kZXJOZXh0RnJhbWUoKTsKICAg ICB2b2lkIHJlbmRlclRvQ3VycmVudEdMQ29udGV4dChjb25zdCBXZWJDb3JlOjpUcmFuc2Zvcm1h dGlvbk1hdHJpeCYsIGZsb2F0KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHJldmlz aW9uIDk4NzE1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJDaHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw2ICs1OCw3IEBACiAjaW5j bHVkZSA8V2ViQ29yZS9Ob3RJbXBsZW1lbnRlZC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5o PgogI2luY2x1ZGUgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW4uaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L1NldHRpbmdzLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNl IEhUTUxOYW1lczsKQEAgLTc0Myw2ICs3NDQsMTggQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNl dFJvb3RGdWxsU2NyZWVuTAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmRpc3BhdGNoVmlld3BvcnRQ cm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBhcmdzKSBjb25zdAog ewogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VWaWV3 cG9ydFByb3BlcnRpZXMoYXJncykpOworCisjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisg ICAgLy8gV2hlbiB2aWV3cG9ydCBwcm9wZXJ0aWVzIGNoYW5nZSwgcmVjYWxjdWxhdGUgYW5kIHNl dCB0aGUgbmV3IHJlY29tbWVuZGVkIGxheW91dCBzaXplIGluIGNhc2Ugb2YgZml4ZWQgbGF5b3V0 IHJlbmRlcmluZy4KKyAgICBpZiAobV9wYWdlLT5tYWluRnJhbWVWaWV3KCkgJiYgbV9wYWdlLT5t YWluRnJhbWVWaWV3KCktPnVzZUZpeGVkTGF5b3V0KCkpIHsKKyAgICAgICAgUGFnZSogcGFnZSA9 IG1fcGFnZS0+Y29yZVBhZ2UoKTsKKyAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gcGFnZS0+ c2V0dGluZ3MoKTsKKworICAgICAgICBJbnRTaXplIHRhcmdldExheW91dFNpemUgPSBjb21wdXRl Vmlld3BvcnRBdHRyaWJ1dGVzKHBhZ2UtPnZpZXdwb3J0QXJndW1lbnRzKCksIHNldHRpbmdzLT5s YXlvdXRGYWxsYmFja1dpZHRoKCksIHNldHRpbmdzLT5kZXZpY2VXaWR0aCgpLCBzZXR0aW5ncy0+ ZGV2aWNlSGVpZ2h0KCksCisgICAgICAgICAgICBzZXR0aW5ncy0+ZGV2aWNlRFBJKCksIG1fcGFn ZS0+dmlld3BvcnRTaXplKCkpLmxheW91dFNpemU7CisgICAgICAgIG1fcGFnZS0+c2V0UmVzaXpl c1RvQ29udGVudHNVc2luZ0xheW91dFNpemUodGFyZ2V0TGF5b3V0U2l6ZSk7CisgICAgfQorI2Vu ZGlmCiB9CiAKIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpkaWRTdGFydFJ1YmJlckJhbmRGb3JGcmFt ZShGcmFtZSosIGNvbnN0IEludFNpemUmKSBjb25zdApJbmRleDogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9u IDk4NzE1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTk3LDcgKzk3LDYgQEAgbWVzc2FnZXMgLT4gV2Vi UGFnZSB7CiAKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICBTZXRGaXhlZFZpc2li bGVDb250ZW50UmVjdChXZWJDb3JlOjpJbnRSZWN0IHJlY3QpCi0gICAgU2V0UmVzaXplc1RvQ29u dGVudHNVc2luZ0xheW91dFNpemUoV2ViQ29yZTo6SW50U2l6ZSBzaXplKQogICAgIFNldFZpZXdw b3J0U2l6ZShXZWJDb3JlOjpJbnRTaXplIHNpemUpCiAjZW5kaWYKIAo= 112855 2011-10-28 06:37:04 -0700 2011-11-02 06:13:35 -0700 Patch bug-71107-20111028153703.patch text/plain 9280 zalan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NzE1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTAtMjggIFphbGFuIEJ1 anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBNb3ZlIGNvbnRl bnQgdG8gcmVzaXplIChzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSkgZnJvbSBV SSBwcm9jZXNzIHRvIFdlYlByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTcxMTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVkdWNlIHRoZSBudW1iZXIgb2YgSVBDIGNhbGxzIHRvIFdlYlByb2Nl c3MgYnkgbW92aW5nIHRoZSBjb250ZW50IHRvIHJlc2l6ZQorICAgICAgICBjYWxscyBmcm9tIFVJ IHByb2Nlc3MgdG8gV2ViIHByb2Nlc3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0 b3VjaHdlYnZpZXcuY3BwOgorICAgICAgICAoUVRvdWNoV2ViVmlld1ByaXZhdGU6OnVwZGF0ZVZp ZXdwb3J0Q29uc3RyYWludHMpOgorICAgICAgICAoUVRvdWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFu Z2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlkQ2hhbmdlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJv eHkuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFRvdWNoV2ViUGFnZVByb3h5Lmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0 aWVzRGlkQ2hhbmdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz YWdlcy5pbjoKKwogMjAxMS0xMC0yOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKCkg dG8gV2ViS2l0MiBHVEsrIEFQSQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHJldmlzaW9uIDk4NzE1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwMiw2ICs4MDIsMTQgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnNldEZpeGVkVmlzaWJsZUNvbnRlbgogCiAgICAgcHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChyZWN0KSwg bV9wYWdlSUQpOwogfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0 IEludFNpemUmIHNpemUpCit7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybjsK KworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Vmlld3BvcnRTaXpl KHNpemUpLCBtX3BhZ2VJRCk7Cit9CiAjZW5kaWYKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRyYWdF bnRlcmVkKERyYWdEYXRhKiBkcmFnRGF0YSwgY29uc3QgU3RyaW5nJiBkcmFnU3RvcmFnZU5hbWUp CkBAIC0xNDMzLDEzICsxNDQxLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlk Q2hhbmdlKAogICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UHJlZmVyZW5j ZXNEaWRDaGFuZ2UocGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPnN0b3JlKCkpLCBtX3BhZ2VJ RCwgbV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbiA/IENvcmVJUEM6OkRpc3BhdGNoTWVz c2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSA6IDApOwogfQogCi0jaWYgVVNFKFRJTEVE X0JBQ0tJTkdfU1RPUkUpCi12b2lkIFdlYlBhZ2VQcm94eTo6c2V0UmVzaXplc1RvQ29udGVudHNV c2luZ0xheW91dFNpemUoY29uc3QgSW50U2l6ZSYgdGFyZ2V0TGF5b3V0U2l6ZSkKLXsKLSAgICBw cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldFJlc2l6ZXNUb0NvbnRlbnRzVXNp bmdMYXlvdXRTaXplKHRhcmdldExheW91dFNpemUpLCBtX3BhZ2VJRCk7Ci19Ci0jZW5kaWYKLQog dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3Vt ZW50RGVjb2RlciogYXJndW1lbnRzKQogewogICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6 TWVzc2FnZUNsYXNzRHJhd2luZ0FyZWFQcm94eT4oKSkgewpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM0Niw2ICszNDYs NyBAQCBwdWJsaWM6CiAjZW5kaWYKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICB2 b2lkIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsK KyAgICB2b2lkIHNldFZpZXdwb3J0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAjZW5k aWYKIAogICAgIHZvaWQgaGFuZGxlTW91c2VFdmVudChjb25zdCBOYXRpdmVXZWJNb3VzZUV2ZW50 Jik7CkBAIC01MDksMTAgKzUxMCw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcHJlZmVyZW5jZXNE aWRDaGFuZ2UoKTsKIAotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgIHZvaWQgc2V0 UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYp OwotI2VuZGlmCi0KICAgICAvLyBDYWxsZWQgYnkgdGhlIFdlYkNvbnRleHRNZW51UHJveHkuCiAg ICAgdm9pZCBjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1E YXRhJik7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x dG91Y2h3ZWJ2aWV3LmNwcAkocmV2aXNpb24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1 OSwxNiBAQCB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpfcV92aWV3cG9ydFRyCiAgICAgcGFn ZS5zZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKHRyYWplY3RvcnlWZWN0b3Ip OwogfQogCit2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjp1cGRhdGVWaWV3cG9ydFNpemUoKQor eworICAgIFdlYlBhZ2VQcm94eSogd2tQYWdlID0gdG9JbXBsKHBhZ2UucGFnZVJlZigpKTsKKyAg ICAvLyBMZXQgdGhlIFdlYlByb2Nlc3Mga25vdyBhYm91dCB0aGUgbmV3IHZpZXdwb3J0IHNpemUs IHNvIHRoYXQKKyAgICAvLyBpdCBjYW4gcmVzaXplIHRoZSBjb250ZW50IGFjY29yZGluZ2x5Lgor ICAgIHdrUGFnZS0+c2V0Vmlld3BvcnRTaXplKHEtPmJvdW5kaW5nUmVjdCgpLnNpemUoKS50b1Np emUoKSk7CisgICAgdXBkYXRlVmlld3BvcnRDb25zdHJhaW50cygpOworICAgIF9xX3ZpZXdwb3J0 VXBkYXRlZCgpOworfQorCiB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjp1cGRhdGVWaWV3cG9y dENvbnN0cmFpbnRzKCkKIHsKICAgICBRU2l6ZSBhdmFpbGFibGVTaXplID0gcS0+Ym91bmRpbmdS ZWN0KCkuc2l6ZSgpLnRvU2l6ZSgpOwpAQCAtODEsOSArOTEsNiBAQCB2b2lkIFFUb3VjaFdlYlZp ZXdQcml2YXRlOjp1cGRhdGVWaWV3cG9yCiAgICAgLy8gT3ZlcndyaXRlIG1pbmltdW0gc2NhbGUg dmFsdWUgd2l0aCBmaXQtdG8tdmlldyB2YWx1ZSwgdW5sZXNzIHRoZSB0aGUgY29udGVudCBhdXRo b3IKICAgICAvLyBleHBsaWNpdGx5IHNheXMgbm8uIE5COiBXZSBjYW4gb25seSBkbyB0aGlzIHdo ZW4gd2Uga25vdyB3ZSBoYXZlIGEgdmFsaWQgc2l6ZSwgaWUuCiAgICAgLy8gYWZ0ZXIgaW5pdGlh bCBsYXlvdXQgaGFzIGNvbXBsZXRlZC4KLQotICAgIC8vIEZJWE1FOiBEbyB0aGlzIG9uIHRoZSB3 ZWIgcHJvY2VzcyBzaWRlLgotICAgIHdrUGFnZS0+c2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xh eW91dFNpemUoYXR0ci5sYXlvdXRTaXplKTsKIH0KIAogdm9pZCBRVG91Y2hXZWJWaWV3UHJpdmF0 ZTo6ZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJn dW1lbnRzJiBhcmdzKQpAQCAtMTEzLDEwICsxMjAsOCBAQCBRVG91Y2hXZWJQYWdlKiBRVG91Y2hX ZWJWaWV3OjpwYWdlKCkKIHZvaWQgUVRvdWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFuZ2VkKGNvbnN0 IFFSZWN0RiYgbmV3R2VvbWV0cnksIGNvbnN0IFFSZWN0RiYgb2xkR2VvbWV0cnkpCiB7CiAgICAg UVNHSXRlbTo6Z2VvbWV0cnlDaGFuZ2VkKG5ld0dlb21ldHJ5LCBvbGRHZW9tZXRyeSk7Ci0gICAg aWYgKG5ld0dlb21ldHJ5LnNpemUoKSAhPSBvbGRHZW9tZXRyeS5zaXplKCkpIHsKLSAgICAgICAg ZC0+dXBkYXRlVmlld3BvcnRDb25zdHJhaW50cygpOwotICAgICAgICBkLT5fcV92aWV3cG9ydFVw ZGF0ZWQoKTsKLSAgICB9CisgICAgaWYgKG5ld0dlb21ldHJ5LnNpemUoKSAhPSBvbGRHZW9tZXRy eS5zaXplKCkpCisgICAgICAgIGQtPnVwZGF0ZVZpZXdwb3J0U2l6ZSgpOwogfQogCiB2b2lkIFFU b3VjaFdlYlZpZXc6OnRvdWNoRXZlbnQoUVRvdWNoRXZlbnQqIGV2ZW50KQpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3X3AuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXdfcC5oCShyZXZp c2lvbiA5ODcxNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlld19wLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcgQEAgcHVibGljOgogICAgIHZv aWQgbG9hZERpZENvbW1pdCgpOwogICAgIHZvaWQgX3Ffdmlld3BvcnRVcGRhdGVkKCk7CiAgICAg dm9pZCBfcV92aWV3cG9ydFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYmKTsK KyAgICB2b2lkIHVwZGF0ZVZpZXdwb3J0U2l6ZSgpOwogICAgIHZvaWQgdXBkYXRlVmlld3BvcnRD b25zdHJhaW50cygpOwogCiAgICAgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29u c3QgV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmIGFyZ3MpOwpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFRvdWNoV2ViUGFnZVByb3h5LmNwcAkocmV2aXNp b24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRUb3VjaFdlYlBhZ2VQ cm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMiwxMSArMTAyLDYgQEAgdm9pZCBRdFRvdWNo V2ViUGFnZVByb3h5OjpzZXRWaXNpYmxlQ29udAogICAgIG1fd2ViUGFnZVByb3h5LT5kcmF3aW5n QXJlYSgpLT5zZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKHRyYWplY3RvcnlW ZWN0b3IpOwogfQogCi12b2lkIFF0VG91Y2hXZWJQYWdlUHJveHk6OnNldFJlc2l6ZXNUb0NvbnRl bnRzVXNpbmdMYXlvdXRTaXplKGNvbnN0IFFTaXplJiB0YXJnZXRMYXlvdXRTaXplKQotewotICAg IG1fd2ViUGFnZVByb3h5LT5zZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSh0YXJn ZXRMYXlvdXRTaXplKTsKLX0KLQogdm9pZCBRdFRvdWNoV2ViUGFnZVByb3h5Ojp0b3VjaEV2ZW50 KFFUb3VjaEV2ZW50KiBldmVudCkKIHsKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJveHkuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRUb3VjaFdlYlBhZ2VQcm94eS5o CShyZXZpc2lvbiA5ODcxNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFRvdWNo V2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDYgQEAgcHVibGljOgog CiAgICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZShjb25zdCBRUmVjdEYmLCBm bG9hdCk7CiAgICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKGNv bnN0IFFQb2ludEYmKTsKLSAgICB2b2lkIHNldFJlc2l6ZXNUb0NvbnRlbnRzVXNpbmdMYXlvdXRT aXplKGNvbnN0IFFTaXplJiB0YXJnZXRMYXlvdXRTaXplKTsKICAgICB2b2lkIGZpbmRab29tYWJs ZUFyZWFGb3JQb2ludChjb25zdCBRUG9pbnQmKTsKICAgICB2b2lkIHJlbmRlck5leHRGcmFtZSgp OwogICAgIHZvaWQgcmVuZGVyVG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlRyYW5z Zm9ybWF0aW9uTWF0cml4JiwgZmxvYXQpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAko cmV2aXNpb24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDcgQEAK ICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Q YWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZWN1cml0eU9yaWdpbi5oPgorI2luY2x1ZGUgPFdl YkNvcmUvU2V0dGluZ3MuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1l c3BhY2UgSFRNTE5hbWVzOwpAQCAtNzQzLDYgKzc0NCwxOCBAQCB2b2lkIFdlYkNocm9tZUNsaWVu dDo6c2V0Um9vdEZ1bGxTY3JlZW5MCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6ZGlzcGF0Y2hWaWV3 cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgVmlld3BvcnRBcmd1bWVudHMmIGFyZ3MpIGNv bnN0CiB7CiAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5n ZVZpZXdwb3J0UHJvcGVydGllcyhhcmdzKSk7CisKKyNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9S RSkKKyAgICAvLyBXaGVuIHZpZXdwb3J0IHByb3BlcnRpZXMgY2hhbmdlLCByZWNhbGN1bGF0ZSBh bmQgc2V0IHRoZSBuZXcgcmVjb21tZW5kZWQgbGF5b3V0IHNpemUgaW4gY2FzZSBvZiBmaXhlZCBs YXlvdXQgcmVuZGVyaW5nLgorICAgIGlmIChtX3BhZ2UtPm1haW5GcmFtZVZpZXcoKSAmJiBtX3Bh Z2UtPm1haW5GcmFtZVZpZXcoKS0+dXNlRml4ZWRMYXlvdXQoKSkgeworICAgICAgICBQYWdlKiBw YWdlID0gbV9wYWdlLT5jb3JlUGFnZSgpOworICAgICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBw YWdlLT5zZXR0aW5ncygpOworCisgICAgICAgIEludFNpemUgdGFyZ2V0TGF5b3V0U2l6ZSA9IGNv bXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMocGFnZS0+dmlld3BvcnRBcmd1bWVudHMoKSwgc2V0dGlu Z3MtPmxheW91dEZhbGxiYWNrV2lkdGgoKSwgc2V0dGluZ3MtPmRldmljZVdpZHRoKCksIHNldHRp bmdzLT5kZXZpY2VIZWlnaHQoKSwKKyAgICAgICAgICAgIHNldHRpbmdzLT5kZXZpY2VEUEkoKSwg bV9wYWdlLT52aWV3cG9ydFNpemUoKSkubGF5b3V0U2l6ZTsKKyAgICAgICAgbV9wYWdlLT5zZXRS ZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSh0YXJnZXRMYXlvdXRTaXplKTsKKyAgICB9 CisjZW5kaWYKIH0KIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmRpZFN0YXJ0UnViYmVyQmFuZEZv ckZyYW1lKEZyYW1lKiwgY29uc3QgSW50U2l6ZSYpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2 aXNpb24gOTg3MTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtOTcsNyArOTcsNiBAQCBtZXNzYWdlcyAt PiBXZWJQYWdlIHsKIAogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIFNldEZpeGVk VmlzaWJsZUNvbnRlbnRSZWN0KFdlYkNvcmU6OkludFJlY3QgcmVjdCkKLSAgICBTZXRSZXNpemVz VG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZShXZWJDb3JlOjpJbnRTaXplIHNpemUpCiAgICAgU2V0 Vmlld3BvcnRTaXplKFdlYkNvcmU6OkludFNpemUgc2l6ZSkKICNlbmRpZgogCg== 113308 2011-11-02 06:13:41 -0700 2011-11-02 07:24:46 -0700 Patch bug-71107-20111102141340.patch text/plain 9391 zalan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MDU0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMTEtMDIgIFphbGFuIEJ1 anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBNb3ZlIGNvbnRl bnQgdG8gcmVzaXplIChzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSkgZnJvbSBV SSBwcm9jZXNzIHRvIFdlYiBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MTEwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlZHVjZSB0aGUgbnVtYmVyIG9mIElQQyBjYWxscyB0byBXZWJQcm9j ZXNzIGJ5IG1vdmluZyB0aGUgY29udGVudCB0byByZXNpemUKKyAgICAgICAgY2FsbHMgZnJvbSBV SSBwcm9jZXNzIHRvIFdlYiBwcm9jZXNzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9x dG91Y2h3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFUb3VjaFdlYlZpZXdQcml2YXRlOjp1cGRhdGVW aWV3cG9ydFNpemUpOgorICAgICAgICAoUVRvdWNoV2ViVmlld1ByaXZhdGU6OnVwZGF0ZVZpZXdw b3J0Q29uc3RyYWludHMpOgorICAgICAgICAoUVRvdWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFuZ2Vk KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXdfcC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnNldFZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 cHJlZmVyZW5jZXNEaWRDaGFuZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRUb3VjaFdlYlBhZ2VQcm94eS5jcHA6CisgICAg ICAgICogVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkNocm9tZUNsaWVudDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2Up OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAy MDExLTEwLTE4ICBEaW51IEphY29iICA8ZGludS5qYWNvYkBub2tpYS5jb20+CiAKICAgICAgICAg W1F0XVtXSzJdOiBTaG91bGRuJ3Qgc2VuZCB1bmhhbmRsZWQgVG91Y2hDYW5jZWwgZXZlbnQgdG8g Z2VzdHVyZSByZWNvZ25pemVycwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHJldmlzaW9uIDk5MDU0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwMiw2ICs4MDIsMTQgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnNldEZpeGVkVmlzaWJsZUNvbnRlbgogCiAgICAgcHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChyZWN0KSwg bV9wYWdlSUQpOwogfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0 IEludFNpemUmIHNpemUpCit7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybjsK KworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Vmlld3BvcnRTaXpl KHNpemUpLCBtX3BhZ2VJRCk7Cit9CiAjZW5kaWYKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRyYWdF bnRlcmVkKERyYWdEYXRhKiBkcmFnRGF0YSwgY29uc3QgU3RyaW5nJiBkcmFnU3RvcmFnZU5hbWUp CkBAIC0xNDM4LDEzICsxNDQ2LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlk Q2hhbmdlKAogICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UHJlZmVyZW5j ZXNEaWRDaGFuZ2UocGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPnN0b3JlKCkpLCBtX3BhZ2VJ RCwgbV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbiA/IENvcmVJUEM6OkRpc3BhdGNoTWVz c2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSA6IDApOwogfQogCi0jaWYgVVNFKFRJTEVE X0JBQ0tJTkdfU1RPUkUpCi12b2lkIFdlYlBhZ2VQcm94eTo6c2V0UmVzaXplc1RvQ29udGVudHNV c2luZ0xheW91dFNpemUoY29uc3QgSW50U2l6ZSYgdGFyZ2V0TGF5b3V0U2l6ZSkKLXsKLSAgICBw cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldFJlc2l6ZXNUb0NvbnRlbnRzVXNp bmdMYXlvdXRTaXplKHRhcmdldExheW91dFNpemUpLCBtX3BhZ2VJRCk7Ci19Ci0jZW5kaWYKLQog dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3Vt ZW50RGVjb2RlciogYXJndW1lbnRzKQogewogICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6 TWVzc2FnZUNsYXNzRHJhd2luZ0FyZWFQcm94eT4oKSkgewpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gOTkwNTQpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM0Niw2ICszNDYs NyBAQCBwdWJsaWM6CiAjZW5kaWYKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICB2 b2lkIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsK KyAgICB2b2lkIHNldFZpZXdwb3J0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAjZW5k aWYKIAogICAgIHZvaWQgaGFuZGxlTW91c2VFdmVudChjb25zdCBOYXRpdmVXZWJNb3VzZUV2ZW50 Jik7CkBAIC01MDksMTAgKzUxMCw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcHJlZmVyZW5jZXNE aWRDaGFuZ2UoKTsKIAotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgIHZvaWQgc2V0 UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYp OwotI2VuZGlmCi0KICAgICAvLyBDYWxsZWQgYnkgdGhlIFdlYkNvbnRleHRNZW51UHJveHkuCiAg ICAgdm9pZCBjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1E YXRhJik7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x dG91Y2h3ZWJ2aWV3LmNwcAkocmV2aXNpb24gOTkwNTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1 OSwxNyBAQCB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpfcV92aWV3cG9ydFRyCiAgICAgdG91 Y2hQYWdlUHJveHkoKS0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0VHJhamVjdG9yeVZlY3Rvcih0cmFq ZWN0b3J5VmVjdG9yKTsKIH0KIAordm9pZCBRVG91Y2hXZWJWaWV3UHJpdmF0ZTo6dXBkYXRlVmll d3BvcnRTaXplKCkKK3sKKyAgICBRX1EoUVRvdWNoV2ViVmlldyk7CisgICAgV2ViUGFnZVByb3h5 KiB3a1BhZ2UgPSB0b0ltcGwocGFnZVByb3h5LT5wYWdlUmVmKCkpOworICAgIC8vIExldCB0aGUg V2ViUHJvY2VzcyBrbm93IGFib3V0IHRoZSBuZXcgdmlld3BvcnQgc2l6ZSwgc28gdGhhdAorICAg IC8vIGl0IGNhbiByZXNpemUgdGhlIGNvbnRlbnQgYWNjb3JkaW5nbHkuCisgICAgd2tQYWdlLT5z ZXRWaWV3cG9ydFNpemUocS0+Ym91bmRpbmdSZWN0KCkuc2l6ZSgpLnRvU2l6ZSgpKTsKKyAgICB1 cGRhdGVWaWV3cG9ydENvbnN0cmFpbnRzKCk7CisgICAgX3Ffdmlld3BvcnRVcGRhdGVkKCk7Cit9 CisKIHZvaWQgUVRvdWNoV2ViVmlld1ByaXZhdGU6OnVwZGF0ZVZpZXdwb3J0Q29uc3RyYWludHMo KQogewogICAgIFFfUShRVG91Y2hXZWJWaWV3KTsKQEAgLTg4LDkgKzk5LDYgQEAgdm9pZCBRVG91 Y2hXZWJWaWV3UHJpdmF0ZTo6dXBkYXRlVmlld3BvcgogICAgIC8vIE92ZXJ3cml0ZSBtaW5pbXVt IHNjYWxlIHZhbHVlIHdpdGggZml0LXRvLXZpZXcgdmFsdWUsIHVubGVzcyB0aGUgdGhlIGNvbnRl bnQgYXV0aG9yCiAgICAgLy8gZXhwbGljaXRseSBzYXlzIG5vLiBOQjogV2UgY2FuIG9ubHkgZG8g dGhpcyB3aGVuIHdlIGtub3cgd2UgaGF2ZSBhIHZhbGlkIHNpemUsIGllLgogICAgIC8vIGFmdGVy IGluaXRpYWwgbGF5b3V0IGhhcyBjb21wbGV0ZWQuCi0KLSAgICAvLyBGSVhNRTogRG8gdGhpcyBv biB0aGUgd2ViIHByb2Nlc3Mgc2lkZS4KLSAgICB3a1BhZ2UtPnNldFJlc2l6ZXNUb0NvbnRlbnRz VXNpbmdMYXlvdXRTaXplKGF0dHIubGF5b3V0U2l6ZSk7CiB9CiAKIHZvaWQgUVRvdWNoV2ViVmll d1ByaXZhdGU6OmRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGllcyhjb25zdCBXZWJDb3JlOjpWaWV3 cG9ydEFyZ3VtZW50cyYgYXJncykKQEAgLTEyMiwxMCArMTMwLDggQEAgdm9pZCBRVG91Y2hXZWJW aWV3OjpnZW9tZXRyeUNoYW5nZWQoY29ucwogewogICAgIFFfRChRVG91Y2hXZWJWaWV3KTsKICAg ICBRUXVpY2tJdGVtOjpnZW9tZXRyeUNoYW5nZWQobmV3R2VvbWV0cnksIG9sZEdlb21ldHJ5KTsK LSAgICBpZiAobmV3R2VvbWV0cnkuc2l6ZSgpICE9IG9sZEdlb21ldHJ5LnNpemUoKSkgewotICAg ICAgICBkLT51cGRhdGVWaWV3cG9ydENvbnN0cmFpbnRzKCk7Ci0gICAgICAgIGQtPl9xX3ZpZXdw b3J0VXBkYXRlZCgpOwotICAgIH0KKyAgICBpZiAobmV3R2VvbWV0cnkuc2l6ZSgpICE9IG9sZEdl b21ldHJ5LnNpemUoKSkKKyAgICAgICAgZC0+dXBkYXRlVmlld3BvcnRTaXplKCk7CiB9CiAKIHZv aWQgUVRvdWNoV2ViVmlldzo6dG91Y2hFdmVudChRVG91Y2hFdmVudCogZXZlbnQpCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXdfcC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlld19wLmgJ KHJldmlzaW9uIDk5MDU0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91 Y2h3ZWJ2aWV3X3AuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBsb2FkRGlkQ29tbWl0KCk7CiAgICAgdm9pZCBfcV92aWV3cG9ydFVwZGF0ZWQoKTsK ICAgICB2b2lkIF9xX3ZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29uc3QgUVBvaW50 RiYpOworICAgIHZvaWQgdXBkYXRlVmlld3BvcnRTaXplKCk7CiAgICAgdm9pZCB1cGRhdGVWaWV3 cG9ydENvbnN0cmFpbnRzKCk7CiAgICAgUXRUb3VjaFdlYlBhZ2VQcm94eSogdG91Y2hQYWdlUHJv eHkoKSB7IHJldHVybiBzdGF0aWNfY2FzdDxRdFRvdWNoV2ViUGFnZVByb3h5Kj4oUUJhc2VXZWJW aWV3UHJpdmF0ZTo6cGFnZVByb3h5LmRhdGEoKSk7IH0KIApJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFRvdWNoV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24g OTkwNTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRUb3VjaFdlYlBhZ2VQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMiwxMSArMTAyLDYgQEAgdm9pZCBRdFRvdWNoV2Vi UGFnZVByb3h5OjpzZXRWaXNpYmxlQ29udAogICAgIG1fd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJl YSgpLT5zZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKHRyYWplY3RvcnlWZWN0 b3IpOwogfQogCi12b2lkIFF0VG91Y2hXZWJQYWdlUHJveHk6OnNldFJlc2l6ZXNUb0NvbnRlbnRz VXNpbmdMYXlvdXRTaXplKGNvbnN0IFFTaXplJiB0YXJnZXRMYXlvdXRTaXplKQotewotICAgIG1f d2ViUGFnZVByb3h5LT5zZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSh0YXJnZXRM YXlvdXRTaXplKTsKLX0KLQogdm9pZCBRdFRvdWNoV2ViUGFnZVByb3h5Ojp0b3VjaEV2ZW50KFFU b3VjaEV2ZW50KiBldmVudCkKIHsKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0VG91Y2hXZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRUb3VjaFdlYlBhZ2VQcm94eS5oCShy ZXZpc2lvbiA5OTA1NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFRvdWNoV2Vi UGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDYgQEAgcHVibGljOgogCiAg ICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZShjb25zdCBRUmVjdEYmLCBmbG9h dCk7CiAgICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKGNvbnN0 IFFQb2ludEYmKTsKLSAgICB2b2lkIHNldFJlc2l6ZXNUb0NvbnRlbnRzVXNpbmdMYXlvdXRTaXpl KGNvbnN0IFFTaXplJiB0YXJnZXRMYXlvdXRTaXplKTsKICAgICB2b2lkIGZpbmRab29tYWJsZUFy ZWFGb3JQb2ludChjb25zdCBRUG9pbnQmKTsKICAgICB2b2lkIHJlbmRlck5leHRGcmFtZSgpOwog ICAgIHZvaWQgcmVuZGVyVG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9y bWF0aW9uTWF0cml4JiwgZmxvYXQpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAkocmV2 aXNpb24gOTkwNTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkNocm9tZUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDcgQEAKICNp bmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdl Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZWN1cml0eU9yaWdpbi5oPgorI2luY2x1ZGUgPFdlYkNv cmUvU2V0dGluZ3MuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3Bh Y2UgSFRNTE5hbWVzOwpAQCAtNzQzLDYgKzc0NCwxOCBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6 c2V0Um9vdEZ1bGxTY3JlZW5MCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6ZGlzcGF0Y2hWaWV3cG9y dFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgVmlld3BvcnRBcmd1bWVudHMmIGFyZ3MpIGNvbnN0 CiB7CiAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVZp ZXdwb3J0UHJvcGVydGllcyhhcmdzKSk7CisKKyNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkK KyAgICAvLyBXaGVuIHZpZXdwb3J0IHByb3BlcnRpZXMgY2hhbmdlLCByZWNhbGN1bGF0ZSBhbmQg c2V0IHRoZSBuZXcgcmVjb21tZW5kZWQgbGF5b3V0IHNpemUgaW4gY2FzZSBvZiBmaXhlZCBsYXlv dXQgcmVuZGVyaW5nLgorICAgIGlmIChtX3BhZ2UtPm1haW5GcmFtZVZpZXcoKSAmJiBtX3BhZ2Ut Pm1haW5GcmFtZVZpZXcoKS0+dXNlRml4ZWRMYXlvdXQoKSkgeworICAgICAgICBQYWdlKiBwYWdl ID0gbV9wYWdlLT5jb3JlUGFnZSgpOworICAgICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBwYWdl LT5zZXR0aW5ncygpOworCisgICAgICAgIEludFNpemUgdGFyZ2V0TGF5b3V0U2l6ZSA9IGNvbXB1 dGVWaWV3cG9ydEF0dHJpYnV0ZXMocGFnZS0+dmlld3BvcnRBcmd1bWVudHMoKSwgc2V0dGluZ3Mt PmxheW91dEZhbGxiYWNrV2lkdGgoKSwgc2V0dGluZ3MtPmRldmljZVdpZHRoKCksIHNldHRpbmdz LT5kZXZpY2VIZWlnaHQoKSwKKyAgICAgICAgICAgIHNldHRpbmdzLT5kZXZpY2VEUEkoKSwgbV9w YWdlLT52aWV3cG9ydFNpemUoKSkubGF5b3V0U2l6ZTsKKyAgICAgICAgbV9wYWdlLT5zZXRSZXNp emVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSh0YXJnZXRMYXlvdXRTaXplKTsKKyAgICB9Cisj ZW5kaWYKIH0KIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmRpZFN0YXJ0UnViYmVyQmFuZEZvckZy YW1lKEZyYW1lKiwgY29uc3QgSW50U2l6ZSYpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNp b24gOTkwNTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5t ZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtOTgsNyArOTgsNiBAQCBtZXNzYWdlcyAtPiBX ZWJQYWdlIHsKIAogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIFNldEZpeGVkVmlz aWJsZUNvbnRlbnRSZWN0KFdlYkNvcmU6OkludFJlY3QgcmVjdCkKLSAgICBTZXRSZXNpemVzVG9D b250ZW50c1VzaW5nTGF5b3V0U2l6ZShXZWJDb3JlOjpJbnRTaXplIHNpemUpCiAgICAgU2V0Vmll d3BvcnRTaXplKFdlYkNvcmU6OkludFNpemUgc2l6ZSkKICNlbmRpZgogCg==