52184 2011-01-10 17:59:14 -0800 Work towards having the WebPageProxy decide when to create the DrawingAreaProxy 2011-01-11 09:26:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 52183 1 andersca andersca kbalazs kling ossy webkit.review.bot oldest_to_newest 332088 0 andersca 2011-01-10 17:59:14 -0800 Work towards having the WebPageProxy decide when to create the DrawingAreaProxy 332091 1 78485 andersca 2011-01-10 18:04:48 -0800 Created attachment 78485 Patch 332092 2 webkit.review.bot 2011-01-10 18:07:24 -0800 Attachment 78485 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'WebKit2/ChangeLog', u'WebKit2/UIProcess/AP..." exit_code: 1 WebKit2/UIProcess/API/mac/WKViewInternal.h:31: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 332094 3 andersca 2011-01-10 18:12:12 -0800 Committed r75459: <http://trac.webkit.org/changeset/75459> 332132 4 ossy 2011-01-10 19:56:10 -0800 (In reply to comment #3) > Committed r75459: <http://trac.webkit.org/changeset/75459> It broke Qt build: ../../../WebKit2/UIProcess/API/qt/qwkpage_p.h:46: error: ‘DrawingAreaProxy’ was not declared in this scope ../../../WebKit2/UIProcess/API/qt/qwkpage_p.h:46: error: template argument 1 is invalid ../../../WebKit2/UIProcess/API/qt/qwkpage_p.h:46: error: conflicting return type specified for ‘virtual int QWKPagePrivate::createDrawingAreaProxy()’ ../../../WebKit2/UIProcess/PageClient.h:53: error: overriding ‘virtual WTF::PassOwnPtr<WebKit::DrawingAreaProxy> WebKit::PageClient::createDrawingAreaProxy()’ Could you guys fix the build or roll it out? 332134 5 ossy 2011-01-10 20:30:11 -0800 (In reply to comment #3) > Committed r75459: <http://trac.webkit.org/changeset/75459> Rolled-out: http://trac.webkit.org/changeset/75473 332237 6 78485 ossy 2011-01-11 03:30:57 -0800 Comment on attachment 78485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78485&action=review > WebKit2/UIProcess/API/qt/qwkpage_p.h:46 > + virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy(); WebKit::DrawingAreaProxy instead of DrawingAreaProxy will make Qt build happier. 332248 7 78485 ossy 2011-01-11 03:41:39 -0800 Comment on attachment 78485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78485&action=review > WebKit2/UIProcess/API/qt/qwkpage.cpp:126 > +PassOwnPtr<DrawingAreaProxy> QWKPagePrivate::createDrawingAreaProxy() > +{ > + // FIXME: Implement. See https://bugs.webkit.org/show_bug.cgi?id=52183. > +} After fix in Comment #6 I got the following build error: In file included from ../../../WebKit2/UIProcess/API/qt/qwkpage.cpp:742: ../../../WebKit2/UIProcess/API/qt/qwkpage.cpp: In member function 'virtual WTF::PassOwnPtr<WebKit::DrawingAreaProxy> QWKPagePrivate::createDrawingAreaProxy()': ../../../WebKit2/UIProcess/API/qt/qwkpage.cpp:126: error: control reaches end of non-void function 332320 8 78528 kbalazs 2011-01-11 07:33:45 -0800 Created attachment 78528 patch with qt parts Updated patch to TOT with real (non-stub) implementation of qt part. 332321 9 webkit.review.bot 2011-01-11 07:35:10 -0800 Attachment 78528 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'WebKit2/ChangeLog', u'WebKit2/UIProcess/AP..." exit_code: 1 WebKit2/UIProcess/API/mac/WKViewInternal.h:31: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 332330 10 78528 kling 2011-01-11 07:47:52 -0800 Comment on attachment 78528 patch with qt parts You should get the QGraphicsWKView* via QWKPagePrivate::item instead. 332338 11 kling 2011-01-11 08:01:22 -0800 (In reply to comment #10) > (From update of attachment 78528 [details]) > You should get the QGraphicsWKView* via QWKPagePrivate::item instead. Ehm. I just learned that the variable I'm referring to has not hit trunk yet (branches.. grmbl..) We don't want to tie the QWKPage and QGraphicsWKView together like that on the API level though. I'd rather we add a QGraphicsItem* member to QWKPagePrivate and stash the QGraphicsWKView* in there during QWKPagePrivate::init(). 332356 12 78533 kbalazs 2011-01-11 08:38:16 -0800 Created attachment 78533 Patch 332357 13 webkit.review.bot 2011-01-11 08:39:45 -0800 Attachment 78533 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'WebKit2/ChangeLog', u'WebKit2/UIProcess/AP..." exit_code: 1 WebKit2/UIProcess/API/mac/WKViewInternal.h:31: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 332364 14 78533 kling 2011-01-11 08:48:40 -0800 Comment on attachment 78533 Patch Better, thanks. r=me 332394 15 78533 kbalazs 2011-01-11 09:22:35 -0800 Comment on attachment 78533 Patch Clearing flags on attachment: 78533 Committed r75506: <http://trac.webkit.org/changeset/75506> 332396 16 kbalazs 2011-01-11 09:22:46 -0800 All reviewed patches have been landed. Closing bug. 332400 17 kbalazs 2011-01-11 09:26:14 -0800 *** Bug 52183 has been marked as a duplicate of this bug. *** 78485 2011-01-10 18:04:48 -0800 2011-01-11 07:33:45 -0800 Patch bug-52184-20110110180446.patch text/plain 9256 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTQ1NykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDggQEAKKzIwMTEtMDEtMTAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXb3JrIHRvd2FyZHMgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgZGVjaWRlIHdoZW4gdG8gY3Jl YXRlIHRoZSBEcmF3aW5nQXJlYVByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MjE4NAorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFn ZUNsaWVudEltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1w bC5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVh UHJveHkpOgorICAgICAgICBDYWxsIC1bV0tWaWV3IF9jcmVhdGVEcmF3aW5nQXJlYVByb3h5XS4K KworICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2V0Vmlld05lZWRzRGlzcGxheSk6 CisgICAgICAgIENhbGwgc2V0TmVlZHNEaXNwbGF5SW5SZWN0IG9uIHRoZSBXS1ZpZXcuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBp bml0V2l0aEZyYW1lOmNvbnRleHRSZWY6cGFnZUdyb3VwUmVmOl0pOgorICAgICAgICBObyBuZWVk IHRvIHNldCB0aGUgZHJhd2luZyBhcmVhIHByb3h5IGFueW1vcmUuCisKKyAgICAgICAgKC1bV0tW aWV3IF9jcmVhdGVEcmF3aW5nQXJlYVByb3h5XSk6CisgICAgICAgIENyZWF0ZSBhIGNodW5rZWQg dXBkYXRlIGRyYXdpbmcgYXJlYSBwcm94eSBmb3Igbm93LgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC9xd2twYWdlLmNwcDoKKyAgICAgICAgKFFXS1BhZ2VQcml2YXRlOjpjcmVhdGVEcmF3 aW5nQXJlYVByb3h5KToKKyAgICAgICAgKFFXS1BhZ2VQcml2YXRlOjpzZXRWaWV3TmVlZHNEaXNw bGF5KToKKyAgICAgICAgQWRkIHN0dWJzLgorICAgIAorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdl Q2xpZW50Lmg6CisgICAgICAgIEFkZCBuZXcgcHVyZSB2aXJ0dWFsIG1lbWJlciBmdW5jdGlvbnMu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6cmVpbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIFNldCB0aGUgbmV3IGRy YXdpbmcgYXJlYSBwcm94eS4KKworICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OldlYlZpZXcpOgorICAgICAgICBObyBuZWVkIHRv IHNldCB0aGUgZHJhd2luZyBhcmVhIHByb3h5IGFueW1vcmUuCisKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlldzo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSk6CisgICAgICAgIENyZWF0ZSBhIGNodW5r ZWQgdXBkYXRlIGRyYXdpbmcgYXJlYSBwcm94eSBmb3Igbm93LgorCisgICAgICAgIChXZWJLaXQ6 OldlYlZpZXc6OnNldFZpZXdOZWVkc0Rpc3BsYXkpOgorICAgICAgICBJbnZhbGlkYXRlIHRoZSB3 aW5kb3cuCisKIDIwMTEtMDEtMTAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggV2luZG93cyBidWlsZCBhZ2Fpbi4KSW5kZXg6IFdlYktpdDIvVUlQ cm9jZXNzL1BhZ2VDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9QYWdl Q2xpZW50LmgJKHJldmlzaW9uIDc1NDUyKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIERyYXdpbmdBcmVhUHJveHk7CiBjbGFzcyBG aW5kSW5kaWNhdG9yOwogY2xhc3MgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudDsKIGNsYXNzIE5hdGl2 ZVdlYktleWJvYXJkRXZlbnQ7CkBAIC00OCw2ICs0OSwxMiBAQCBjbGFzcyBQYWdlQ2xpZW50IHsK IHB1YmxpYzoKICAgICB2aXJ0dWFsIH5QYWdlQ2xpZW50KCkgeyB9CiAKKyAgICAvLyBDcmVhdGUg YSBuZXcgZHJhd2luZyBhcmVhIHByb3h5IGZvciB0aGUgZ2l2ZW4gcGFnZS4KKyAgICB2aXJ0dWFs IFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpID0g MDsKKworICAgIC8vIFRlbGwgdGhlIHZpZXcgdG8gaW52YWxpZGF0ZSB0aGUgZ2l2ZW4gcmVjdC4g VGhlIHJlY3QgaXMgaW4gdmlldyBjb29yZGluYXRlcy4KKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmll d05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JikgPSAwOworCiAgICAgLy8gUmV0 dXJuIHRoZSBzaXplIG9mIHRoZSB2aWV3IHRoZSBwYWdlIGlzIGFzc29jaWF0ZWQgd2l0aC4KICAg ICB2aXJ0dWFsIFdlYkNvcmU6OkludFNpemUgdmlld1NpemUoKSA9IDA7CiAKSW5kZXg6IFdlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gNzU0NTIpCisrKyBXZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTgsNyArMjE4LDkgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKGNvbgogICAgICAgICByZXR1cm47 CiAgICAgfQogCisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZUNsaWVudC0+Y3JlYXRlRHJhd2lu Z0FyZWFQcm94eSgpOwogICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKKwogICAgIHByb2Nlc3Mo KS0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwgY3Jl YXRpb25QYXJhbWV0ZXJzKHNpemUpKSwgMCk7CiB9CiAKQEAgLTIyNyw3ICsyMjksOSBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6cmVpbml0aWFsaXplV2ViUGFnZShjCiAgICAgaWYgKCFpc1ZhbGlkKCkp CiAgICAgICAgIHJldHVybjsKIAorICAgIG1fZHJhd2luZ0FyZWEgPSBtX3BhZ2VDbGllbnQtPmNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKICAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CisKICAg ICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9w YWdlSUQsIGNyZWF0aW9uUGFyYW1ldGVycyhzaXplKSksIDApOwogfQogCkluZGV4OiBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCShyZXZpc2lvbiA3NTQ1MikKKysr IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAkod29ya2luZyBjb3B5 KQpAQCAtNDgsNiArNDgsOSBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFBhZ2VDbGllbnRJbXBs KFdLVmlldyopOwogCisgICAgdmlydHVhbCBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlz cGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisgICAgCiAgICAgdmlydHVhbCBXZWJDb3Jl OjpJbnRTaXplIHZpZXdTaXplKCk7CiAgICAgdmlydHVhbCBib29sIGlzVmlld1dpbmRvd0FjdGl2 ZSgpOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdGb2N1c2VkKCk7CkluZGV4OiBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlzaW9uIDc1NDUyKQorKysg V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTE4LDYgKzExOCwxNiBAQCBQYWdlQ2xpZW50SW1wbDo6flBhZ2VDbGllbnRJbXBsKCkK IHsKIH0KIAorUGFzc093blB0cjxEcmF3aW5nQXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3Jl YXRlRHJhd2luZ0FyZWFQcm94eSgpCit7CisgICAgcmV0dXJuIFttX3drVmlldyBfY3JlYXRlRHJh d2luZ0FyZWFQcm94eV07Cit9CisKK3ZvaWQgUGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rp c3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCkKK3sKKyAgICBbbV93a1ZpZXcgc2V0 TmVlZHNEaXNwbGF5SW5SZWN0OnJlY3RdOworfQorCiBJbnRTaXplIFBhZ2VDbGllbnRJbXBsOjp2 aWV3U2l6ZSgpCiB7CiAgICAgcmV0dXJuIEludFNpemUoW21fd2tWaWV3IGJvdW5kc10uc2l6ZSk7 CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gNzU0NTIpCisr KyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAt MTY2LDcgKzE2Niw2IEBAIC0gKGlkKWluaXRXaXRoRnJhbWU6KE5TUmVjdClmcmFtZSBjb250ZXgK IAogICAgIF9kYXRhLT5fcGFnZUNsaWVudCA9IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGUoc2VsZik7 CiAgICAgX2RhdGEtPl9wYWdlID0gdG9JbXBsKGNvbnRleHRSZWYpLT5jcmVhdGVXZWJQYWdlKF9k YXRhLT5fcGFnZUNsaWVudC5nZXQoKSwgdG9JbXBsKHBhZ2VHcm91cFJlZikpOwotICAgIF9kYXRh LT5fcGFnZS0+c2V0RHJhd2luZ0FyZWEoQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNy ZWF0ZShzZWxmLCBfZGF0YS0+X3BhZ2UuZ2V0KCkpKTsKICAgICBfZGF0YS0+X3BhZ2UtPmluaXRp YWxpemVXZWJQYWdlKEludFNpemUoZnJhbWUuc2l6ZSkpOwogCiAgICAgV2ViQ29udGV4dDo6c3Rh dGlzdGljcygpLndrVmlld0NvdW50Kys7CkBAIC0xMTk5LDYgKzExOTgsMTEgQEAgLSAoQk9PTClj YW5QcmludEhlYWRlcnNBbmRGb290ZXJzCiAKIEBpbXBsZW1lbnRhdGlvbiBXS1ZpZXcgKEludGVy bmFsKQogCistIChQYXNzT3duUHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pX2NyZWF0ZURy YXdpbmdBcmVhUHJveHkKK3sKKyAgICByZXR1cm4gQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJv eHk6OmNyZWF0ZShzZWxmLCBfZGF0YS0+X3BhZ2UuZ2V0KCkpOworfQorCiAtIChCT09MKV9pc0Zv Y3VzZWQKIHsKICAgICBpZiAoX2RhdGEtPl9pbkJlY29tZUZpcnN0UmVzcG9uZGVyKQpJbmRleDog V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkocmV2aXNpb24gNzU0 NTIpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgJKHdvcmtp bmcgY29weSkKQEAgLTI4LDEwICsyOCwxMiBAQAogI2ltcG9ydCA8V2ViQ29yZS9LZXlib2FyZEV2 ZW50Lmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgeworICAgIGNsYXNzIERyYXdpbmdBcmVhUHJveHk7 CiAgICAgY2xhc3MgRmluZEluZGljYXRvcjsKIH0KIAogQGludGVyZmFjZSBXS1ZpZXcgKEludGVy bmFsKQorLSAoUGFzc093blB0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+KV9jcmVhdGVEcmF3 aW5nQXJlYVByb3h5OwogLSAoQk9PTClfaXNGb2N1c2VkOwogLSAodm9pZClfcHJvY2Vzc0RpZENy YXNoOwogLSAodm9pZClfZGlkUmVsYXVuY2hQcm9jZXNzOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3a3BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xd2twYWdlLmNwcAkocmV2aXNpb24gNzU0NTIpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXdrcGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw2ICsxMjAsMTYgQEAgdm9p ZCBRV0tQYWdlUHJpdmF0ZTo6dGFrZUZvY3VzKGJvb2wgZGlyZQogICAgIGVtaXQgcS0+Zm9jdXNO ZXh0UHJldkNoaWxkKGRpcmVjdGlvbik7CiB9CiAKK1Bhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94 eT4gUVdLUGFnZVByaXZhdGU6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQoreworICAgIC8vIEZJ WE1FOiBJbXBsZW1lbnQuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTIxODMuCit9CisKK3ZvaWQgUVdLUGFnZVByaXZhdGU6OnNldFZpZXdOZWVkc0Rpc3BsYXko Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCkKK3sKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50 LiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMTgzLgorfQor CiBXZWJDb3JlOjpJbnRTaXplIFFXS1BhZ2VQcml2YXRlOjp2aWV3U2l6ZSgpCiB7CiAgICAgLy8g RklYTUU6IEltcGxlbWVudC4KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdl X3AuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmgJ KHJldmlzaW9uIDc1NDUyKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5o CSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGluaXQo Y29uc3QgUVNpemUmIHZpZXdwb3J0U2l6ZSwgV1RGOjpQYXNzT3duUHRyPFdlYktpdDo6RHJhd2lu Z0FyZWFQcm94eT4pOwogCiAgICAgLy8gUGFnZUNsaWVudAorICAgIHZpcnR1YWwgUGFzc093blB0 cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7CisgICAgdmlydHVh bCB2b2lkIHNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOworCiAg ICAgdmlydHVhbCBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCk7CiAgICAgdmlydHVhbCBib29s IGlzVmlld1dpbmRvd0FjdGl2ZSgpOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdGb2N1c2VkKCk7 CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiA3NTQ1NykKKysrIFdl YktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM2LDcg KzIzNiw2IEBAIFdlYlZpZXc6OldlYlZpZXcoUkVDVCByZWN0LCBXZWJDb250ZXh0KiAKICAgICBy ZWdpc3RlcldlYlZpZXdXaW5kb3dDbGFzcygpOwogCiAgICAgbV9wYWdlID0gY29udGV4dC0+Y3Jl YXRlV2ViUGFnZSh0aGlzLCBwYWdlR3JvdXApOwotICAgIG1fcGFnZS0+c2V0RHJhd2luZ0FyZWEo Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh0aGlzLCBtX3BhZ2UuZ2V0KCkp KTsKIAogICAgIG1fd2luZG93ID0gOjpDcmVhdGVXaW5kb3dFeCgwLCBrV2ViS2l0MldlYlZpZXdX aW5kb3dDbGFzc05hbWUsIDAsIFdTX0NISUxEIHwgV1NfQ0xJUFNJQkxJTkdTIHwgV1NfQ0xJUENI SUxEUkVOLAogICAgICAgICByZWN0LnRvcCwgcmVjdC5sZWZ0LCByZWN0LnJpZ2h0IC0gcmVjdC5s ZWZ0LCByZWN0LmJvdHRvbSAtIHJlY3QudG9wLCBwYXJlbnRXaW5kb3cgPyBwYXJlbnRXaW5kb3cg OiBIV05EX01FU1NBR0UsIDAsIGluc3RhbmNlSGFuZGxlKCksIHRoaXMpOwpAQCAtNTc1LDYgKzU3 NCwxNyBAQCB2b2lkIFdlYlZpZXc6OmNsb3NlKCkKIAogLy8gUGFnZUNsaWVudAogCitQYXNzT3du UHRyPERyYXdpbmdBcmVhUHJveHk+IFdlYlZpZXc6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQor eworICAgIHJldHVybiBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHRoaXMs IG1fcGFnZS5nZXQoKSk7Cit9CisKK3ZvaWQgV2ViVmlldzo6c2V0Vmlld05lZWRzRGlzcGxheShj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQoreworICAgIFJFQ1QgciA9IHJlY3Q7CisgICAg OjpJbnZhbGlkYXRlUmVjdChtX3dpbmRvdywgJnIsIGZhbHNlKTsKK30KKwogV2ViQ29yZTo6SW50 U2l6ZSBXZWJWaWV3Ojp2aWV3U2l6ZSgpCiB7CiAgICAgUkVDVCBjbGllbnRSZWN0OwpJbmRleDog V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJ UHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lvbiA3NTQ1MikKKysrIFdlYktpdDIvVUlQcm9j ZXNzL3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNCw2ICsxMDQsOCBAQCBwcml2 YXRlOgogICAgIHZvaWQgdXBkYXRlTmF0aXZlQ3Vyc29yKCk7CiAKICAgICAvLyBQYWdlQ2xpZW50 CisgICAgdmlydHVhbCBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdB cmVhUHJveHkoKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBX ZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXpl KCk7CiAgICAgdmlydHVhbCBib29sIGlzVmlld1dpbmRvd0FjdGl2ZSgpOwogICAgIHZpcnR1YWwg Ym9vbCBpc1ZpZXdGb2N1c2VkKCk7Cg== 78528 2011-01-11 07:33:45 -0800 2011-01-11 08:38:09 -0800 patch with qt parts 0001-Work-towards-having-the-WebPageProxy-decide-when-to-.patch text/plain 14837 kbalazs RnJvbSA2YzMzM2IwZTFiZDdkODMyZDkwM2U4NThiMzE1NDIzZGZmYjMxZWI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCYWxhenMgS2VsZW1lbiA8a2JhbGF6c0B3ZWJraXQub3JnPgpE YXRlOiBUdWUsIDExIEphbiAyMDExIDE0OjU4OjAwICswMDAwClN1YmplY3Q6IFtQQVRDSF0gV29y ayB0b3dhcmRzIGhhdmluZyB0aGUgV2ViUGFnZVByb3h5IGRlY2lkZSB3aGVuIHRvIGNyZWF0ZSB0 aGUgRHJhd2luZ0FyZWFQcm94eQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUyMTg0CgpQYXRjaCBieSBBbmRlcnMgQ2FybHNzb24gPGFuZGVyc2NhQGFwcGxlLmNvbT4g b24gMjAxMS0wMS0xMQpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClF0IHBhcnQgbWFkZSBt eSBCYWxhenMgS2VsZW1lbi4KCiogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaDoK KiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKFdlYktpdDo6UGFnZUNsaWVu dEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkpOgpDYWxsIC1bV0tWaWV3IF9jcmVhdGVEcmF3 aW5nQXJlYVByb3h5XS4KCihXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNw bGF5KToKQ2FsbCBzZXROZWVkc0Rpc3BsYXlJblJlY3Qgb24gdGhlIFdLVmlldy4KCiogVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgooLVtXS1ZpZXcgaW5pdFdpdGhGcmFtZTpjb250ZXh0UmVm OnBhZ2VHcm91cFJlZjpdKToKTm8gbmVlZCB0byBzZXQgdGhlIGRyYXdpbmcgYXJlYSBwcm94eSBh bnltb3JlLgoKKC1bV0tWaWV3IF9jcmVhdGVEcmF3aW5nQXJlYVByb3h5XSk6CkNyZWF0ZSBhIGNo dW5rZWQgdXBkYXRlIGRyYXdpbmcgYXJlYSBwcm94eSBmb3Igbm93LgoKKiBVSVByb2Nlc3MvQVBJ L3F0L3F3a3BhZ2UuY3BwOgpBZGRlZCBhIFFHcmFwaGljc1dLVmlldyogbWVtYmVyIHRvIFFXS1Bh Z2VQcml2YXRlIGFuZCBpbXBsZW1lbnQgdGhlIG5ldyBmdW5jdGlvbnMuCihRV0tQYWdlUHJpdmF0 ZTo6UVdLUGFnZVByaXZhdGUpOgooUVdLUGFnZVByaXZhdGU6OmNyZWF0ZURyYXdpbmdBcmVhUHJv eHkpOgooUVdLUGFnZVByaXZhdGU6OnNldFZpZXdOZWVkc0Rpc3BsYXkpOgooUVdLUGFnZTo6UVdL UGFnZSk6CiogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmg6CiogVUlQcm9jZXNzL0FQSS9xdC9x d2twYWdlX3AuaDoKCiogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKQWRkIG5ldyBwdXJlIHZpcnR1 YWwgbWVtYmVyIGZ1bmN0aW9ucy4KCiogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CihXZWJL aXQ6OldlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgooV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UpOgpTZXQgdGhlIG5ldyBkcmF3aW5nIGFyZWEgcHJveHku CgoqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHA6CihXZWJLaXQ6OldlYlZpZXc6OldlYlZpZXcp OgpObyBuZWVkIHRvIHNldCB0aGUgZHJhd2luZyBhcmVhIHByb3h5IGFueW1vcmUuCgooV2ViS2l0 OjpXZWJWaWV3OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKQ3JlYXRlIGEgY2h1bmtlZCB1cGRh dGUgZHJhd2luZyBhcmVhIHByb3h5IGZvciBub3cuCgooV2ViS2l0OjpXZWJWaWV3OjpzZXRWaWV3 TmVlZHNEaXNwbGF5KToKSW52YWxpZGF0ZSB0aGUgd2luZG93LgotLS0KIFdlYktpdDIvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICA1MSArKysrKysrKysrKysrKysrKysr KysrKysrKwogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oICAgfCAg ICAzICsrCiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tICB8ICAg MTAgKysrKysKIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tICAgICAgICAgIHwg ICAgNiArKystCiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmggICB8 ICAgIDIgKwogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FncmFwaGljc3drdmlldy5jcHAgfCAg ICAyICstCiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAgICAgICAgICB8ICAg MjQgKysrKysrKysrKystLQogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaCAgICAg ICAgICAgfCAgICAzICstCiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmggICAg ICAgICB8ICAgIDcgKysrLQogV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oICAgICAgICAg ICAgICAgfCAgICA3ICsrKysKIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgICAg ICAgICAgIHwgICAgMiArCiBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAgICAgICAg ICAgICB8ICAgMTIgKysrKysrLQogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaCAgICAg ICAgICAgICAgfCAgICAyICsKIDEzIGZpbGVzIGNoYW5nZWQsIDEyMyBpbnNlcnRpb25zKCspLCA4 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggNzhlZDNhMi4uZmYxOGY0MCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1NCBAQAorMjAxMS0wMS0x MSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdvcmsgdG93YXJkcyBoYXZpbmcgdGhl IFdlYlBhZ2VQcm94eSBkZWNpZGUgd2hlbiB0byBjcmVhdGUgdGhlIERyYXdpbmdBcmVhUHJveHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMTg0CisK KyAgICAgICAgUXQgcGFydCBtYWRlIG15IEJhbGF6cyBLZWxlbWVuLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6 OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICBDYWxsIC1bV0tWaWV3IF9jcmVhdGVE cmF3aW5nQXJlYVByb3h5XS4KKworICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2V0 Vmlld05lZWRzRGlzcGxheSk6CisgICAgICAgIENhbGwgc2V0TmVlZHNEaXNwbGF5SW5SZWN0IG9u IHRoZSBXS1ZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06Cisg ICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOmNvbnRleHRSZWY6cGFnZUdyb3VwUmVmOl0p OgorICAgICAgICBObyBuZWVkIHRvIHNldCB0aGUgZHJhd2luZyBhcmVhIHByb3h5IGFueW1vcmUu CisKKyAgICAgICAgKC1bV0tWaWV3IF9jcmVhdGVEcmF3aW5nQXJlYVByb3h5XSk6CisgICAgICAg IENyZWF0ZSBhIGNodW5rZWQgdXBkYXRlIGRyYXdpbmcgYXJlYSBwcm94eSBmb3Igbm93LgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcDoKKyAgICAgICAgQWRkZWQgYSBR R3JhcGhpY3NXS1ZpZXcqIG1lbWJlciB0byBRV0tQYWdlUHJpdmF0ZSBhbmQgaW1wbGVtZW50IHRo ZSBuZXcgZnVuY3Rpb25zLgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6OlFXS1BhZ2VQcml2YXRl KToKKyAgICAgICAgKFFXS1BhZ2VQcml2YXRlOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAg ICAgICAgKFFXS1BhZ2VQcml2YXRlOjpzZXRWaWV3TmVlZHNEaXNwbGF5KToKKyAgICAgICAgKFFX S1BhZ2U6OlFXS1BhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmg6CisgICAgCisgICAgICAgICog VUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgQWRkIG5ldyBwdXJlIHZpcnR1YWwgbWVt YmVyIGZ1bmN0aW9ucy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAg U2V0IHRoZSBuZXcgZHJhd2luZyBhcmVhIHByb3h5LgorCisgICAgICAgICogVUlQcm9jZXNzL3dp bi9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6V2ViVmlldyk6CisgICAg ICAgIE5vIG5lZWQgdG8gc2V0IHRoZSBkcmF3aW5nIGFyZWEgcHJveHkgYW55bW9yZS4KKworICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAg Q3JlYXRlIGEgY2h1bmtlZCB1cGRhdGUgZHJhd2luZyBhcmVhIHByb3h5IGZvciBub3cuCisKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6c2V0Vmlld05lZWRzRGlzcGxheSk6CisgICAgICAgIElu dmFsaWRhdGUgdGhlIHdpbmRvdy4KKwogMjAxMS0wMS0xMSAgQWRhbSBSb2JlbiAgPGFyb2JlbkBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGEgdHlwbyBpbiBhIGNvbW1lbnQKZGlmZiAtLWdpdCBh L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaCBiL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAppbmRleCBhODc1MmMwLi42MDkwMzlmIDEw MDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKKysr IGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCkBAIC00OCw2ICs0 OCw5IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgUGFnZUNsaWVudEltcGwoV0tWaWV3Kik7CiAK KyAgICB2aXJ0dWFsIFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0Fy ZWFQcm94eSgpOworICAgIHZpcnR1YWwgdm9pZCBzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdl YkNvcmU6OkludFJlY3QmKTsKKyAgICAKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkludFNpemUgdmll d1NpemUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNWaWV3V2luZG93QWN0aXZlKCk7CiAgICAgdmly dHVhbCBib29sIGlzVmlld0ZvY3VzZWQoKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0gYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1Bh Z2VDbGllbnRJbXBsLm1tCmluZGV4IDg3NzlmMmYuLmFlNTllYmEgMTAwNjQ0Ci0tLSBhL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KKysrIGIvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQpAQCAtMTE4LDYgKzExOCwxNiBAQCBQYWdl Q2xpZW50SW1wbDo6flBhZ2VDbGllbnRJbXBsKCkKIHsKIH0KIAorUGFzc093blB0cjxEcmF3aW5n QXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCit7Cisg ICAgcmV0dXJuIFttX3drVmlldyBfY3JlYXRlRHJhd2luZ0FyZWFQcm94eV07Cit9CisKK3ZvaWQg UGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVj dCYgcmVjdCkKK3sKKyAgICBbbV93a1ZpZXcgc2V0TmVlZHNEaXNwbGF5SW5SZWN0OnJlY3RdOwor fQorCiBJbnRTaXplIFBhZ2VDbGllbnRJbXBsOjp2aWV3U2l6ZSgpCiB7CiAgICAgcmV0dXJuIElu dFNpemUoW21fd2tWaWV3IGJvdW5kc10uc2l6ZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 Lm1tCmluZGV4IDdjMmRmZWIuLjUzMjJkN2UgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 Lm1tCkBAIC0xNjYsNyArMTY2LDYgQEAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgVmFsaWRhdGlv blZlY3Rvcj4gVmFsaWRhdGlvbk1hcDsKIAogICAgIF9kYXRhLT5fcGFnZUNsaWVudCA9IFBhZ2VD bGllbnRJbXBsOjpjcmVhdGUoc2VsZik7CiAgICAgX2RhdGEtPl9wYWdlID0gdG9JbXBsKGNvbnRl eHRSZWYpLT5jcmVhdGVXZWJQYWdlKF9kYXRhLT5fcGFnZUNsaWVudC5nZXQoKSwgdG9JbXBsKHBh Z2VHcm91cFJlZikpOwotICAgIF9kYXRhLT5fcGFnZS0+c2V0RHJhd2luZ0FyZWEoQ2h1bmtlZFVw ZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZShzZWxmLCBfZGF0YS0+X3BhZ2UuZ2V0KCkpKTsK ICAgICBfZGF0YS0+X3BhZ2UtPmluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBXZWJDb250ZXh0 OjpzdGF0aXN0aWNzKCkud2tWaWV3Q291bnQrKzsKQEAgLTExOTksNiArMTE5OCwxMSBAQCBzdGF0 aWMgdm9pZCBleHRyYWN0VW5kZXJsaW5lcyhOU0F0dHJpYnV0ZWRTdHJpbmcgKnN0cmluZywgVmVj dG9yPENvbXBvc2l0aW9uVW5kZQogCiBAaW1wbGVtZW50YXRpb24gV0tWaWV3IChJbnRlcm5hbCkK IAorLSAoUGFzc093blB0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+KV9jcmVhdGVEcmF3aW5n QXJlYVByb3h5Cit7CisgICAgcmV0dXJuIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5Ojpj cmVhdGUoc2VsZiwgX2RhdGEtPl9wYWdlLmdldCgpKTsKK30KKwogLSAoQk9PTClfaXNGb2N1c2Vk CiB7CiAgICAgaWYgKF9kYXRhLT5faW5CZWNvbWVGaXJzdFJlc3BvbmRlcikKZGlmZiAtLWdpdCBh L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaCBiL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAppbmRleCA0OTM5ZDkxLi4xYzcwYjM4IDEw MDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKKysr IGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCkBAIC0yOCwxMCAr MjgsMTIgQEAKICNpbXBvcnQgPFdlYkNvcmUvS2V5Ym9hcmRFdmVudC5oPgogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKKyAgICBjbGFzcyBEcmF3aW5nQXJlYVByb3h5OwogICAgIGNsYXNzIEZpbmRJbmRp Y2F0b3I7CiB9CiAKIEBpbnRlcmZhY2UgV0tWaWV3IChJbnRlcm5hbCkKKy0gKFBhc3NPd25QdHI8 V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PilfY3JlYXRlRHJhd2luZ0FyZWFQcm94eTsKIC0gKEJP T0wpX2lzRm9jdXNlZDsKIC0gKHZvaWQpX3Byb2Nlc3NEaWRDcmFzaDsKIC0gKHZvaWQpX2RpZFJl bGF1bmNoUHJvY2VzczsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZ3Jh cGhpY3N3a3ZpZXcuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FncmFwaGljc3drdmll dy5jcHAKaW5kZXggNGEyZTZiMS4uNzk1NDU1ZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FncmFwaGljc3drdmlldy5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FncmFwaGljc3drdmlldy5jcHAKQEAgLTY4LDcgKzY4LDcgQEAgUUdyYXBoaWNzV0tWaWV3 OjpRR3JhcGhpY3NXS1ZpZXcoUVdLQ29udGV4dCogY29udGV4dCwgQmFja2luZ1N0b3JlVHlwZSBi YWNraW5nU3QKIAogICAgIFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gZHJhd2luZ0FyZWFQ cm94eTsKIAotICAgIGQtPnBhZ2UgPSBuZXcgUVdLUGFnZShjb250ZXh0KTsKKyAgICBkLT5wYWdl ID0gbmV3IFFXS1BhZ2UodGhpcywgY29udGV4dCk7CiAKICAgICBzd2l0Y2ggKGJhY2tpbmdTdG9y ZVR5cGUpIHsKICNpZiBFTkFCTEUoVElMRURfQkFDS0lOR19TVE9SRSkKZGlmZiAtLWdpdCBhL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xd2twYWdlLmNwcAppbmRleCA5OWVlNjE3Li4xZDQyNTAzIDEwMDY0NAotLS0gYS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3F3a3BhZ2UuY3BwCkBAIC0yMyw3ICsyMyw5IEBACiAKICNpbmNsdWRlICJxd2twcmVm ZXJlbmNlc19wLmgiCiAKKyNpbmNsdWRlICJDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eS5o IgogI2luY2x1ZGUgIkNsaWVudEltcGwuaCIKKyNpbmNsdWRlICJxZ3JhcGhpY3N3a3ZpZXcuaCIK ICNpbmNsdWRlICJxd2tjb250ZXh0LmgiCiAjaW5jbHVkZSAicXdrY29udGV4dF9wLmgiCiAjaW5j bHVkZSAicXdraGlzdG9yeS5oIgpAQCAtMzEsNiArMzMsNyBAQAogI2luY2x1ZGUgIkZpbmRJbmRp Y2F0b3IuaCIKICNpbmNsdWRlICJMb2NhbGl6ZWRTdHJpbmdzLmgiCiAjaW5jbHVkZSAiTmF0aXZl V2ViS2V5Ym9hcmRFdmVudC5oIgorI2luY2x1ZGUgIlRpbGVkRHJhd2luZ0FyZWFQcm94eS5oIgog I2luY2x1ZGUgIldlYkNvbnRleHQuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudVByb3h5UXQu aCIKICNpbmNsdWRlICJXZWJFdmVudEZhY3RvcnlRdC5oIgpAQCAtNzksOCArODIsOSBAQCBzdGF0 aWMgV2ViQ29yZTo6Q29udGV4dE1lbnVBY3Rpb24gY29udGV4dE1lbnVBY3Rpb25Gb3JXZWJBY3Rp b24oUVdLUGFnZTo6V2ViQWN0aQogICAgIHJldHVybiBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1U YWdOb0FjdGlvbjsKIH0KIAotUVdLUGFnZVByaXZhdGU6OlFXS1BhZ2VQcml2YXRlKFFXS1BhZ2Uq IHFxLCBRV0tDb250ZXh0KiBjKQorUVdLUGFnZVByaXZhdGU6OlFXS1BhZ2VQcml2YXRlKFFXS1Bh Z2UqIHFxLCBRR3JhcGhpY3NXS1ZpZXcqIHYsIFFXS0NvbnRleHQqIGMpCiAgICAgOiBxKHFxKQor ICAgICwgdmlldyh2KQogICAgICwgY29udGV4dChjKQogICAgICwgcHJlZmVyZW5jZXMoMCkKICAg ICAsIGNyZWF0ZU5ld1BhZ2VGbigwKQpAQCAtMTIwLDYgKzEyNCwyMCBAQCB2b2lkIFFXS1BhZ2VQ cml2YXRlOjp0YWtlRm9jdXMoYm9vbCBkaXJlY3Rpb24pCiAgICAgZW1pdCBxLT5mb2N1c05leHRQ cmV2Q2hpbGQoZGlyZWN0aW9uKTsKIH0KIAorUGFzc093blB0cjxEcmF3aW5nQXJlYVByb3h5PiBR V0tQYWdlUHJpdmF0ZTo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCit7CisjaWYgRU5BQkxFKFRJ TEVEX0JBQ0tJTkdfU1RPUkUpCisgICAgaWYgKHBhZ2UtPmRyYXdpbmdBcmVhKCktPmluZm8oKS50 eXBlID09IERyYXdpbmdBcmVhSW5mbzo6VGlsZWQpCisgICAgICAgIHJldHVybiBUaWxlZERyYXdp bmdBcmVhUHJveHk6OmNyZWF0ZSh2aWV3LCBwYWdlLmdldCgpKTsKKyNlbmRpZgorICAgIHJldHVy biBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHZpZXcsIHBhZ2UuZ2V0KCkp OworfQorCit2b2lkIFFXS1BhZ2VQcml2YXRlOjpzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdl YkNvcmU6OkludFJlY3QmIHJlY3QpCit7CisgICAgdmlldy0+dXBkYXRlKFFSZWN0KHJlY3QpKTsK K30KKwogV2ViQ29yZTo6SW50U2l6ZSBRV0tQYWdlUHJpdmF0ZTo6dmlld1NpemUoKQogewogICAg IC8vIEZJWE1FOiBJbXBsZW1lbnQuCkBAIC0zNTMsOCArMzcxLDggQEAgdm9pZCBRV0tQYWdlUHJp dmF0ZTo6dG91Y2hFdmVudChRVG91Y2hFdmVudCogZXZlbnQpCiAjZW5kaWYKIH0KIAotUVdLUGFn ZTo6UVdLUGFnZShRV0tDb250ZXh0KiBjb250ZXh0KQotICAgIDogZChuZXcgUVdLUGFnZVByaXZh dGUodGhpcywgY29udGV4dCkpCitRV0tQYWdlOjpRV0tQYWdlKFFHcmFwaGljc1dLVmlldyogdmll dywgUVdLQ29udGV4dCogY29udGV4dCkKKyAgICA6IGQobmV3IFFXS1BhZ2VQcml2YXRlKHRoaXMs IHZpZXcsIGNvbnRleHQpKQogewogICAgIFdLUGFnZUxvYWRlckNsaWVudCBsb2FkQ2xpZW50ID0g ewogICAgICAgICAwLCAgICAgIC8qIHZlcnNpb24gKi8KZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xd2twYWdlLmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFn ZS5oCmluZGV4IDU1NGFkOGUuLmY3MjkxMDggMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xd2twYWdlLmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2Uu aApAQCAtMTIsNiArMTIsNyBAQAogI2luY2x1ZGUgPFdlYktpdDIvV0tQYWdlLmg+CiAKIGNsYXNz IFFDdXJzb3I7CitjbGFzcyBRR3JhcGhpY3NXS1ZpZXc7CiBjbGFzcyBRV0tDb250ZXh0OwogY2xh c3MgUVdLR3JhcGhpY3NXaWRnZXQ7CiBjbGFzcyBRV0tQcmVmZXJlbmNlczsKQEAgLTc2LDcgKzc3 LDcgQEAgcHVibGljOgogICAgICAgICBmcmllbmQgY2xhc3MgUVdLUGFnZTsKICAgICB9OwogCi0g ICAgUVdLUGFnZShRV0tDb250ZXh0Kik7CisgICAgUVdLUGFnZShRR3JhcGhpY3NXS1ZpZXcqLCBR V0tDb250ZXh0Kik7CiAgICAgdmlydHVhbCB+UVdLUGFnZSgpOwogCiAgICAgV0tQYWdlUmVmIHBh Z2VSZWYoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2tw YWdlX3AuaCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAppbmRleCBiYmFl NWQ2Li4yOTgxNDA3IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFn ZV9wLmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCkBAIC0zMSwx MSArMzEsMTIgQEAKICNpbmNsdWRlIDxRR3JhcGhpY3NWaWV3PgogI2luY2x1ZGUgPFFLZXlFdmVu dD4KIAorY2xhc3MgUUdyYXBoaWNzV0tWaWV3OwogY2xhc3MgUVdLUHJlZmVyZW5jZXM7CiAKIGNs YXNzIFFXS1BhZ2VQcml2YXRlIDogV2ViS2l0OjpQYWdlQ2xpZW50IHsKIHB1YmxpYzoKLSAgICBR V0tQYWdlUHJpdmF0ZShRV0tQYWdlKiwgUVdLQ29udGV4dCopOworICAgIFFXS1BhZ2VQcml2YXRl KFFXS1BhZ2UqLCBRR3JhcGhpY3NXS1ZpZXcqLCBRV0tDb250ZXh0Kik7CiAgICAgflFXS1BhZ2VQ cml2YXRlKCk7CiAKICAgICBzdGF0aWMgUVdLUGFnZVByaXZhdGUqIGdldChRV0tQYWdlKiBwYWdl KSB7IHJldHVybiBwYWdlLT5kOyB9CkBAIC00Myw2ICs0NCw5IEBAIHB1YmxpYzoKICAgICB2b2lk IGluaXQoY29uc3QgUVNpemUmIHZpZXdwb3J0U2l6ZSwgV1RGOjpQYXNzT3duUHRyPFdlYktpdDo6 RHJhd2luZ0FyZWFQcm94eT4pOwogCiAgICAgLy8gUGFnZUNsaWVudAorICAgIHZpcnR1YWwgUGFz c093blB0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHko KTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpJ bnRSZWN0Jik7CisKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkludFNpemUgdmlld1NpemUoKTsKICAg ICB2aXJ0dWFsIGJvb2wgaXNWaWV3V2luZG93QWN0aXZlKCk7CiAgICAgdmlydHVhbCBib29sIGlz Vmlld0ZvY3VzZWQoKTsKQEAgLTk5LDYgKzEwMyw3IEBAIHB1YmxpYzoKIAogICAgIFFXS1BhZ2Uq IHE7CiAKKyAgICBRR3JhcGhpY3NXS1ZpZXcqIHZpZXc7CiAgICAgUVdLQ29udGV4dCogY29udGV4 dDsKICAgICBRV0tIaXN0b3J5KiBoaXN0b3J5OwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJv Y2Vzcy9QYWdlQ2xpZW50LmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXgg MmFmNjY3Ny4uZjQxMzM0MiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaApAQCAtMzcsNiArMzcsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBEcmF3 aW5nQXJlYVByb3h5OwogY2xhc3MgRmluZEluZGljYXRvcjsKIGNsYXNzIE5hdGl2ZVdlYktleWJv YXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwpAQCAtNDgsNiArNDksMTIg QEAgY2xhc3MgUGFnZUNsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+UGFnZUNsaWVudCgp IHsgfQogCisgICAgLy8gQ3JlYXRlIGEgbmV3IGRyYXdpbmcgYXJlYSBwcm94eSBmb3IgdGhlIGdp dmVuIHBhZ2UuCisgICAgdmlydHVhbCBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0 ZURyYXdpbmdBcmVhUHJveHkoKSA9IDA7CisKKyAgICAvLyBUZWxsIHRoZSB2aWV3IHRvIGludmFs aWRhdGUgdGhlIGdpdmVuIHJlY3QuIFRoZSByZWN0IGlzIGluIHZpZXcgY29vcmRpbmF0ZXMuCisg ICAgdmlydHVhbCB2b2lkIHNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVj dCYpID0gMDsKKwogICAgIC8vIFJldHVybiB0aGUgc2l6ZSBvZiB0aGUgdmlldyB0aGUgcGFnZSBp cyBhc3NvY2lhdGVkIHdpdGguCiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXpl KCkgPSAwOwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBkZjBiMDcxLi43MDNl YmVmIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBi L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTIxOCw2ICsyMTgsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoKQogICAgICAgICByZXR1cm47CiAg ICAgfQogCisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZUNsaWVudC0+Y3JlYXRlRHJhd2luZ0Fy ZWFQcm94eSgpOwogICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKIAogICAgIHByb2Nlc3MoKS0+ c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwgY3JlYXRp b25QYXJhbWV0ZXJzKCkpLCAwKTsKQEAgLTIyOCw2ICsyMjksNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6cmVpbml0aWFsaXplV2ViUGFnZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKQogICAg IGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBtX2RyYXdpbmdBcmVhID0g bV9wYWdlQ2xpZW50LT5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7CiAgICAgQVNTRVJUKG1fZHJh d2luZ0FyZWEpOwogCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpD cmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMoKSksIDApOwpkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwIGIvV2ViS2l0Mi9VSVByb2Nl c3Mvd2luL1dlYlZpZXcuY3BwCmluZGV4IGM0OTYzN2EuLmMyMmQ1NGQgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy93 aW4vV2ViVmlldy5jcHAKQEAgLTIzNiw3ICsyMzYsNiBAQCBXZWJWaWV3OjpXZWJWaWV3KFJFQ1Qg cmVjdCwgV2ViQ29udGV4dCogY29udGV4dCwgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIEhXTkQg cAogICAgIHJlZ2lzdGVyV2ViVmlld1dpbmRvd0NsYXNzKCk7CiAKICAgICBtX3BhZ2UgPSBjb250 ZXh0LT5jcmVhdGVXZWJQYWdlKHRoaXMsIHBhZ2VHcm91cCk7Ci0gICAgbV9wYWdlLT5zZXREcmF3 aW5nQXJlYShDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHRoaXMsIG1fcGFn ZS5nZXQoKSkpOwogCiAgICAgbV93aW5kb3cgPSA6OkNyZWF0ZVdpbmRvd0V4KDAsIGtXZWJLaXQy V2ViVmlld1dpbmRvd0NsYXNzTmFtZSwgMCwgV1NfQ0hJTEQgfCBXU19DTElQU0lCTElOR1MgfCBX U19DTElQQ0hJTERSRU4sCiAgICAgICAgIHJlY3QudG9wLCByZWN0LmxlZnQsIHJlY3QucmlnaHQg LSByZWN0LmxlZnQsIHJlY3QuYm90dG9tIC0gcmVjdC50b3AsIHBhcmVudFdpbmRvdyA/IHBhcmVu dFdpbmRvdyA6IEhXTkRfTUVTU0FHRSwgMCwgaW5zdGFuY2VIYW5kbGUoKSwgdGhpcyk7CkBAIC01 NzUsNiArNTc0LDE3IEBAIHZvaWQgV2ViVmlldzo6Y2xvc2UoKQogCiAvLyBQYWdlQ2xpZW50CiAK K1Bhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gV2ViVmlldzo6Y3JlYXRlRHJhd2luZ0FyZWFQ cm94eSgpCit7CisgICAgcmV0dXJuIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpjcmVh dGUodGhpcywgbV9wYWdlLmdldCgpKTsKK30KKwordm9pZCBXZWJWaWV3OjpzZXRWaWV3TmVlZHNE aXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpCit7CisgICAgUkVDVCByID0gcmVj dDsKKyAgICA6OkludmFsaWRhdGVSZWN0KG1fd2luZG93LCAmciwgZmFsc2UpOworfQorCiBXZWJD b3JlOjpJbnRTaXplIFdlYlZpZXc6OnZpZXdTaXplKCkKIHsKICAgICBSRUNUIGNsaWVudFJlY3Q7 CmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oIGIvV2ViS2l0Mi9V SVByb2Nlc3Mvd2luL1dlYlZpZXcuaAppbmRleCBiZmZmMzQ0Li44YmY4YTVjIDEwMDY0NAotLS0g YS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCisrKyBiL1dlYktpdDIvVUlQcm9jZXNz L3dpbi9XZWJWaWV3LmgKQEAgLTEwNCw2ICsxMDQsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgdXBk YXRlTmF0aXZlQ3Vyc29yKCk7CiAKICAgICAvLyBQYWdlQ2xpZW50CisgICAgdmlydHVhbCBQYXNz T3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICB2 aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7 CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCk7CiAgICAgdmlydHVhbCBi b29sIGlzVmlld1dpbmRvd0FjdGl2ZSgpOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdGb2N1c2Vk KCk7Ci0tIAoxLjcuMy4yCgo= 78533 2011-01-11 08:38:16 -0800 2011-01-11 09:22:35 -0800 Patch bug-52184-20110111163814.patch text/plain 13397 kbalazs ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NzhlZDNhMjVmMWE1NmU0MmU1ZGZjM2NkOGE5MTk3ZWY0OTUzZGMxNS4uNGJiY2UyMGYyNjIzYzRh NTQ0NmU4N2ZkZjJmNTU4Yzk2MzJlNTdlNyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1OCBAQAorMjAxMS0wMS0xMSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdvcmsgdG93YXJkcyBoYXZpbmcgdGhlIFdlYlBh Z2VQcm94eSBkZWNpZGUgd2hlbiB0byBjcmVhdGUgdGhlIERyYXdpbmdBcmVhUHJveHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMTg0CisKKyAgICAg ICAgUXQgcGFydCBtYWRlIG15IEJhbGF6cyBLZWxlbWVuLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9Q YWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmNyZWF0 ZURyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICBDYWxsIC1bV0tWaWV3IF9jcmVhdGVEcmF3aW5n QXJlYVByb3h5XS4KKworICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2V0Vmlld05l ZWRzRGlzcGxheSk6CisgICAgICAgIENhbGwgc2V0TmVlZHNEaXNwbGF5SW5SZWN0IG9uIHRoZSBX S1ZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAg ICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOmNvbnRleHRSZWY6cGFnZUdyb3VwUmVmOl0pOgorICAg ICAgICBObyBuZWVkIHRvIHNldCB0aGUgZHJhd2luZyBhcmVhIHByb3h5IGFueW1vcmUuCisKKyAg ICAgICAgKC1bV0tWaWV3IF9jcmVhdGVEcmF3aW5nQXJlYVByb3h5XSk6CisgICAgICAgIENyZWF0 ZSBhIGNodW5rZWQgdXBkYXRlIGRyYXdpbmcgYXJlYSBwcm94eSBmb3Igbm93LgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9xdC9xZ3JhcGhpY3N3a3ZpZXcuY3BwOgorICAgICAgICBBZGRlZCBh IFFHcmFwaGljc0l0ZW0qIG1lbWJlciB0aGF0IGlzIGluaXRpYWxpemVkIGluIGluaXQgdG8gdGhl IGFjY29jaWF0ZWQgdmlldy4KKyAgICAgICAgSW1wbGVtZW50IHRoZSBuZXcgZnVuY3Rpb25zLiBU aGlzIGlzIGEgdGVtcG9yYXJ5IHNvbHV0aW9uLCBpbiB0aGUgbG9uZyB0ZXJtIHRoZSB2aWV3Cisg ICAgICAgIGFuZCB0aGUgcGFnZSBzaG91bGQgYmUgZGVjb3VwbGVkLgorICAgICAgICAoUUdyYXBo aWNzV0tWaWV3OjpRR3JhcGhpY3NXS1ZpZXcpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQv cXdrcGFnZS5jcHA6CisgICAgICAgIChRV0tQYWdlUHJpdmF0ZTo6UVdLUGFnZVByaXZhdGUpOgor ICAgICAgICAoUVdLUGFnZVByaXZhdGU6OmluaXQpOgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6 OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6OnNldFZp ZXdOZWVkc0Rpc3BsYXkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmg6CisgICAgICAgIAorICAgICAg ICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAgICAgIEFkZCBuZXcgcHVyZSB2aXJ0dWFs IG1lbWJlciBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVpbml0aWFsaXplV2ViUGFnZSk6CisgICAg ICAgIFNldCB0aGUgbmV3IGRyYXdpbmcgYXJlYSBwcm94eS4KKworICAgICAgICAqIFVJUHJvY2Vz cy93aW4vV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OldlYlZpZXcpOgor ICAgICAgICBObyBuZWVkIHRvIHNldCB0aGUgZHJhd2luZyBhcmVhIHByb3h5IGFueW1vcmUuCisK KyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSk6CisgICAg ICAgIENyZWF0ZSBhIGNodW5rZWQgdXBkYXRlIGRyYXdpbmcgYXJlYSBwcm94eSBmb3Igbm93Lgor CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnNldFZpZXdOZWVkc0Rpc3BsYXkpOgorICAgICAg ICBJbnZhbGlkYXRlIHRoZSB3aW5kb3cuCisKIDIwMTEtMDEtMTEgIEFkYW0gUm9iZW4gIDxhcm9i ZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhIHR5cG8gaW4gYSBjb21tZW50CmRpZmYgLS1n aXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmggYi9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKaW5kZXggYTg3NTJjMDNjM2M2MmYx ZDYyMzliMjJiMGE2MDIyM2MyY2Q1YzJhYS4uNjA5MDM5ZmM2MDU5OTVkN2U3ZDgwM2E1ZWUyOWVh Njk1MzU2MGI1NiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xp ZW50SW1wbC5oCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwu aApAQCAtNDgsNiArNDgsOSBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFBhZ2VDbGllbnRJbXBs KFdLVmlldyopOwogCisgICAgdmlydHVhbCBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlz cGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisgICAgCiAgICAgdmlydHVhbCBXZWJDb3Jl OjpJbnRTaXplIHZpZXdTaXplKCk7CiAgICAgdmlydHVhbCBib29sIGlzVmlld1dpbmRvd0FjdGl2 ZSgpOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdGb2N1c2VkKCk7CmRpZmYgLS1naXQgYS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tIGIvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQppbmRleCA4Nzc5ZjJmZGIxNzM3YzA4NzVhNGZm ZDhiMWY0N2Y4MzAzNDVmYTNiLi5hZTU5ZWJhZDI0NzNlMmE0NzAwMjk2MTBjZWM4ZWMxNWJkNTE3 ZTQzIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBs Lm1tCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KQEAg LTExOCw2ICsxMTgsMTYgQEAgUGFnZUNsaWVudEltcGw6On5QYWdlQ2xpZW50SW1wbCgpCiB7CiB9 CiAKK1Bhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6OmNyZWF0ZURy YXdpbmdBcmVhUHJveHkoKQoreworICAgIHJldHVybiBbbV93a1ZpZXcgX2NyZWF0ZURyYXdpbmdB cmVhUHJveHldOworfQorCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5 KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpCit7CisgICAgW21fd2tWaWV3IHNldE5lZWRz RGlzcGxheUluUmVjdDpyZWN0XTsKK30KKwogSW50U2l6ZSBQYWdlQ2xpZW50SW1wbDo6dmlld1Np emUoKQogewogICAgIHJldHVybiBJbnRTaXplKFttX3drVmlldyBib3VuZHNdLnNpemUpOwpkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCA3YzJkZmViYjRjMTVlMDFlOGVjM2VlMjEy OTFmY2FhNjZhZWZlZjA1Li41MzIyZDdlYTgyNmQwOTZiOWY4ZDgyZGRlMGVjYjE5ZTc3ZTMyZTQx IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMTY2LDcgKzE2Niw2IEBAIHR5 cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFZhbGlkYXRpb25WZWN0b3I+IFZhbGlkYXRpb25NYXA7CiAK ICAgICBfZGF0YS0+X3BhZ2VDbGllbnQgPSBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlKHNlbGYpOwog ICAgIF9kYXRhLT5fcGFnZSA9IHRvSW1wbChjb250ZXh0UmVmKS0+Y3JlYXRlV2ViUGFnZShfZGF0 YS0+X3BhZ2VDbGllbnQuZ2V0KCksIHRvSW1wbChwYWdlR3JvdXBSZWYpKTsKLSAgICBfZGF0YS0+ X3BhZ2UtPnNldERyYXdpbmdBcmVhKENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpjcmVh dGUoc2VsZiwgX2RhdGEtPl9wYWdlLmdldCgpKSk7CiAgICAgX2RhdGEtPl9wYWdlLT5pbml0aWFs aXplV2ViUGFnZSgpOwogCiAgICAgV2ViQ29udGV4dDo6c3RhdGlzdGljcygpLndrVmlld0NvdW50 Kys7CkBAIC0xMTk5LDYgKzExOTgsMTEgQEAgc3RhdGljIHZvaWQgZXh0cmFjdFVuZGVybGluZXMo TlNBdHRyaWJ1dGVkU3RyaW5nICpzdHJpbmcsIFZlY3RvcjxDb21wb3NpdGlvblVuZGUKIAogQGlt cGxlbWVudGF0aW9uIFdLVmlldyAoSW50ZXJuYWwpCiAKKy0gKFBhc3NPd25QdHI8V2ViS2l0OjpE cmF3aW5nQXJlYVByb3h5PilfY3JlYXRlRHJhd2luZ0FyZWFQcm94eQoreworICAgIHJldHVybiBD aHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHNlbGYsIF9kYXRhLT5fcGFnZS5n ZXQoKSk7Cit9CisKIC0gKEJPT0wpX2lzRm9jdXNlZAogewogICAgIGlmIChfZGF0YS0+X2luQmVj b21lRmlyc3RSZXNwb25kZXIpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1dLVmlld0ludGVybmFsLmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVy bmFsLmgKaW5kZXggNDkzOWQ5MTIyZWQ0Yjk5OGMyNDJhMTQ4NjUyOTdlMjA3YmExYTNmNC4uMWM3 MGIzOGY4ZmFiMmJmYjJiNzhlYmMzMzBlY2YwMzJhZDI1M2M0YSAxMDA2NDQKLS0tIGEvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCisrKyBiL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaApAQCAtMjgsMTAgKzI4LDEyIEBACiAjaW1wb3J0 IDxXZWJDb3JlL0tleWJvYXJkRXZlbnQuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CisgICAgY2xh c3MgRHJhd2luZ0FyZWFQcm94eTsKICAgICBjbGFzcyBGaW5kSW5kaWNhdG9yOwogfQogCiBAaW50 ZXJmYWNlIFdLVmlldyAoSW50ZXJuYWwpCistIChQYXNzT3duUHRyPFdlYktpdDo6RHJhd2luZ0Fy ZWFQcm94eT4pX2NyZWF0ZURyYXdpbmdBcmVhUHJveHk7CiAtIChCT09MKV9pc0ZvY3VzZWQ7CiAt ICh2b2lkKV9wcm9jZXNzRGlkQ3Jhc2g7CiAtICh2b2lkKV9kaWRSZWxhdW5jaFByb2Nlc3M7CmRp ZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWdyYXBoaWNzd2t2aWV3LmNwcCBi L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZ3JhcGhpY3N3a3ZpZXcuY3BwCmluZGV4IDRhMmU2 YjFjMzE0NWYwZmM3ZDc2ZTFiYzkzZjg4NzE0YWRiZTgzZDMuLjQ0Y2RmYTliYWI2OTkxYjczNDE2 MDhmMWE1ZmJmNTFkNTM4MGYxODIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xZ3JhcGhpY3N3a3ZpZXcuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZ3Jh cGhpY3N3a3ZpZXcuY3BwCkBAIC04Myw3ICs4Myw3IEBAIFFHcmFwaGljc1dLVmlldzo6UUdyYXBo aWNzV0tWaWV3KFFXS0NvbnRleHQqIGNvbnRleHQsIEJhY2tpbmdTdG9yZVR5cGUgYmFja2luZ1N0 CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGQtPnBhZ2UtPmQtPmluaXQoc2l6ZSgpLnRv U2l6ZSgpLCBkcmF3aW5nQXJlYVByb3h5KTsKKyAgICBkLT5wYWdlLT5kLT5pbml0KHRoaXMsIHNp emUoKS50b1NpemUoKSwgZHJhd2luZ0FyZWFQcm94eSk7CiAgICAgY29ubmVjdChkLT5wYWdlLCBT SUdOQUwodGl0bGVDaGFuZ2VkKFFTdHJpbmcpKSwgdGhpcywgU0lHTkFMKHRpdGxlQ2hhbmdlZChR U3RyaW5nKSkpOwogICAgIGNvbm5lY3QoZC0+cGFnZSwgU0lHTkFMKGxvYWRTdGFydGVkKCkpLCB0 aGlzLCBTSUdOQUwobG9hZFN0YXJ0ZWQoKSkpOwogICAgIGNvbm5lY3QoZC0+cGFnZSwgU0lHTkFM KGxvYWRGaW5pc2hlZChib29sKSksIHRoaXMsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsK ZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcCBiL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAppbmRleCA5OWVlNjE3ODE2ODM1NDc4NWNh MjM4MTQ1MTkzMTBhNmFkOWU1NmJhLi41MDdlOGQzNmI2N2JhZmQ5ZTE1ODZjMmQwYmJjZGMxMTll NzcwMjc2IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAK KysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCkBAIC0yMyw3ICsyMyw5 IEBACiAKICNpbmNsdWRlICJxd2twcmVmZXJlbmNlc19wLmgiCiAKKyNpbmNsdWRlICJDaHVua2Vk VXBkYXRlRHJhd2luZ0FyZWFQcm94eS5oIgogI2luY2x1ZGUgIkNsaWVudEltcGwuaCIKKyNpbmNs dWRlICJxZ3JhcGhpY3N3a3ZpZXcuaCIKICNpbmNsdWRlICJxd2tjb250ZXh0LmgiCiAjaW5jbHVk ZSAicXdrY29udGV4dF9wLmgiCiAjaW5jbHVkZSAicXdraGlzdG9yeS5oIgpAQCAtMzEsNiArMzMs NyBAQAogI2luY2x1ZGUgIkZpbmRJbmRpY2F0b3IuaCIKICNpbmNsdWRlICJMb2NhbGl6ZWRTdHJp bmdzLmgiCiAjaW5jbHVkZSAiTmF0aXZlV2ViS2V5Ym9hcmRFdmVudC5oIgorI2luY2x1ZGUgIlRp bGVkRHJhd2luZ0FyZWFQcm94eS5oIgogI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKICNpbmNsdWRl ICJXZWJDb250ZXh0TWVudVByb3h5UXQuaCIKICNpbmNsdWRlICJXZWJFdmVudEZhY3RvcnlRdC5o IgpAQCAtODEsNiArODQsNyBAQCBzdGF0aWMgV2ViQ29yZTo6Q29udGV4dE1lbnVBY3Rpb24gY29u dGV4dE1lbnVBY3Rpb25Gb3JXZWJBY3Rpb24oUVdLUGFnZTo6V2ViQWN0aQogCiBRV0tQYWdlUHJp dmF0ZTo6UVdLUGFnZVByaXZhdGUoUVdLUGFnZSogcXEsIFFXS0NvbnRleHQqIGMpCiAgICAgOiBx KHFxKQorICAgICwgdmlldygwKQogICAgICwgY29udGV4dChjKQogICAgICwgcHJlZmVyZW5jZXMo MCkKICAgICAsIGNyZWF0ZU5ld1BhZ2VGbigwKQpAQCAtOTYsOCArMTAwLDkgQEAgUVdLUGFnZVBy aXZhdGU6On5RV0tQYWdlUHJpdmF0ZSgpCiAgICAgZGVsZXRlIGhpc3Rvcnk7CiB9CiAKLXZvaWQg UVdLUGFnZVByaXZhdGU6OmluaXQoY29uc3QgUVNpemUmIHZpZXdwb3J0U2l6ZSwgUGFzc093blB0 cjxEcmF3aW5nQXJlYVByb3h5PiBwcm94eSkKK3ZvaWQgUVdLUGFnZVByaXZhdGU6OmluaXQoUUdy YXBoaWNzSXRlbSogdmlldywgY29uc3QgUVNpemUmIHZpZXdwb3J0U2l6ZSwgUGFzc093blB0cjxE cmF3aW5nQXJlYVByb3h5PiBwcm94eSkKIHsKKyAgICB0aGlzLT52aWV3ID0gdmlldzsKICAgICBw YWdlLT5zZXREcmF3aW5nQXJlYShwcm94eSk7CiAgICAgcGFnZS0+aW5pdGlhbGl6ZVdlYlBhZ2Uo KTsKIH0KQEAgLTEyMCw2ICsxMjUsMjMgQEAgdm9pZCBRV0tQYWdlUHJpdmF0ZTo6dGFrZUZvY3Vz KGJvb2wgZGlyZWN0aW9uKQogICAgIGVtaXQgcS0+Zm9jdXNOZXh0UHJldkNoaWxkKGRpcmVjdGlv bik7CiB9CiAKK1Bhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gUVdLUGFnZVByaXZhdGU6OmNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKQoreworICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYXZvaWQg dGhpcyBjYXN0IGJ5IGRlY291cGxpbmcgdGhlIHZpZXcgZnJvbSB0aGUgcGFnZS4KKyAgICBRR3Jh cGhpY3NXS1ZpZXcqIHdrVmlldyA9IHN0YXRpY19jYXN0PFFHcmFwaGljc1dLVmlldyo+KHZpZXcp OworCisjaWYgRU5BQkxFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisgICAgaWYgKHBhZ2UtPmRyYXdp bmdBcmVhKCktPmluZm8oKS50eXBlID09IERyYXdpbmdBcmVhSW5mbzo6VGlsZWQpCisgICAgICAg IHJldHVybiBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh3a1ZpZXcsIHBhZ2UuZ2V0KCkp OworI2VuZGlmCisgICAgcmV0dXJuIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpjcmVh dGUod2tWaWV3LCBwYWdlLmdldCgpKTsKK30KKwordm9pZCBRV0tQYWdlUHJpdmF0ZTo6c2V0Vmll d05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQoreworICAgIHZpZXct PnVwZGF0ZShRUmVjdChyZWN0KSk7Cit9CisKIFdlYkNvcmU6OkludFNpemUgUVdLUGFnZVByaXZh dGU6OnZpZXdTaXplKCkKIHsKICAgICAvLyBGSVhNRTogSW1wbGVtZW50LgpkaWZmIC0tZ2l0IGEv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xd2twYWdlLmgKaW5kZXggNTU0YWQ4ZWE3ZGU2YzNkOTM0NzBkYmFmMGQwOTEyY2ZhNDMw NjkxOC4uZTBiYjRjMzcwYzZmOGU1MTQ4ZTNiMGY2ODcyNDA2NzI0YWI3MjQ5NiAxMDA2NDQKLS0t IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaAorKysgYi9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXdrcGFnZS5oCkBAIC0xMiw2ICsxMiw3IEBACiAjaW5jbHVkZSA8V2ViS2l0 Mi9XS1BhZ2UuaD4KIAogY2xhc3MgUUN1cnNvcjsKK2NsYXNzIFFHcmFwaGljc0l0ZW07CiBjbGFz cyBRV0tDb250ZXh0OwogY2xhc3MgUVdLR3JhcGhpY3NXaWRnZXQ7CiBjbGFzcyBRV0tQcmVmZXJl bmNlczsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaCBi L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAppbmRleCBiYmFlNWQ2MTY1OWFl NTZkMTY5ODcxNDJjNGQ1YWFlODU1OWYxMTllLi41MjcyNmMwOTA4NTAwMjUwNWIxNjY1MzAwYmIw MTM3NmFlNWVmZWQ0IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFn ZV9wLmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCkBAIC0zMSw2 ICszMSw3IEBACiAjaW5jbHVkZSA8UUdyYXBoaWNzVmlldz4KICNpbmNsdWRlIDxRS2V5RXZlbnQ+ CiAKK2NsYXNzIFFHcmFwaGljc1dLVmlldzsKIGNsYXNzIFFXS1ByZWZlcmVuY2VzOwogCiBjbGFz cyBRV0tQYWdlUHJpdmF0ZSA6IFdlYktpdDo6UGFnZUNsaWVudCB7CkBAIC00MCw5ICs0MSwxMiBA QCBwdWJsaWM6CiAKICAgICBzdGF0aWMgUVdLUGFnZVByaXZhdGUqIGdldChRV0tQYWdlKiBwYWdl KSB7IHJldHVybiBwYWdlLT5kOyB9CiAKLSAgICB2b2lkIGluaXQoY29uc3QgUVNpemUmIHZpZXdw b3J0U2l6ZSwgV1RGOjpQYXNzT3duUHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pOworICAg IHZvaWQgaW5pdChRR3JhcGhpY3NJdGVtKiwgY29uc3QgUVNpemUmIHZpZXdwb3J0U2l6ZSwgV1RG OjpQYXNzT3duUHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pOwogCiAgICAgLy8gUGFnZUNs aWVudAorICAgIHZpcnR1YWwgUGFzc093blB0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlz cGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisKICAgICB2aXJ0dWFsIFdlYkNvcmU6Oklu dFNpemUgdmlld1NpemUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNWaWV3V2luZG93QWN0aXZlKCk7 CiAgICAgdmlydHVhbCBib29sIGlzVmlld0ZvY3VzZWQoKTsKQEAgLTk5LDYgKzEwMyw3IEBAIHB1 YmxpYzoKIAogICAgIFFXS1BhZ2UqIHE7CiAKKyAgICBRR3JhcGhpY3NJdGVtKiB2aWV3OwogICAg IFFXS0NvbnRleHQqIGNvbnRleHQ7CiAgICAgUVdLSGlzdG9yeSogaGlzdG9yeTsKIApkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oIGIvV2ViS2l0Mi9VSVByb2Nlc3Mv UGFnZUNsaWVudC5oCmluZGV4IDJhZjY2NzcyNjNjZjI0NzE4NzMxNWNiNzZmMzFmMTM0MTQwZTUw Y2IuLmY0MTMzNDJiYTBkMzFkODE5YjdhNjc4NGY0NDQ2ZTFlZWRhZWJiMDcgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlQ2xpZW50LmgKQEAgLTM3LDYgKzM3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKIGNsYXNzIEZpbmRJbmRp Y2F0b3I7CiBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3MgTmF0aXZlV2ViS2V5 Ym9hcmRFdmVudDsKQEAgLTQ4LDYgKzQ5LDEyIEBAIGNsYXNzIFBhZ2VDbGllbnQgewogcHVibGlj OgogICAgIHZpcnR1YWwgflBhZ2VDbGllbnQoKSB7IH0KIAorICAgIC8vIENyZWF0ZSBhIG5ldyBk cmF3aW5nIGFyZWEgcHJveHkgZm9yIHRoZSBnaXZlbiBwYWdlLgorICAgIHZpcnR1YWwgUGFzc093 blB0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkgPSAwOworCisg ICAgLy8gVGVsbCB0aGUgdmlldyB0byBpbnZhbGlkYXRlIHRoZSBnaXZlbiByZWN0LiBUaGUgcmVj dCBpcyBpbiB2aWV3IGNvb3JkaW5hdGVzLgorICAgIHZpcnR1YWwgdm9pZCBzZXRWaWV3TmVlZHNE aXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSA9IDA7CisKICAgICAvLyBSZXR1cm4gdGhl IHNpemUgb2YgdGhlIHZpZXcgdGhlIHBhZ2UgaXMgYXNzb2NpYXRlZCB3aXRoLgogICAgIHZpcnR1 YWwgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpID0gMDsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKaW5kZXggZGYwYjA3MTgyMzUwNzY1NWMyZDdkOTQ4YjEyYmM5MWZjMmY5YjQzNS4u NzAzZWJlZmQ4ZmZhMDhiM2JhMWZlYjYzNDIzOTA0NjFhNzE4YWE5NiAxMDA2NDQKLS0tIGEvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCkBAIC0yMTgsNiArMjE4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6Omlu aXRpYWxpemVXZWJQYWdlKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIG1fZHJhd2lu Z0FyZWEgPSBtX3BhZ2VDbGllbnQtPmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKICAgICBBU1NF UlQobV9kcmF3aW5nQXJlYSk7CiAKICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBy b2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIGNyZWF0aW9uUGFyYW1ldGVycygpKSwgMCk7 CkBAIC0yMjgsNiArMjI5LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlaW5pdGlhbGl6ZVdlYlBh Z2UoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSkKICAgICBpZiAoIWlzVmFsaWQoKSkKICAg ICAgICAgcmV0dXJuOwogCisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZUNsaWVudC0+Y3JlYXRl RHJhd2luZ0FyZWFQcm94eSgpOwogICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKIAogICAgIHBy b2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJ RCwgY3JlYXRpb25QYXJhbWV0ZXJzKCkpLCAwKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9j ZXNzL3dpbi9XZWJWaWV3LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcApp bmRleCBjNDk2MzdhMWRiOGU2ZjgxM2NlMGQ3ZjkwODRkYmRiNWI4ZDZkMDE5Li5jMjJkNTRkZDE4 YTg1Y2I4MGNhMjAzZTc0YmY3ODBiOGNlZGM2OWRmIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJv Y2Vzcy93aW4vV2ViVmlldy5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcu Y3BwCkBAIC0yMzYsNyArMjM2LDYgQEAgV2ViVmlldzo6V2ViVmlldyhSRUNUIHJlY3QsIFdlYkNv bnRleHQqIGNvbnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwLCBIV05EIHAKICAgICByZWdp c3RlcldlYlZpZXdXaW5kb3dDbGFzcygpOwogCiAgICAgbV9wYWdlID0gY29udGV4dC0+Y3JlYXRl V2ViUGFnZSh0aGlzLCBwYWdlR3JvdXApOwotICAgIG1fcGFnZS0+c2V0RHJhd2luZ0FyZWEoQ2h1 bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh0aGlzLCBtX3BhZ2UuZ2V0KCkpKTsK IAogICAgIG1fd2luZG93ID0gOjpDcmVhdGVXaW5kb3dFeCgwLCBrV2ViS2l0MldlYlZpZXdXaW5k b3dDbGFzc05hbWUsIDAsIFdTX0NISUxEIHwgV1NfQ0xJUFNJQkxJTkdTIHwgV1NfQ0xJUENISUxE UkVOLAogICAgICAgICByZWN0LnRvcCwgcmVjdC5sZWZ0LCByZWN0LnJpZ2h0IC0gcmVjdC5sZWZ0 LCByZWN0LmJvdHRvbSAtIHJlY3QudG9wLCBwYXJlbnRXaW5kb3cgPyBwYXJlbnRXaW5kb3cgOiBI V05EX01FU1NBR0UsIDAsIGluc3RhbmNlSGFuZGxlKCksIHRoaXMpOwpAQCAtNTc1LDYgKzU3NCwx NyBAQCB2b2lkIFdlYlZpZXc6OmNsb3NlKCkKIAogLy8gUGFnZUNsaWVudAogCitQYXNzT3duUHRy PERyYXdpbmdBcmVhUHJveHk+IFdlYlZpZXc6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQorewor ICAgIHJldHVybiBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHRoaXMsIG1f cGFnZS5nZXQoKSk7Cit9CisKK3ZvaWQgV2ViVmlldzo6c2V0Vmlld05lZWRzRGlzcGxheShjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQoreworICAgIFJFQ1QgciA9IHJlY3Q7CisgICAgOjpJ bnZhbGlkYXRlUmVjdChtX3dpbmRvdywgJnIsIGZhbHNlKTsKK30KKwogV2ViQ29yZTo6SW50U2l6 ZSBXZWJWaWV3Ojp2aWV3U2l6ZSgpCiB7CiAgICAgUkVDVCBjbGllbnRSZWN0OwpkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaCBiL1dlYktpdDIvVUlQcm9jZXNzL3dp bi9XZWJWaWV3LmgKaW5kZXggYmZmZjM0NDA2NjEzNGFkMDJiMDVjODQ4ZjI3MzMwOTlhNjM4YmQ2 Ny4uOGJmOGE1YzdmZmQ2MzZkMDMyODU0MWRmNjhkNTU0NGY3ZjY5ZjJjNCAxMDA2NDQKLS0tIGEv V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy93 aW4vV2ViVmlldy5oCkBAIC0xMDQsNiArMTA0LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0 ZU5hdGl2ZUN1cnNvcigpOwogCiAgICAgLy8gUGFnZUNsaWVudAorICAgIHZpcnR1YWwgUGFzc093 blB0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7CisgICAgdmly dHVhbCB2b2lkIHNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwog ICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpOwogICAgIHZpcnR1YWwgYm9v bCBpc1ZpZXdXaW5kb3dBY3RpdmUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNWaWV3Rm9jdXNlZCgp Owo=