108678 2013-02-01 12:47:18 -0800 [BlackBerry]Adjust fatfinger detection rect size 2013-02-25 09:01:16 -0800 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 tijiang webkit-unassigned allan.jensen berto mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 823148 0 tijiang 2013-02-01 12:47:18 -0800 When we do fatfinger, the detection rect size should not be expanded beyond the viewport size to detect any element not visible(out of the viewport) 823173 1 186116 tijiang 2013-02-01 13:11:27 -0800 Created attachment 186116 Patch 823302 2 186116 tonikitoo 2013-02-01 14:49:54 -0800 Comment on attachment 186116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186116&action=review TJ: could you test one thing: instead of doing all this, could you not pass HitTestRequest::IgnoreClipping to requestType? and see if it helps > Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp:463 > getPaddings(topPadding, rightPadding, bottomPadding, leftPadding); > > + // Do not allow fat fingers detect anything not visible(ie outside of the viewport) > + adjustPaddings(contentViewportPos, topPadding, rightPadding, bottomPadding, leftPadding); not better to have a getAdjustedPaddings? (merge both methods) 823415 3 tijiang 2013-02-01 16:28:00 -0800 Hi Antonio, I tried to remove the HitTestRequest::IgnoreClipping and it seems working. But I am wondering what is clipping the result rect and will this change break other test cases? (In reply to comment #2) > (From update of attachment 186116 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186116&action=review > > TJ: could you test one thing: instead of doing all this, could you not pass HitTestRequest::IgnoreClipping to requestType? and see if it helps > > > Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp:463 > > getPaddings(topPadding, rightPadding, bottomPadding, leftPadding); > > > > + // Do not allow fat fingers detect anything not visible(ie outside of the viewport) > > + adjustPaddings(contentViewportPos, topPadding, rightPadding, bottomPadding, leftPadding); > > not better to have a getAdjustedPaddings? (merge both methods) 823510 4 tonikitoo 2013-02-01 19:00:13 -0800 (In reply to comment #3) > Hi Antonio, I tried to remove the HitTestRequest::IgnoreClipping and it seems working. But I am wondering what is clipping the result rect and will this change break other test cases? Better! Ok, you might need to still clip the result rect, yes. 824434 5 186398 tijiang 2013-02-04 09:22:04 -0800 Created attachment 186398 Patch 824484 6 186398 tonikitoo 2013-02-04 09:57:59 -0800 Comment on attachment 186398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186398&action=review Much simpler :) > Source/WebKit/blackberry/Api/WebPage.cpp:3941 > + PlatformWheelEvent wheelEvent(mouseEvent.documentViewportPosition(), mouseEvent.screenPosition(), where does documentViewportPosition come from? :) > Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp:284 > + frameContentPos = Platform::pointClampedToRect(frameContentPos, viewportRect); if 'point' is out of the 'rect', what does it return? 0,0, -1,-1. clicking can still be sent to this coords. 824504 7 tijiang 2013-02-04 10:17:45 -0800 We decide to do the transfer the document position in libwebview. they all fix one bug but might make mors sense if i seperate it in another patch. For the pointClampedtoRect function, if the point is outside the rect, we move the point inside the rect and return it. (In reply to comment #6) > (From update of attachment 186398 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186398&action=review > > Much simpler :) > > > Source/WebKit/blackberry/Api/WebPage.cpp:3941 > > + PlatformWheelEvent wheelEvent(mouseEvent.documentViewportPosition(), mouseEvent.screenPosition(), > > where does documentViewportPosition come from? :) > > > Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp:284 > > + frameContentPos = Platform::pointClampedToRect(frameContentPos, viewportRect); > > if 'point' is out of the 'rect', what does it return? > > 0,0, -1,-1. clicking can still be sent to this coords. 824597 8 186398 yong.li.webkit 2013-02-04 11:23:54 -0800 Comment on attachment 186398 Patch Thanks Antonio :) 824686 9 186398 webkit.review.bot 2013-02-04 13:14:10 -0800 Comment on attachment 186398 Patch Clearing flags on attachment: 186398 Committed r141797: <http://trac.webkit.org/changeset/141797> 824687 10 webkit.review.bot 2013-02-04 13:14:14 -0800 All reviewed patches have been landed. Closing bug. 833412 11 tijiang 2013-02-14 14:17:52 -0800 Reopening to attach new patch. 833413 12 188423 tijiang 2013-02-14 14:17:54 -0800 Created attachment 188423 Patch 839864 13 188423 webkit.review.bot 2013-02-22 13:26:08 -0800 Comment on attachment 188423 Patch Clearing flags on attachment: 188423 Committed r143783: <http://trac.webkit.org/changeset/143783> 839865 14 webkit.review.bot 2013-02-22 13:26:12 -0800 All reviewed patches have been landed. Closing bug. 840788 15 berto 2013-02-25 01:16:00 -0800 > void FatFingers::getNodesFromRect(Document* document, const IntPoint& contentPos, ListHashSet<RefPtr<Node> >& intersectedNodes) > { > unsigned topPadding, rightPadding, bottomPadding, leftPadding; > - getPaddings(topPadding, rightPadding, bottomPadding, leftPadding); > + IntPoint contentViewportPos = m_webPage->mapFromContentsToViewport(m_contentPos); > + // Do not allow fat fingers detect anything not visible(ie outside of the viewport) > + adjustPaddings(contentViewportPos, topPadding, rightPadding, bottomPadding, leftPadding); Is this correct? adjustPaddings() doesn't seem to be defined anywhere, shouldn't it be getAdjustedPaddings() instead? 840970 16 tijiang 2013-02-25 07:49:41 -0800 Yes it should be getAdjustedPaddings(), a mistake when prepare the upstream patch. Thanks Alberto! (In reply to comment #15) > > void FatFingers::getNodesFromRect(Document* document, const IntPoint& contentPos, ListHashSet<RefPtr<Node> >& intersectedNodes) > > { > > unsigned topPadding, rightPadding, bottomPadding, leftPadding; > > - getPaddings(topPadding, rightPadding, bottomPadding, leftPadding); > > + IntPoint contentViewportPos = m_webPage->mapFromContentsToViewport(m_contentPos); > > + // Do not allow fat fingers detect anything not visible(ie outside of the viewport) > > + adjustPaddings(contentViewportPos, topPadding, rightPadding, bottomPadding, leftPadding); > > Is this correct? adjustPaddings() doesn't seem to be defined anywhere, > shouldn't it be getAdjustedPaddings() instead? 840991 17 tijiang 2013-02-25 08:16:27 -0800 Reopening to attach new patch. 840992 18 190066 tijiang 2013-02-25 08:16:33 -0800 Created attachment 190066 Patch 840993 19 190066 rwlbuis 2013-02-25 08:17:13 -0800 Comment on attachment 190066 Patch LGTM. 841007 20 190066 webkit.review.bot 2013-02-25 09:01:11 -0800 Comment on attachment 190066 Patch Clearing flags on attachment: 190066 Committed r143933: <http://trac.webkit.org/changeset/143933> 841008 21 webkit.review.bot 2013-02-25 09:01:16 -0800 All reviewed patches have been landed. Closing bug. 186116 2013-02-01 13:11:27 -0800 2013-02-04 09:22:00 -0800 Patch bug-108678-20130201160809.patch text/plain 7396 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA3MmQ3ODVkMTM2NTA1MWNjYjhlNzU0NjZjMzc3MjYwZThiOGI4OTk1Li5kN2Y1ZDg3OGE5 MzEwOWY4ZDVkODZmYTlhNzEwMTE0M2JiY2FhZjEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMy0wMi0wMSAgVGlhbmNoZW5nIEppYW5nICA8dGlq aWFuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBBZGp1c3QgZmF0ZmluZ2VyIGRl dGVjdGlvbiByZWN0IHNpemUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDg2NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KyAgICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBHZW5ldmlldmUgTWFrLgorCisgICAgICAg IFdlIHNob3VsZCBub3QgZXhwYW5kIG91ciBmYXRmaW5nZXIgcmVjdCBvdXQgb2YgdGhlIHZpZXdw b3J0IHRvIGF2b2lkCisgICAgICAgIGludmlzaWJsZSBoaXQgdGVzdCByZXN1bHQuCisKKyAgICAg ICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBh Z2U6Om1vdXNlRXZlbnQpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHA6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmZpbmRJbnRlcnNlY3Rp bmdSZWdpb25zKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6YWRq dXN0UGFkZGluZ3MpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6RmF0RmluZ2Vyczo6Z2V0Tm9kZXNGcm9tUmVjdCk6CisgICAgICAgICogV2ViS2l0U3Vw cG9ydC9GYXRGaW5nZXJzLmg6CisKIDIwMTMtMDItMDEgIEphY2t5IEppYW5nICA8emhhamlhbmdA cmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gWm9vbWluZyBpbiBkdXJpbmcgcGFnZSBs b2FkIG9mIG5vbi1zY2FsYWJsZSB3ZWJwYWdlIHJlc3VsdHMgaW4gZml4ZWQgbWFnbmlmaWNhdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggMWJmMmYyMDFk MmViMjNkNTA0M2IzZjE0OTE5OTkwZjZlNzZhOTI2Yy4uMzI0M2M2NzE2MDU3NDJmZmY1Njc0ZGJj YTA1YmE2YjRiMDdhYzQ2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwCkBAIC0zOTMxLDE0ICszOTMxLDE0IEBAIGJvb2wgV2ViUGFnZTo6bW91c2VFdmVudChjb25z dCBQbGF0Zm9ybTo6TW91c2VFdmVudCYgbW91c2VFdmVudCwgYm9vbCogd2hlZWxEZWx0CiAgICAg ICAgIGJ1dHRvblR5cGUgPSBNaWRkbGVCdXR0b247CiAKICAgICAvLyBDcmVhdGUgb3VyIGV2ZW50 LgotICAgIFBsYXRmb3JtTW91c2VFdmVudCBwbGF0Zm9ybU1vdXNlRXZlbnQoZC0+bWFwRnJvbVRy YW5zZm9ybWVkKG1vdXNlRXZlbnQucG9zaXRpb24oKSksIG1vdXNlRXZlbnQuc2NyZWVuUG9zaXRp b24oKSwKKyAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgcGxhdGZvcm1Nb3VzZUV2ZW50KG1vdXNlRXZl bnQuZG9jdW1lbnRWaWV3cG9ydFBvc2l0aW9uKCksIG1vdXNlRXZlbnQuc2NyZWVuUG9zaXRpb24o KSwKICAgICAgICAgdG9XZWJDb3JlTW91c2VFdmVudFR5cGUobW91c2VFdmVudC50eXBlKCkpLCBj bGlja0NvdW50LCBidXR0b25UeXBlLAogICAgICAgICBtb3VzZUV2ZW50LnNoaWZ0QWN0aXZlKCks IG1vdXNlRXZlbnQuY3RybEFjdGl2ZSgpLCBtb3VzZUV2ZW50LmFsdEFjdGl2ZSgpLCBQb2ludGlu Z0RldmljZSk7CiAgICAgZC0+bV9sYXN0TW91c2VFdmVudCA9IHBsYXRmb3JtTW91c2VFdmVudDsK ICAgICBib29sIHN1Y2Nlc3MgPSBkLT5oYW5kbGVNb3VzZUV2ZW50KHBsYXRmb3JtTW91c2VFdmVu dCk7CiAKICAgICBpZiAobW91c2VFdmVudC53aGVlbFRpY2tzKCkpIHsKLSAgICAgICAgUGxhdGZv cm1XaGVlbEV2ZW50IHdoZWVsRXZlbnQoZC0+bWFwRnJvbVRyYW5zZm9ybWVkKG1vdXNlRXZlbnQu cG9zaXRpb24oKSksIG1vdXNlRXZlbnQuc2NyZWVuUG9zaXRpb24oKSwKKyAgICAgICAgUGxhdGZv cm1XaGVlbEV2ZW50IHdoZWVsRXZlbnQobW91c2VFdmVudC5kb2N1bWVudFZpZXdwb3J0UG9zaXRp b24oKSwgbW91c2VFdmVudC5zY3JlZW5Qb3NpdGlvbigpLAogICAgICAgICAgICAgMCwgLW1vdXNl RXZlbnQud2hlZWxEZWx0YSgpLAogICAgICAgICAgICAgMCwgLW1vdXNlRXZlbnQud2hlZWxUaWNr cygpLAogICAgICAgICAgICAgU2Nyb2xsQnlQaXhlbFdoZWVsRXZlbnQsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwCmluZGV4 IGE4NTY5NDU1MzkxZGM4NzY1MDYyYTM5OTFmZGM1N2IwM2Q5YzZlZDQuLmIyMWE5NzU2NzBjMjdi YjE4Y2Q1YThiNmNiZGIyMmFiMzNiNzUxYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwCkBAIC0yNzgsNiArMjc4LDEy IEBAIGJvb2wgRmF0RmluZ2Vyczo6ZmluZEludGVyc2VjdGluZ1JlZ2lvbnMoRG9jdW1lbnQqIGRv Y3VtZW50LCBWZWN0b3I8SW50ZXJzZWN0aW5nCiAKICAgICAvLyBDcmVhdGUgZmluZ2VyUmVjdC4K ICAgICBJbnRQb2ludCBmcmFtZUNvbnRlbnRQb3MoZG9jdW1lbnQtPmZyYW1lKCktPnZpZXcoKS0+ d2luZG93VG9Db250ZW50cyhtX3dlYlBhZ2UtPm1fbWFpbkZyYW1lLT52aWV3KCktPmNvbnRlbnRz VG9XaW5kb3cobV9jb250ZW50UG9zKSkpOworICAgIEludFJlY3Qgdmlld3BvcnRSZWN0ID0gbV93 ZWJQYWdlLT5tYWluRnJhbWUoKS0+dmlldygpLT52aXNpYmxlQ29udGVudFJlY3QoKTsKKworICAg IC8vIEVuc3VyZSB0aGUgY29udGVudCBwb3NpdGlvbiBpcyBpbnNpZGUgdGhlIHZpZXdwb3J0Lgor ICAgIGZyYW1lQ29udGVudFBvcyA9IFBsYXRmb3JtOjpwb2ludENsYW1wZWRUb1JlY3QoZnJhbWVD b250ZW50UG9zLCB2aWV3cG9ydFJlY3QpOworCisgICAgSW50UG9pbnQgY29udGVudFZpZXdwb3J0 UG9zKG1fY29udGVudFBvcy54KCkgLSB2aWV3cG9ydFJlY3QueCgpLCBtX2NvbnRlbnRQb3MueSgp IC0gdmlld3BvcnRSZWN0LnkoKSk7CiAKICNpZiBERUJVR19GQVRfRklOR0VSUwogICAgIEludFJl Y3QgZmluZ2VyUmVjdChmaW5nZXJSZWN0Rm9yUG9pbnQoZnJhbWVDb250ZW50UG9zKSk7CkBAIC0y OTYsNyArMzAyLDcgQEAgYm9vbCBGYXRGaW5nZXJzOjpmaW5kSW50ZXJzZWN0aW5nUmVnaW9ucyhE b2N1bWVudCogZG9jdW1lbnQsIFZlY3RvcjxJbnRlcnNlY3RpbmcKICAgICAvLyBJdGVyYXRlIG92 ZXIgdGhlIGxpc3Qgb2Ygbm9kZXMgKGFuZCBzdWJyZWN0cyBvZiBub2RlcyB3aGVyZSBwb3NzaWJs ZSksIGZvciBlYWNoIHNhdmluZyB0aGUKICAgICAvLyBpbnRlcnNlY3Rpb24gb2YgdGhlIGJvdW5k aW5nIGJveCB3aXRoIHRoZSBmaW5nZXIgcmVjdC4KICAgICBMaXN0SGFzaFNldDxSZWZQdHI8Tm9k ZT4gPiBpbnRlcnNlY3RlZE5vZGVzOwotICAgIGdldE5vZGVzRnJvbVJlY3QoZG9jdW1lbnQsIGZy YW1lQ29udGVudFBvcywgaW50ZXJzZWN0ZWROb2Rlcyk7CisgICAgZ2V0Tm9kZXNGcm9tUmVjdChk b2N1bWVudCwgZnJhbWVDb250ZW50UG9zLCBjb250ZW50Vmlld3BvcnRQb3MsIGludGVyc2VjdGVk Tm9kZXMpOwogCiAgICAgTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID46OmNvbnN0X2l0ZXJhdG9y IGl0ID0gaW50ZXJzZWN0ZWROb2Rlcy5iZWdpbigpOwogICAgIExpc3RIYXNoU2V0PFJlZlB0cjxO b2RlPiA+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBpbnRlcnNlY3RlZE5vZGVzLmVuZCgpOwpAQCAt NDM4LDExICs0NDQsMjQgQEAgdm9pZCBGYXRGaW5nZXJzOjpnZXRQYWRkaW5ncyh1bnNpZ25lZCYg dG9wLCB1bnNpZ25lZCYgcmlnaHQsIHVuc2lnbmVkJiBib3R0b20sIHUKICAgICBsZWZ0ID0gbGVm dFBhZGRpbmcgLyBjdXJyZW50U2NhbGU7CiB9CiAKLXZvaWQgRmF0RmluZ2Vyczo6Z2V0Tm9kZXNG cm9tUmVjdChEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IEludFBvaW50JiBjb250ZW50UG9zLCBM aXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPiYgaW50ZXJzZWN0ZWROb2RlcykKK3ZvaWQgRmF0Rmlu Z2Vyczo6YWRqdXN0UGFkZGluZ3MoY29uc3QgSW50UG9pbnQmIGNvbnRlbnRWaWV3cG9ydFBvcywg dW5zaWduZWQmIHRvcCwgdW5zaWduZWQmIHJpZ2h0LCB1bnNpZ25lZCYgYm90dG9tLCB1bnNpZ25l ZCYgbGVmdCkgY29uc3QKK3sKKyAgICBJbnRSZWN0IHZpZXdwb3J0UmVjdCA9IG1fd2ViUGFnZS0+ bWFpbkZyYW1lKCktPnZpZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KCk7CisgICAgLy8gV2UgY2xh bXAgdGhlIGV2ZW50IHBvc2l0aW9uIGluc2lkZSB0aGUgdmlld3BvcnQuIFdlIHNob3VsZCBub3Qg ZXhwYW5kIHRoZSBmYXQgZmluZ2VyIHJlY3QgdG8gdGhlIGVkZ2UgYWdhaW4uCisgICAgdG9wID0g c3RkOjptaW4odW5zaWduZWQoc3RkOjptYXgoY29udGVudFZpZXdwb3J0UG9zLnkoKSAtIDEsIDAp KSwgdG9wKTsKKyAgICBsZWZ0ID0gc3RkOjptaW4odW5zaWduZWQoc3RkOjptYXgoY29udGVudFZp ZXdwb3J0UG9zLngoKSAtIDEsIDApKSwgbGVmdCk7CisgICAgYm90dG9tID0gc3RkOjptaW4odW5z aWduZWQoc3RkOjptYXgodmlld3BvcnRSZWN0LmhlaWdodCgpIC0gY29udGVudFZpZXdwb3J0UG9z LnkoKSAtIDEsIDApKSwgYm90dG9tKTsKKyAgICByaWdodCA9IHN0ZDo6bWluKHVuc2lnbmVkKHN0 ZDo6bWF4KHZpZXdwb3J0UmVjdC53aWR0aCgpIC0gY29udGVudFZpZXdwb3J0UG9zLngoKSAtIDEs IDApKSwgcmlnaHQpOworfQorCit2b2lkIEZhdEZpbmdlcnM6OmdldE5vZGVzRnJvbVJlY3QoRG9j dW1lbnQqIGRvY3VtZW50LCBjb25zdCBJbnRQb2ludCYgY29udGVudFBvcywgY29uc3QgSW50UG9p bnQmIGNvbnRlbnRWaWV3cG9ydFBvcywgTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID4mIGludGVy c2VjdGVkTm9kZXMpCiB7CiAgICAgdW5zaWduZWQgdG9wUGFkZGluZywgcmlnaHRQYWRkaW5nLCBi b3R0b21QYWRkaW5nLCBsZWZ0UGFkZGluZzsKICAgICBnZXRQYWRkaW5ncyh0b3BQYWRkaW5nLCBy aWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5nKTsKIAorICAgIC8vIERvIG5v dCBhbGxvdyBmYXQgZmluZ2VycyBkZXRlY3QgYW55dGhpbmcgbm90IHZpc2libGUoaWUgb3V0c2lk ZSBvZiB0aGUgdmlld3BvcnQpCisgICAgYWRqdXN0UGFkZGluZ3MoY29udGVudFZpZXdwb3J0UG9z LCB0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5nKTsK KwogICAgIC8vIFRoZSB1c2VyIGZ1bmN0aW9ucyBjaGVja0ZvclRleHQoKSBhbmQgZmluZEludGVy c2VjdGluZ1JlZ2lvbnMoKSB1c2VzIHRoZSBOb2RlLndob2xlVGV4dCgpIHRvIGNoZWNrRmluZ2Vy SW50ZXJzZWN0aW9uKCkKICAgICAvLyBub3QgdGhlIHRleHQgaW4gaXRzIHNoYWRvdyB0cmVlLgog ICAgIEhpdFRlc3RSZXF1ZXN0OjpIaXRUZXN0UmVxdWVzdFR5cGUgcmVxdWVzdFR5cGUgPSBIaXRU ZXN0UmVxdWVzdDo6UmVhZE9ubHkgfCBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJl cXVlc3Q6Oklnbm9yZUNsaXBwaW5nOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oCmluZGV4IGY4ZGY5NjMwYTcyNjFlYjQzMmVkNzZl M2YyNThiZTA5MjM1YmE2Y2EuLjcwYjk5OGExYjQ1YWRhNDY2NzU4ZWY4MmZhMGUyODQxYWNiYWMy MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0Zh dEZpbmdlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9G YXRGaW5nZXJzLmgKQEAgLTk1LDcgKzk1LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0U3Vj Y2Vzc2Z1bEZhdEZpbmdlcnNSZXN1bHQoRmF0RmluZ2Vyc1Jlc3VsdCYsIFdlYkNvcmU6Ok5vZGUq LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogCi0gICAgdm9pZCBnZXROb2Rlc0Zyb21SZWN0 KFdlYkNvcmU6OkRvY3VtZW50KiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBMaXN0SGFzaFNl dDxSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gPiYpOworICAgIHZvaWQgZ2V0Tm9kZXNGcm9tUmVjdChX ZWJDb3JlOjpEb2N1bWVudCosIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBjb250ZW50UG9zLCBj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY29udGVudFZpZXdwb3J0UG9zLCBMaXN0SGFzaFNldDxS ZWZQdHI8V2ViQ29yZTo6Tm9kZT4gPiYpOwogCiAgICAgLy8gSXQgbWltaWNzIERvY3VtZW50Ojpl bGVtZW50RnJvbVBvaW50LCBidXQgcmVjdXJzaXZlbHkgaGl0LXRlc3RzIGluIGNhc2UgYW4gaW5u ZXIgZnJhbWUgaXMgZm91bmQuCiAgICAgdm9pZCBnZXRSZWxldmFudEluZm9Gcm9tQ2FjaGVkSGl0 VGVzdChXZWJDb3JlOjpFbGVtZW50KiYgZWxlbWVudFVuZGVyUG9pbnQsIFdlYkNvcmU6OkVsZW1l bnQqJiBjbGlja2FibGVFbGVtZW50VW5kZXJQb2ludCkgY29uc3Q7CkBAIC0xMDQsNiArMTA0LDcg QEAgcHJpdmF0ZToKIAogICAgIGlubGluZSBXZWJDb3JlOjpJbnRSZWN0IGZpbmdlclJlY3RGb3JQ b2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpIGNvbnN0OwogICAgIHZvaWQgZ2V0UGFkZGlu Z3ModW5zaWduZWQmIHRvcCwgdW5zaWduZWQmIHJpZ2h0LCB1bnNpZ25lZCYgYm90dG9tLCB1bnNp Z25lZCYgbGVmdCkgY29uc3Q7CisgICAgdm9pZCBhZGp1c3RQYWRkaW5ncyhjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYsIHVuc2lnbmVkJiB0b3AsIHVuc2lnbmVkJiByaWdodCwgdW5zaWduZWQmIGJv dHRvbSwgdW5zaWduZWQmIGxlZnQpIGNvbnN0OwogCiAgICAgV2ViUGFnZVByaXZhdGUqIG1fd2Vi UGFnZTsKICAgICBXZWJDb3JlOjpJbnRQb2ludCBtX2NvbnRlbnRQb3M7Cg== 186398 2013-02-04 09:22:04 -0800 2013-02-14 14:17:45 -0800 Patch bug-108678-20130204121844.patch text/plain 3908 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBlZTQzYjU5ZmRmYzUxZDY2MzY4Y2ZjNDRiOTgyNzBlNjBkMjE4ODgyLi5mN2ZhYjhiYWEz OWZiNWVkNzFmMzU0NjM2OTY4N2YxMThlMzA1YmNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMi0wNCAgVGlhbmNoZW5nIEppYW5nICA8dGlq aWFuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XUFkanVzdCBmYXRmaW5nZXIgZGV0 ZWN0aW9uIHJlY3Qgc2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA4Njc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisg ICAgICAgIFJJTSBCdWcgMjQ2OTc2CisKKyAgICAgICAgV2Ugc3RpbGwgbmVlZCB0byBjbGlwIHRo ZSBmYXRmaW5nZXIgZGV0ZWN0aW9uIHJlY3QgdG8gdGhlIHZpZXdwb3J0IHRvCisgICAgICAgIGF2 b2lkIHdyb25nIGhpdFRlc3QgcmVzdWx0LgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjptb3VzZUV2ZW50KToKKyAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpGYXRGaW5nZXJzOjpnZXROb2Rlc0Zyb21SZWN0KToKKwogMjAxMy0wMi0wMyAgS3dh bmdZb25nIENob2kgIDxreTAuY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQg d2FybmluZyBhZnRlciByMTQxNDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl LmNwcAppbmRleCAxYmYyZjIwMWQyZWIyM2Q1MDQzYjNmMTQ5MTk5OTBmNmU3NmE5MjZjLi4zMjQz YzY3MTYwNTc0MmZmZjU2NzRkYmNhMDViYTZiNGIwN2FjNDY2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTM5MzEsMTQgKzM5MzEsMTQgQEAgYm9vbCBXZWJQ YWdlOjptb3VzZUV2ZW50KGNvbnN0IFBsYXRmb3JtOjpNb3VzZUV2ZW50JiBtb3VzZUV2ZW50LCBi b29sKiB3aGVlbERlbHQKICAgICAgICAgYnV0dG9uVHlwZSA9IE1pZGRsZUJ1dHRvbjsKIAogICAg IC8vIENyZWF0ZSBvdXIgZXZlbnQuCi0gICAgUGxhdGZvcm1Nb3VzZUV2ZW50IHBsYXRmb3JtTW91 c2VFdmVudChkLT5tYXBGcm9tVHJhbnNmb3JtZWQobW91c2VFdmVudC5wb3NpdGlvbigpKSwgbW91 c2VFdmVudC5zY3JlZW5Qb3NpdGlvbigpLAorICAgIFBsYXRmb3JtTW91c2VFdmVudCBwbGF0Zm9y bU1vdXNlRXZlbnQobW91c2VFdmVudC5kb2N1bWVudFZpZXdwb3J0UG9zaXRpb24oKSwgbW91c2VF dmVudC5zY3JlZW5Qb3NpdGlvbigpLAogICAgICAgICB0b1dlYkNvcmVNb3VzZUV2ZW50VHlwZSht b3VzZUV2ZW50LnR5cGUoKSksIGNsaWNrQ291bnQsIGJ1dHRvblR5cGUsCiAgICAgICAgIG1vdXNl RXZlbnQuc2hpZnRBY3RpdmUoKSwgbW91c2VFdmVudC5jdHJsQWN0aXZlKCksIG1vdXNlRXZlbnQu YWx0QWN0aXZlKCksIFBvaW50aW5nRGV2aWNlKTsKICAgICBkLT5tX2xhc3RNb3VzZUV2ZW50ID0g cGxhdGZvcm1Nb3VzZUV2ZW50OwogICAgIGJvb2wgc3VjY2VzcyA9IGQtPmhhbmRsZU1vdXNlRXZl bnQocGxhdGZvcm1Nb3VzZUV2ZW50KTsKIAogICAgIGlmIChtb3VzZUV2ZW50LndoZWVsVGlja3Mo KSkgewotICAgICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQgd2hlZWxFdmVudChkLT5tYXBGcm9tVHJh bnNmb3JtZWQobW91c2VFdmVudC5wb3NpdGlvbigpKSwgbW91c2VFdmVudC5zY3JlZW5Qb3NpdGlv bigpLAorICAgICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQgd2hlZWxFdmVudChtb3VzZUV2ZW50LmRv Y3VtZW50Vmlld3BvcnRQb3NpdGlvbigpLCBtb3VzZUV2ZW50LnNjcmVlblBvc2l0aW9uKCksCiAg ICAgICAgICAgICAwLCAtbW91c2VFdmVudC53aGVlbERlbHRhKCksCiAgICAgICAgICAgICAwLCAt bW91c2VFdmVudC53aGVlbFRpY2tzKCksCiAgICAgICAgICAgICBTY3JvbGxCeVBpeGVsV2hlZWxF dmVudCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0 L0ZhdEZpbmdlcnMuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv RmF0RmluZ2Vycy5jcHAKaW5kZXggYTg1Njk0NTUzOTFkYzg3NjUwNjJhMzk5MWZkYzU3YjAzZDlj NmVkNC4uNDk3ODMzYzNiZGI4MzJjOTBhZTdjMjYyMTVmNzllZDE0ZTQ4N2FmYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHAK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5j cHAKQEAgLTI3OCw2ICsyNzgsMTAgQEAgYm9vbCBGYXRGaW5nZXJzOjpmaW5kSW50ZXJzZWN0aW5n UmVnaW9ucyhEb2N1bWVudCogZG9jdW1lbnQsIFZlY3RvcjxJbnRlcnNlY3RpbmcKIAogICAgIC8v IENyZWF0ZSBmaW5nZXJSZWN0LgogICAgIEludFBvaW50IGZyYW1lQ29udGVudFBvcyhkb2N1bWVu dC0+ZnJhbWUoKS0+dmlldygpLT53aW5kb3dUb0NvbnRlbnRzKG1fd2ViUGFnZS0+bV9tYWluRnJh bWUtPnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhtX2NvbnRlbnRQb3MpKSk7CisgICAgSW50UmVj dCB2aWV3cG9ydFJlY3QgPSBtX3dlYlBhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPnZpc2libGVD b250ZW50UmVjdCgpOworCisgICAgLy8gRW5zdXJlIHRoZSBmcmFtZUNvbnRlbnRQb3MgaXMgaW5z aWRlIHRoZSB2aWV3cG9ydC4KKyAgICBmcmFtZUNvbnRlbnRQb3MgPSBQbGF0Zm9ybTo6cG9pbnRD bGFtcGVkVG9SZWN0KGZyYW1lQ29udGVudFBvcywgdmlld3BvcnRSZWN0KTsKIAogI2lmIERFQlVH X0ZBVF9GSU5HRVJTCiAgICAgSW50UmVjdCBmaW5nZXJSZWN0KGZpbmdlclJlY3RGb3JQb2ludChm cmFtZUNvbnRlbnRQb3MpKTsKQEAgLTQ0NSw3ICs0NDksNyBAQCB2b2lkIEZhdEZpbmdlcnM6Omdl dE5vZGVzRnJvbVJlY3QoRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBJbnRQb2ludCYgY29udGVu dFBvcwogCiAgICAgLy8gVGhlIHVzZXIgZnVuY3Rpb25zIGNoZWNrRm9yVGV4dCgpIGFuZCBmaW5k SW50ZXJzZWN0aW5nUmVnaW9ucygpIHVzZXMgdGhlIE5vZGUud2hvbGVUZXh0KCkgdG8gY2hlY2tG aW5nZXJJbnRlcnNlY3Rpb24oKQogICAgIC8vIG5vdCB0aGUgdGV4dCBpbiBpdHMgc2hhZG93IHRy ZWUuCi0gICAgSGl0VGVzdFJlcXVlc3Q6OkhpdFRlc3RSZXF1ZXN0VHlwZSByZXF1ZXN0VHlwZSA9 IEhpdFRlc3RSZXF1ZXN0OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBY3RpdmUgfCBIaXRU ZXN0UmVxdWVzdDo6SWdub3JlQ2xpcHBpbmc7CisgICAgSGl0VGVzdFJlcXVlc3Q6OkhpdFRlc3RS ZXF1ZXN0VHlwZSByZXF1ZXN0VHlwZSA9IEhpdFRlc3RSZXF1ZXN0OjpSZWFkT25seSB8IEhpdFRl c3RSZXF1ZXN0OjpBY3RpdmU7CiAgICAgaWYgKG1fdGFyZ2V0VHlwZSA9PSBUZXh0KQogICAgICAg ICByZXF1ZXN0VHlwZSB8PSBIaXRUZXN0UmVxdWVzdDo6QWxsb3dTaGFkb3dDb250ZW50OwogICAg IEhpdFRlc3RSZXN1bHQgcmVzdWx0KGNvbnRlbnRQb3MsIHRvcFBhZGRpbmcsIHJpZ2h0UGFkZGlu ZywgYm90dG9tUGFkZGluZywgbGVmdFBhZGRpbmcpOwo= 188423 2013-02-14 14:17:54 -0800 2013-02-25 08:16:17 -0800 Patch bug-108678-20130214171421.patch text/plain 5620 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyOTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA2ZjI2YTdiMzgzMjFiNmVjM2Q5MzljMWJlNDNkMDc0YzhhZGIxMTE0Li40YmUwNzY2NjE2 Mzc3ZDA3YWY5M2QwYjkxNThlMTNjOWJlNTQ2MmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMy0wMi0xNCAgVGlhbmNoZW5nIEppYW5nICA8dGlq aWFuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XUFkanVzdCBmYXRmaW5nZXIgZGV0 ZWN0aW9uIHJlY3Qgc2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA4Njc4LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIENoYW5naW5nIEhpdFRlc3RSZXF1ZXN0OjpJZ25vcmVDbGlwcGluZyBkb2VzIG5v dCBzb2x2ZSB0aGUgcHJvYmxlbSB0aGF0CisgICAgICAgIEZhdEZpbmdlciByZWN0IGRldGVjdCB0 aGUgZWxlbWVudCBvdXQgb2YgdGhlIHZpZXdwb3J0LiBXZSBoYXZlIHRvIGNsaXAKKyAgICAgICAg dGhlIGZhdGZpbmdlciByZWN0IGFjY29yZGluZyB0byB0aGUgY3VycmVudCB2aWV3cG9ydCBzaXpl IHRvIGF2b2lkIHBpY2tpbmcKKyAgICAgICAgdGhlIGVsZW1lbnQgb3V0IG9mIHRoZSB2aWV3cG9y dC4KKworICAgICAgICAqIFdlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHA6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmZpbmdlclJlY3RGb3JQb2ludCk6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmZpbmRCZXN0UG9pbnQpOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpGYXRGaW5nZXJzOjpnZXRBZGp1c3RlZFBhZGRpbmdz KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6Z2V0Tm9kZXNGcm9t UmVjdCk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmg6CisKIDIwMTMtMDIt MTQgIE1pa2UgRmVudG9uICA8bWlmZW50b25AcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJy eV0gVXBkYXRlIGtleWJvYXJkIGV2ZW50IGRldGFpbHMgdG8gbWF0Y2ggcGxhdGZvcm0gZGV0YWls cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0Zh dEZpbmdlcnMuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0 RmluZ2Vycy5jcHAKaW5kZXggNDMxMzdjYTIyYzVlNTk4NGQ5Nzc0ZjkwMWNjODc3YWNhOWM2NTVm Ny4uYzYxMDcwNDcwMzM1NzM5OWY1YTRmMGIyMDc3NmM1NjJlM2UyNWNhMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHAKKysr IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHAK QEAgLTY2LDcgKzY2LDggQEAgSW50UG9pbnQgRmF0RmluZ2Vyczo6bV9kZWJ1Z0ZhdEZpbmdlckFk anVzdGVkUG9zaXRpb247CiBJbnRSZWN0IEZhdEZpbmdlcnM6OmZpbmdlclJlY3RGb3JQb2ludChj b25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgdW5zaWduZWQgdG9wUGFkZGluZywg cmlnaHRQYWRkaW5nLCBib3R0b21QYWRkaW5nLCBsZWZ0UGFkZGluZzsKLSAgICBnZXRQYWRkaW5n cyh0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5nKTsK KyAgICBJbnRQb2ludCBjb250ZW50Vmlld3BvcnRQb3MgPSBtX3dlYlBhZ2UtPm1hcEZyb21Db250 ZW50c1RvVmlld3BvcnQocG9pbnQpOworICAgIGdldEFkanVzdGVkUGFkZGluZ3MoY29udGVudFZp ZXdwb3J0UG9zLCB0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQ YWRkaW5nKTsKIAogICAgIHJldHVybiBIaXRUZXN0UmVzdWx0OjpyZWN0Rm9yUG9pbnQocG9pbnQs IHRvcFBhZGRpbmcsIHJpZ2h0UGFkZGluZywgYm90dG9tUGFkZGluZywgbGVmdFBhZGRpbmcpOwog fQpAQCAtMTUxLDYgKzE1MiwxMSBAQCBjb25zdCBGYXRGaW5nZXJzUmVzdWx0IEZhdEZpbmdlcnM6 OmZpbmRCZXN0UG9pbnQoKQogICAgIEFTU0VSVChtX3dlYlBhZ2UpOwogICAgIEFTU0VSVChtX3dl YlBhZ2UtPm1fbWFpbkZyYW1lKTsKIAorICAgIC8vIEV2ZW4gdGhvdWdoIHdlIGhhdmUgY2xhbXBl ZCB0aGUgcG9pbnQgaW4gbGlid2VidmlldyB0byB2aWV3cG9ydCwgYnV0IHRoZXJlIG1pZ2h0IGJl IGEgcm91bmRpbmcgZGlmZmVyZW5jZSBmb3Igdmlld3BvcnQgcmVjdC4KKyAgICAvLyBDbGFtcCBw b3NpdGlvbiB0byB2aWV3cG9ydCB0byBlbnN1cmUgd2UgYXJlIGluc2lkZSB2aWV3cG9ydC4KKyAg ICBJbnRSZWN0IHZpZXdwb3J0UmVjdCA9IG1fd2ViUGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+ dmlzaWJsZUNvbnRlbnRSZWN0KCk7CisgICAgbV9jb250ZW50UG9zID0gUGxhdGZvcm06OnBvaW50 Q2xhbXBlZFRvUmVjdChtX2NvbnRlbnRQb3MsIHZpZXdwb3J0UmVjdCk7CisKICAgICBtX2NhY2hl ZFJlY3RIaXRUZXN0UmVzdWx0cy5jbGVhcigpOwogCiAgICAgRmF0RmluZ2Vyc1Jlc3VsdCByZXN1 bHQobV9jb250ZW50UG9zKTsKQEAgLTQyOCw3ICs0MzQsNyBAQCBib29sIEZhdEZpbmdlcnM6OmNo ZWNrRm9yVGV4dChOb2RlKiBjdXJOb2RlLCBWZWN0b3I8SW50ZXJzZWN0aW5nUmVnaW9uPiYgaW50 ZXJzZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBGYXRGaW5nZXJzOjpnZXRQYWRkaW5n cyh1bnNpZ25lZCYgdG9wLCB1bnNpZ25lZCYgcmlnaHQsIHVuc2lnbmVkJiBib3R0b20sIHVuc2ln bmVkJiBsZWZ0KSBjb25zdAordm9pZCBGYXRGaW5nZXJzOjpnZXRBZGp1c3RlZFBhZGRpbmdzKGNv bnN0IEludFBvaW50JiBjb250ZW50Vmlld3BvcnRQb3MsIHVuc2lnbmVkJiB0b3AsIHVuc2lnbmVk JiByaWdodCwgdW5zaWduZWQmIGJvdHRvbSwgdW5zaWduZWQmIGxlZnQpIGNvbnN0CiB7CiAgICAg c3RhdGljIHVuc2lnbmVkIHRvcFBhZGRpbmcgPSBQbGF0Zm9ybTo6U2V0dGluZ3M6Omluc3RhbmNl KCktPnRvcEZhdEZpbmdlclBhZGRpbmcoKTsKICAgICBzdGF0aWMgdW5zaWduZWQgcmlnaHRQYWRk aW5nID0gUGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5yaWdodEZhdEZpbmdlclBhZGRp bmcoKTsKQEAgLTQ0MCwxMiArNDQ2LDIxIEBAIHZvaWQgRmF0RmluZ2Vyczo6Z2V0UGFkZGluZ3Mo dW5zaWduZWQmIHRvcCwgdW5zaWduZWQmIHJpZ2h0LCB1bnNpZ25lZCYgYm90dG9tLCB1CiAgICAg cmlnaHQgPSByaWdodFBhZGRpbmcgLyBjdXJyZW50U2NhbGU7CiAgICAgYm90dG9tID0gYm90dG9t UGFkZGluZyAvIGN1cnJlbnRTY2FsZTsKICAgICBsZWZ0ID0gbGVmdFBhZGRpbmcgLyBjdXJyZW50 U2NhbGU7CisKKyAgICBJbnRSZWN0IHZpZXdwb3J0UmVjdCA9IG1fd2ViUGFnZS0+bWFpbkZyYW1l KCktPnZpZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KCk7CisgICAgLy8gV2UgY2xhbXAgdGhlIGV2 ZW50IHBvc2l0aW9uIGluc2lkZSB0aGUgdmlld3BvcnQuIFdlIHNob3VsZCBub3QgZXhwYW5kIHRo ZSBmYXQgZmluZ2VyIHJlY3QgdG8gdGhlIGVkZ2UgYWdhaW4uCisgICAgdG9wID0gc3RkOjptaW4o dW5zaWduZWQoc3RkOjptYXgoY29udGVudFZpZXdwb3J0UG9zLnkoKSAtIDEsIDApKSwgdG9wKTsK KyAgICBsZWZ0ID0gc3RkOjptaW4odW5zaWduZWQoc3RkOjptYXgoY29udGVudFZpZXdwb3J0UG9z LngoKSAtIDEsIDApKSwgbGVmdCk7CisgICAgYm90dG9tID0gc3RkOjptaW4odW5zaWduZWQoc3Rk OjptYXgodmlld3BvcnRSZWN0LmhlaWdodCgpIC0gY29udGVudFZpZXdwb3J0UG9zLnkoKSAtIDEs IDApKSwgYm90dG9tKTsKKyAgICByaWdodCA9IHN0ZDo6bWluKHVuc2lnbmVkKHN0ZDo6bWF4KHZp ZXdwb3J0UmVjdC53aWR0aCgpIC0gY29udGVudFZpZXdwb3J0UG9zLngoKSAtIDEsIDApKSwgcmln aHQpOwogfQogCiB2b2lkIEZhdEZpbmdlcnM6OmdldE5vZGVzRnJvbVJlY3QoRG9jdW1lbnQqIGRv Y3VtZW50LCBjb25zdCBJbnRQb2ludCYgY29udGVudFBvcywgTGlzdEhhc2hTZXQ8UmVmUHRyPE5v ZGU+ID4mIGludGVyc2VjdGVkTm9kZXMpCiB7CiAgICAgdW5zaWduZWQgdG9wUGFkZGluZywgcmln aHRQYWRkaW5nLCBib3R0b21QYWRkaW5nLCBsZWZ0UGFkZGluZzsKLSAgICBnZXRQYWRkaW5ncyh0 b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5nKTsKKyAg ICBJbnRQb2ludCBjb250ZW50Vmlld3BvcnRQb3MgPSBtX3dlYlBhZ2UtPm1hcEZyb21Db250ZW50 c1RvVmlld3BvcnQobV9jb250ZW50UG9zKTsKKyAgICAvLyBEbyBub3QgYWxsb3cgZmF0IGZpbmdl cnMgZGV0ZWN0IGFueXRoaW5nIG5vdCB2aXNpYmxlKGllIG91dHNpZGUgb2YgdGhlIHZpZXdwb3J0 KQorICAgIGFkanVzdFBhZGRpbmdzKGNvbnRlbnRWaWV3cG9ydFBvcywgdG9wUGFkZGluZywgcmln aHRQYWRkaW5nLCBib3R0b21QYWRkaW5nLCBsZWZ0UGFkZGluZyk7CiAKICAgICAvLyBUaGUgdXNl ciBmdW5jdGlvbnMgY2hlY2tGb3JUZXh0KCkgYW5kIGZpbmRJbnRlcnNlY3RpbmdSZWdpb25zKCkg dXNlcyB0aGUgTm9kZS53aG9sZVRleHQoKSB0byBjaGVja0ZpbmdlckludGVyc2VjdGlvbigpCiAg ICAgLy8gbm90IHRoZSB0ZXh0IGluIGl0cyBzaGFkb3cgdHJlZS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaAppbmRleCBmOGRmOTYz MGE3MjYxZWI0MzJlZDc2ZTNmMjU4YmUwOTIzNWJhNmNhLi43NjhkYjRiZGE3MTFiNzVlZmQyYjNi NTQ2ZDlhMWUyNzhjZjA3NTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oCkBAIC0xMDMsNyArMTAzLDcgQEAgcHJpdmF0ZToK ICAgICBib29sIGlzRWxlbWVudENsaWNrYWJsZShXZWJDb3JlOjpFbGVtZW50KikgY29uc3Q7CiAK ICAgICBpbmxpbmUgV2ViQ29yZTo6SW50UmVjdCBmaW5nZXJSZWN0Rm9yUG9pbnQoY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmKSBjb25zdDsKLSAgICB2b2lkIGdldFBhZGRpbmdzKHVuc2lnbmVkJiB0 b3AsIHVuc2lnbmVkJiByaWdodCwgdW5zaWduZWQmIGJvdHRvbSwgdW5zaWduZWQmIGxlZnQpIGNv bnN0OworICAgIHZvaWQgZ2V0QWRqdXN0ZWRQYWRkaW5ncyhjb25zdCBXZWJDb3JlOjpJbnRQb2lu dCYsIHVuc2lnbmVkJiB0b3AsIHVuc2lnbmVkJiByaWdodCwgdW5zaWduZWQmIGJvdHRvbSwgdW5z aWduZWQmIGxlZnQpIGNvbnN0OwogCiAgICAgV2ViUGFnZVByaXZhdGUqIG1fd2ViUGFnZTsKICAg ICBXZWJDb3JlOjpJbnRQb2ludCBtX2NvbnRlbnRQb3M7Cg== 190066 2013-02-25 08:16:33 -0800 2013-02-25 09:01:10 -0800 Patch bug-108678-20130225111246.patch text/plain 1824 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzOTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA0YjM1NDExNzEzNGMwNjMyY2MzNmRiOTUzOGE0ZmQzYjBiNzQyYjE3Li44MjMyNjBjMDhh NDQyOTRjZTFmZThkMzkzZDNhMWZjZTU4NzkwNzEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wMi0yNSAgVGlhbmNoZW5nIEppYW5nICA8dGlq aWFuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XUFkanVzdCBmYXRmaW5nZXIgZGV0 ZWN0aW9uIHJlY3Qgc2l6ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwODY3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBhIHR5cG8gaW4gZnVuY3Rpb24gbmFtZXMuCisKKyAgICAgICAgKiBXZWJL aXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpG YXRGaW5nZXJzOjpnZXROb2Rlc0Zyb21SZWN0KToKKwogMjAxMy0wMi0yNSAgQWxiZXJ0byBHYXJj aWEgIDxhbGJnYXJjaWFAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQ2hyb21lQ2xp ZW50QmxhY2tCZXJyeTogZml4IHZhcmlhYmxlIG5hbWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmNwcCBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwCmluZGV4IDRjZDQ1MTk3 MzA5ZWVjNDZkY2YzNGUwMWRmZGVhM2Y0MWI2OTc2MTQuLjAzZDUxNWUyOTE3NGU0NmFhZDIxYzQ3 Yzc4NDQ3MzA0YzcxY2UxZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwCkBAIC00NjAsNyArNDYwLDcgQEAgdm9pZCBG YXRGaW5nZXJzOjpnZXROb2Rlc0Zyb21SZWN0KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgSW50 UG9pbnQmIGNvbnRlbnRQb3MKICAgICB1bnNpZ25lZCB0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcs IGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5nOwogICAgIEludFBvaW50IGNvbnRlbnRWaWV3cG9y dFBvcyA9IG1fd2ViUGFnZS0+bWFwRnJvbUNvbnRlbnRzVG9WaWV3cG9ydChtX2NvbnRlbnRQb3Mp OwogICAgIC8vIERvIG5vdCBhbGxvdyBmYXQgZmluZ2VycyBkZXRlY3QgYW55dGhpbmcgbm90IHZp c2libGUoaWUgb3V0c2lkZSBvZiB0aGUgdmlld3BvcnQpCi0gICAgYWRqdXN0UGFkZGluZ3MoY29u dGVudFZpZXdwb3J0UG9zLCB0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcs IGxlZnRQYWRkaW5nKTsKKyAgICBnZXRBZGp1c3RlZFBhZGRpbmdzKGNvbnRlbnRWaWV3cG9ydFBv cywgdG9wUGFkZGluZywgcmlnaHRQYWRkaW5nLCBib3R0b21QYWRkaW5nLCBsZWZ0UGFkZGluZyk7 CiAKICAgICAvLyBUaGUgdXNlciBmdW5jdGlvbnMgY2hlY2tGb3JUZXh0KCkgYW5kIGZpbmRJbnRl cnNlY3RpbmdSZWdpb25zKCkgdXNlcyB0aGUgTm9kZS53aG9sZVRleHQoKSB0byBjaGVja0Zpbmdl ckludGVyc2VjdGlvbigpCiAgICAgLy8gbm90IHRoZSB0ZXh0IGluIGl0cyBzaGFkb3cgdHJlZS4K