121711 2013-09-20 13:47:31 -0700 Handle panning gestures messages properly on Windows 2013-09-20 23:13:07 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) PC Windows 7 RESOLVED FIXED InRadar P2 Normal --- 1 roger_fong webkit-unassigned bfulgham commit-queue esprehn+autocc glenn jonlee kondapallykalyan rniwa roger_fong simon.fraser oldest_to_newest 931566 0 roger_fong 2013-09-20 13:47:31 -0700 This bug addresses a couple issues: 1. Two finger panning in one direction can sometimes cause some unexpected scrolling in the other direction when the gesture first begins(directions meaning horizontal and vertical) 2. Single finger horizontal panning should only be disabled when attempting to select text 3. Scrolling via panning should be clamped, other wise we can scroll contents completely out of the scrollview. 4. Horizontal Overpan should work 5. Overpan should work only when the main document is scrolled 931567 1 roger_fong 2013-09-20 13:48:17 -0700 Each of these fixes by itself is rather small. I'm not sure if I should just break this up into 5 smaller bugs. 931611 2 roger_fong 2013-09-20 14:50:38 -0700 <rdar://problem/12712495> 931677 3 212245 roger_fong 2013-09-20 17:00:35 -0700 Created attachment 212245 patch 931686 4 212245 bfulgham 2013-09-20 17:17:12 -0700 Comment on attachment 212245 patch View in context: https://bugs.webkit.org/attachment.cgi?id=212245&action=review Looks great! We might want to add a FIXME for Right-to-left languages if that's something we are likely to encounter for scroll bar support. > Source/WebKit/win/WebView.cpp:1611 > + || (view->horizontalScrollbar() && (gestureBeginPoint.y > (webViewRect.bottom - view->horizontalScrollbar()->theme()->scrollbarThickness()))); This might not be right for a right-to-left environment. > Source/WebKit/win/WebView.cpp:1640 > + // Disable single-fingered horizontal panning only if the target node text. ... target node *is* text? > Source/WebKit/win/WebView.cpp:1741 > + UpdatePanningFeedbackPtr()(m_viewWindow, xpan, ypan, gi.dwFlags & GF_INERTIA); Nice! 931700 5 roger_fong 2013-09-20 18:34:27 -0700 (In reply to comment #4) > (From update of attachment 212245 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=212245&action=review > > Looks great! We might want to add a FIXME for Right-to-left languages if that's something we are likely to encounter for scroll bar support. > > > Source/WebKit/win/WebView.cpp:1611 > > + || (view->horizontalScrollbar() && (gestureBeginPoint.y > (webViewRect.bottom - view->horizontalScrollbar()->theme()->scrollbarThickness()))); > > This might not be right for a right-to-left environment. > I'll run a quick test. 931706 6 roger_fong 2013-09-20 20:25:31 -0700 Committed: http://trac.webkit.org/changeset/156219 Setting dir=rtl on the document doesn't flip the position of the vertical scrollbar. Perhaps that's actually controlled by the HWND? If that's the case, GetWindowRect might actually take the flipped-ness into account. Will investigate further later. 931713 7 roger_fong 2013-09-20 21:10:03 -0700 (In reply to comment #6) > Committed: http://trac.webkit.org/changeset/156219 > > Setting dir=rtl on the document doesn't flip the position of the vertical scrollbar. > > Perhaps that's actually controlled by the HWND? If that's the case, GetWindowRect might actually take the flipped-ness into account. > > Will investigate further later. I revoke that statement. It definitely won't work. Even if GetWindowRect flips the left and right values appropriately I'll need to add the scrollbar width, not subtract. 931716 8 rniwa 2013-09-20 22:01:35 -0700 This patch caused 5 tests to hit assertions on Mac: http://build.webkit.org/builders/Apple%20MountainLion%20Release%20WK1%20%28Tests%29/builds/13132 931717 9 212253 ap 2013-09-20 22:18:45 -0700 Created attachment 212253 follow-up fix > This patch caused 5 tests to hit assertions on Mac: > http://build.webkit.org/builders/Apple%20MountainLion%20Release%20WK1%20%28Tests%29/builds/13132 That warrants either an immediate rollout or an immediate fix. It's not OK to keep crashes in the tree over weekend. 931718 10 ap 2013-09-20 22:21:09 -0700 EWS didn't catch this because the patch in the bug is not quite what got landed. 931720 11 ap 2013-09-20 22:34:25 -0700 Landed the follow-up fix in r156223. 931725 12 212253 bfulgham 2013-09-20 23:13:07 -0700 Comment on attachment 212253 follow-up fix View in context: https://bugs.webkit.org/attachment.cgi?id=212253&action=review > Source/WebCore/rendering/RenderLayer.cpp:-2181 > - *scrolledView = &renderer().view().frameView(); I should have caught this when I reviewed. :( 212245 2013-09-20 17:00:35 -0700 2013-09-20 17:17:12 -0700 patch patch.patch text/plain 11268 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjIwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA5LTIwICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgSGFuZGxlIHBhbm5pbmcgZ2Vz dHVyZXMgbWVzc2FnZXMgcHJvcGVybHkgb24gV2luZG93cy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTcxMS4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIG5lZWRlZCBieSB0aGUgV2luZG93 cyBwb3J0IHRvIGtlZXAgdHJhY2sgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgb3Igbm90CisgICAgICAg IHdlIG5lZWQgdG8gb3ZlcnBhbi4KKworICAgICAgICBObyBuZXcgZnVuY3Rpb25hbGl0eSBhZGRl ZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsQnlSZWN1cnNpdmVseSk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmg6IAorICAgICAgICBBZGRlZCBhbiBhcmd1bWVudCB0byBrZWVwIHRy YWNrIG9mIHdoaWNoIHNjcm9sbHZpZXcgd2FzIGFjdHVhbGx5IHNjcm9sbGVkCisKIDIwMTMtMDkt MjAgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFNoYWRlcnMgdGhh dCBmYWlsIHRvIGNvbXBpbGUgc2hvdWxkIGJlIG1hcmtlZCBhcyBzdWNoCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDE1NjIwNSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIxNjYsNyArMjE2Niw3IEBACiAgICAgc2Nyb2xsQnlSZWN1cnNpdmVseShhZGp1c3RlZFNjcm9s bERlbHRhKGRlbHRhKSwgU2Nyb2xsT2Zmc2V0Q2xhbXBlZCk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5 ZXI6OnNjcm9sbEJ5UmVjdXJzaXZlbHkoY29uc3QgSW50U2l6ZSYgZGVsdGEsIFNjcm9sbE9mZnNl dENsYW1waW5nIGNsYW1wKQordm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsQnlSZWN1cnNpdmVseShj b25zdCBJbnRTaXplJiBkZWx0YSwgU2Nyb2xsT2Zmc2V0Q2xhbXBpbmcgY2xhbXAsIFNjcm9sbFZp ZXcqIHNjcm9sbGVkVmlldykKIHsKICAgICBpZiAoZGVsdGEuaXNaZXJvKCkpCiAgICAgICAgIHJl dHVybjsKQEAgLTIxNzgsMTIgKzIxNzgsMTMgQEAKICAgICBpZiAocmVuZGVyZXIoKS5oYXNPdmVy Zmxvd0NsaXAoKSAmJiAhcmVzdHJpY3RlZEJ5TGluZUNsYW1wKSB7CiAgICAgICAgIEludFNpemUg bmV3U2Nyb2xsT2Zmc2V0ID0gc2Nyb2xsT2Zmc2V0KCkgKyBkZWx0YTsKICAgICAgICAgc2Nyb2xs VG9PZmZzZXQobmV3U2Nyb2xsT2Zmc2V0LCBjbGFtcCk7CisgICAgICAgIHNjcm9sbGVkVmlldyA9 ICZyZW5kZXJlcigpLnZpZXcoKS5mcmFtZVZpZXcoKTsKIAogICAgICAgICAvLyBJZiB0aGlzIGxh eWVyIGNhbid0IGRvIHRoZSBzY3JvbGwgd2UgYXNrIHRoZSBuZXh0IGxheWVyIHVwIHRoYXQgY2Fu IHNjcm9sbCB0byB0cnkKICAgICAgICAgSW50U2l6ZSByZW1haW5pbmdTY3JvbGxPZmZzZXQgPSBu ZXdTY3JvbGxPZmZzZXQgLSBzY3JvbGxPZmZzZXQoKTsKICAgICAgICAgaWYgKCFyZW1haW5pbmdT Y3JvbGxPZmZzZXQuaXNaZXJvKCkgJiYgcmVuZGVyZXIoKS5wYXJlbnQoKSkgewogICAgICAgICAg ICAgaWYgKFJlbmRlckxheWVyKiBzY3JvbGxhYmxlTGF5ZXIgPSBlbmNsb3NpbmdTY3JvbGxhYmxl TGF5ZXIoKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxhYmxlTGF5ZXItPnNjcm9sbEJ5UmVjdXJz aXZlbHkocmVtYWluaW5nU2Nyb2xsT2Zmc2V0KTsKKyAgICAgICAgICAgICAgICBzY3JvbGxhYmxl TGF5ZXItPnNjcm9sbEJ5UmVjdXJzaXZlbHkocmVtYWluaW5nU2Nyb2xsT2Zmc2V0LCBjbGFtcCwg c2Nyb2xsZWRWaWV3KTsKIAogICAgICAgICAgICAgcmVuZGVyZXIoKS5mcmFtZSgpLmV2ZW50SGFu ZGxlcigpLnVwZGF0ZUF1dG9zY3JvbGxSZW5kZXJlcigpOwogICAgICAgICB9CkBAIC0yMTkxLDYg KzIxOTIsNyBAQAogICAgICAgICAvLyBJZiB3ZSBhcmUgaGVyZSwgd2Ugd2VyZSBjYWxsZWQgb24g YSByZW5kZXJlciB0aGF0IGNhbiBiZSBwcm9ncmFtbWF0aWNhbGx5IHNjcm9sbGVkLCBidXQgZG9l c24ndAogICAgICAgICAvLyBoYXZlIGFuIG92ZXJmbG93IGNsaXAuIFdoaWNoIG1lYW5zIHRoYXQg aXQgaXMgYSBkb2N1bWVudCBub2RlIHRoYXQgY2FuIGJlIHNjcm9sbGVkLgogICAgICAgICByZW5k ZXJlcigpLnZpZXcoKS5mcmFtZVZpZXcoKS5zY3JvbGxCeShkZWx0YSk7CisgICAgICAgIHNjcm9s bGVkVmlldyA9ICZyZW5kZXJlcigpLnZpZXcoKS5mcmFtZVZpZXcoKTsKIAogICAgICAgICAvLyBG SVhNRTogSWYgd2UgZGlkbid0IHNjcm9sbCB0aGUgd2hvbGUgd2F5LCBkbyB3ZSB3YW50IHRvIHRy eSBsb29raW5nIGF0IHRoZSBmcmFtZXMgb3duZXJFbGVtZW50PyAKICAgICAgICAgLy8gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MjM3CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAkocmV2aXNpb24gMTU2MjA1KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4Niw3ICsz ODYsNyBAQAogICAgIH07CiAKICAgICAvLyBTY3JvbGxpbmcgbWV0aG9kcyBmb3IgbGF5ZXJzIHRo YXQgY2FuIHNjcm9sbCB0aGVpciBvdmVyZmxvdy4KLSAgICB2b2lkIHNjcm9sbEJ5UmVjdXJzaXZl bHkoY29uc3QgSW50U2l6ZSYsIFNjcm9sbE9mZnNldENsYW1waW5nID0gU2Nyb2xsT2Zmc2V0VW5j bGFtcGVkKTsKKyAgICB2b2lkIHNjcm9sbEJ5UmVjdXJzaXZlbHkoY29uc3QgSW50U2l6ZSYsIFNj cm9sbE9mZnNldENsYW1waW5nID0gU2Nyb2xsT2Zmc2V0VW5jbGFtcGVkLCBTY3JvbGxWaWV3KiBz Y3JvbGxlZFZpZXcgPSAwKTsKICAgICB2b2lkIHNjcm9sbFRvT2Zmc2V0KGNvbnN0IEludFNpemUm LCBTY3JvbGxPZmZzZXRDbGFtcGluZyA9IFNjcm9sbE9mZnNldFVuY2xhbXBlZCk7CiAgICAgdm9p ZCBzY3JvbGxUb1hPZmZzZXQoaW50IHgsIFNjcm9sbE9mZnNldENsYW1waW5nIGNsYW1wID0gU2Ny b2xsT2Zmc2V0VW5jbGFtcGVkKSB7IHNjcm9sbFRvT2Zmc2V0KEludFNpemUoeCwgc2Nyb2xsWU9m ZnNldCgpKSwgY2xhbXApOyB9CiAgICAgdm9pZCBzY3JvbGxUb1lPZmZzZXQoaW50IHksIFNjcm9s bE9mZnNldENsYW1waW5nIGNsYW1wID0gU2Nyb2xsT2Zmc2V0VW5jbGFtcGVkKSB7IHNjcm9sbFRv T2Zmc2V0KEludFNpemUoc2Nyb2xsWE9mZnNldCgpLCB5KSwgY2xhbXApOyB9CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4v Q2hhbmdlTG9nCShyZXZpc2lvbiAxNTYyMDUpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMy0wOS0yMCAgUm9nZXIgRm9u ZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIEhhbmRsZSBwYW5uaW5nIGdlc3R1 cmVzIG1lc3NhZ2VzIHByb3Blcmx5IG9uIFdpbmRvd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE3MTEuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmaXhlcyBhIG51bWJlciBvZiBpc3N1ZXMg d2l0aCBwYW5uaW5nIGdlc3R1cmVzIG9uIFdpbmRvd3MuCisgICAgICAgIDEuIFR3byBmaW5nZXIg cGFubmluZyBpbiBvbmUgZGlyZWN0aW9uIGNhbiBzb21ldGltZXMgY2F1c2Ugc29tZSB1bmV4cGVj dGVkIHNjcm9sbGluZyAKKyAgICAgICAgaW4gdGhlIG90aGVyIGRpcmVjdGlvbiB3aGVuIHRoZSBn ZXN0dXJlIGZpcnN0IGJlZ2lucyAoZGlyZWN0aW9ucyBtZWFuaW5nIGhvcml6b250YWwgYW5kIHZl cnRpY2FsKQorICAgICAgICAyLiBTaW5nbGUgZmluZ2VyIGhvcml6b250YWwgcGFubmluZyBzaG91 bGQgb25seSBiZSBkaXNhYmxlZCB3aGVuIGF0dGVtcHRpbmcgdG8gc2VsZWN0IHRleHQuCisgICAg ICAgIDMuIFNjcm9sbGluZyB2aWEgcGFubmluZyBzaG91bGQgYmUgY2xhbXBlZCwgb3RoZXIgd2lz ZSB3ZSBjYW4gc2Nyb2xsIGNvbnRlbnRzIGNvbXBsZXRlbHkgb3V0IG9mIHRoZSBzY3JvbGx2aWV3 LgorICAgICAgICA0LiBIb3Jpem9udGFsIG92ZXJwYW4gc2hvdWxkIHdvcmsuCisgICAgICAgIDUu IE92ZXJwYW4gc2hvdWxkIG9jY3VyIHdoZW5ldmVyIHdlIHNjcm9sbCB0byB0aGUgZXh0ZW50cyBv ZiB3aGljaGV2ZXIgc2Nyb2xsIHZpZXcgd2UncmUgY3VycmVudGx5IHNjcm9sbGluZy4KKworICAg ICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6Z2VzdHVyZU5vdGlmeSk6Cisg ICAgICAgIChXZWJWaWV3OjpnZXN0dXJlKToKKwogMjAxMy0wOS0yMCAgUGF0cmljayBHYW5zdGVy ZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggTUlETCBmaWxlcyBmb3IgVmlz dWFsIFN0dWRpbyAyMDEyCkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gMTU2MjA1 KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2 MDcsNyArMTYwNyw4IEBACiAgICAgICAgIC8vIFRoZSBoaXQgdGVzdGluZyBhYm92ZSB3b24ndCBk ZXRlY3QgaWYgd2UndmUgaGl0IHRoZSBtYWluIGZyYW1lJ3MgdmVydGljYWwgc2Nyb2xsYmFyLiBD aGVjayB0aGF0IG1hbnVhbGx5IG5vdy4KICAgICAgICAgUkVDVCB3ZWJWaWV3UmVjdDsKICAgICAg ICAgR2V0V2luZG93UmVjdChtX3ZpZXdXaW5kb3csICZ3ZWJWaWV3UmVjdCk7Ci0gICAgICAgIGhp dFNjcm9sbGJhciA9IHZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkgJiYgKGdlc3R1cmVCZWdpblBv aW50LnggPiAod2ViVmlld1JlY3QucmlnaHQgLSB2aWV3LT52ZXJ0aWNhbFNjcm9sbGJhcigpLT50 aGVtZSgpLT5zY3JvbGxiYXJUaGlja25lc3MoKSkpOyAgCisgICAgICAgIGhpdFNjcm9sbGJhciA9 ICh2aWV3LT52ZXJ0aWNhbFNjcm9sbGJhcigpICYmIChnZXN0dXJlQmVnaW5Qb2ludC54ID4gKHdl YlZpZXdSZWN0LnJpZ2h0IC0gdmlldy0+dmVydGljYWxTY3JvbGxiYXIoKS0+dGhlbWUoKS0+c2Ny b2xsYmFyVGhpY2tuZXNzKCkpKSkgCisgICAgICAgICAgICB8fCAodmlldy0+aG9yaXpvbnRhbFNj cm9sbGJhcigpICYmIChnZXN0dXJlQmVnaW5Qb2ludC55ID4gKHdlYlZpZXdSZWN0LmJvdHRvbSAt IHZpZXctPmhvcml6b250YWxTY3JvbGxiYXIoKS0+dGhlbWUoKS0+c2Nyb2xsYmFyVGhpY2tuZXNz KCkpKSk7ICAKICAgICB9CiAKICAgICBib29sIGNhbkJlU2Nyb2xsZWQgPSBmYWxzZTsKQEAgLTE2 MjMsMjAgKzE2MjQsMjQgQEAKICAgICAvLyBXZSBhbHdheXMgYWxsb3cgdHdvLWZpbmdlcmVkIHBh bm5pbmcgd2l0aCBpbmVydGlhIGFuZCBhIGd1dHRlciAod2hpY2ggbGltaXRzIG1vdmVtZW50IHRv IG9uZQogICAgIC8vIGRpcmVjdGlvbiBpbiBtb3N0IGNhc2VzKS4KICAgICBEV09SRCBkd1Bhbldh bnQgPSBHQ19QQU4gfCBHQ19QQU5fV0lUSF9JTkVSVElBIHwgR0NfUEFOX1dJVEhfR1VUVEVSOwot ICAgIC8vIFdlIG5ldmVyIGFsbG93IHNpbmdsZS1maW5nZXJlZCBob3Jpem9udGFsIHBhbm5pbmcu IFRoYXQgZ2VzdHVyZSBpcyByZXNlcnZlZCBmb3IgY3JlYXRpbmcgdGV4dAotICAgIC8vIHNlbGVj dGlvbnMuIFRoaXMgbWF0Y2hlcyBJRS4KLSAgICBEV09SRCBkd1BhbkJsb2NrID0gR0NfUEFOX1dJ VEhfU0lOR0xFX0ZJTkdFUl9IT1JJWk9OVEFMTFk7CisgICAgRFdPUkQgZHdQYW5CbG9jayA9IDA7 CiAKICAgICBpZiAoaGl0U2Nyb2xsYmFyIHx8ICFjYW5CZVNjcm9sbGVkKSB7CiAgICAgICAgIC8v IFRoZSBwYXJ0IG9mIHRoZSBwYWdlIHVuZGVyIHRoZSBnZXN0dXJlIGNhbid0IGJlIHNjcm9sbGVk LCBvciB0aGUgZ2VzdHVyZSBpcyBvbiBhIHNjcm9sbGJhci4KLSAgICAgICAgLy8gRGlzYWxsb3cg c2luZ2xlLWZpbmdlcmVkIHZlcnRpY2FsIHBhbm5pbmcgaW4gdGhpcyBjYXNlLCB0b28sIHNvIHdl J2xsIGZhbGwgYmFjayB0byB0aGUgZGVmYXVsdAorICAgICAgICAvLyBEaXNhbGxvdyBzaW5nbGUt ZmluZ2VyZWQgcGFubmluZyBpbiB0aGlzIGNhc2Ugc28gd2UnbGwgZmFsbCBiYWNrIHRvIHRoZSBk ZWZhdWx0CiAgICAgICAgIC8vIGJlaGF2aW9yICh3aGljaCBhbGxvd3MgdGhlIHNjcm9sbGJhciB0 aHVtYiB0byBiZSBkcmFnZ2VkLCB0ZXh0IHNlbGVjdGlvbnMgdG8gYmUgbWFkZSwgZXRjLikuCi0g ICAgICAgIGR3UGFuQmxvY2sgfD0gR0NfUEFOX1dJVEhfU0lOR0xFX0ZJTkdFUl9WRVJUSUNBTExZ OworICAgICAgICBkd1BhbkJsb2NrID0gR0NfUEFOX1dJVEhfU0lOR0xFX0ZJTkdFUl9WRVJUSUNB TExZIHwgR0NfUEFOX1dJVEhfU0lOR0xFX0ZJTkdFUl9IT1JJWk9OVEFMTFk7CiAgICAgfSBlbHNl IHsKICAgICAgICAgLy8gVGhlIHBhcnQgb2YgdGhlIHBhZ2UgdGhlIGdlc3R1cmUgaXMgdW5kZXIg Y2FuIGJlIHNjcm9sbGVkLCBhbmQgd2UncmUgbm90IHVuZGVyIGEgc2Nyb2xsYmFyLgogICAgICAg ICAvLyBBbGxvdyBzaW5nbGUtZmluZ2VyZWQgdmVydGljYWwgcGFubmluZyBpbiB0aGlzIGNhc2Us IHNvIHRoZSB1c2VyIHdpbGwgYmUgYWJsZSB0byBwYW4gdGhlIHBhZ2UKICAgICAgICAgLy8gd2l0 aCBvbmUgb3IgdHdvIGZpbmdlcnMuCiAgICAgICAgIGR3UGFuV2FudCB8PSBHQ19QQU5fV0lUSF9T SU5HTEVfRklOR0VSX1ZFUlRJQ0FMTFk7CisKKyAgICAgICAgLy8gRGlzYWJsZSBzaW5nbGUtZmlu Z2VyZWQgaG9yaXpvbnRhbCBwYW5uaW5nIG9ubHkgaWYgdGhlIHRhcmdldCBub2RlIHRleHQuCisg ICAgICAgIGlmIChtX2dlc3R1cmVUYXJnZXROb2RlICYmIG1fZ2VzdHVyZVRhcmdldE5vZGUtPmlz VGV4dE5vZGUoKSkKKyAgICAgICAgICAgIGR3UGFuQmxvY2sgPSBHQ19QQU5fV0lUSF9TSU5HTEVf RklOR0VSX0hPUklaT05UQUxMWTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZHdQYW5XYW50 IHw9IEdDX1BBTl9XSVRIX1NJTkdMRV9GSU5HRVJfSE9SSVpPTlRBTExZOwogICAgIH0KIAogICAg IEdFU1RVUkVDT05GSUcgZ2MgPSB7IEdJRF9QQU4sIGR3UGFuV2FudCwgZHdQYW5CbG9jayB9OwpA QCAtMTY2Nyw2ICsxNjcyLDEwIEBACiAgICAgICAgIG1fZ2VzdHVyZVRhcmdldE5vZGUgPSAwOwog ICAgICAgICBicmVhazsKICAgICBjYXNlIEdJRF9QQU46IHsKKyAgICAgICAgaWYgKGdpLmR3Rmxh Z3MgJiBHRl9CRUdJTikgeworICAgICAgICAgICAgbV9sYXN0UGFuWCA9IGdpLnB0c0xvY2F0aW9u Lng7CisgICAgICAgICAgICBtX2xhc3RQYW5ZID0gZ2kucHRzTG9jYXRpb24ueTsKKyAgICAgICAg fQogICAgICAgICAvLyBXaGVyZSBhcmUgdGhlIGZpbmdlcnMgY3VycmVudGx5PwogICAgICAgICBs b25nIGN1cnJlbnRYID0gZ2kucHRzTG9jYXRpb24ueDsKICAgICAgICAgbG9uZyBjdXJyZW50WSA9 IGdpLnB0c0xvY2F0aW9uLnk7CkBAIC0xNjg2LDQ0ICsxNjk1LDUxIEBACiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIW1fZ2VzdHVyZVRhcmdldE5v ZGUgfHwgIW1fZ2VzdHVyZVRhcmdldE5vZGUtPnJlbmRlcmVyKCkpCi0gICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgICAgIFNjcm9sbFZpZXcqIHNjcm9sbGVkVmlldyA9IDA7CisgICAgICAg IGlmICghbV9nZXN0dXJlVGFyZ2V0Tm9kZSB8fCAhbV9nZXN0dXJlVGFyZ2V0Tm9kZS0+cmVuZGVy ZXIoKSkgeworICAgICAgICAgICAgLy8gV2UgbWlnaHQgZGlyZWN0bHkgaGl0IHRoZSBkb2N1bWVu dCB3aXRob3V0IGhpdHRpbmcgYW55IG5vZGVzCisgICAgICAgICAgICBjb3JlRnJhbWUtPnZpZXco KS0+c2Nyb2xsQnkoSW50U2l6ZSgtZGVsdGFYLCAtZGVsdGFZKSk7CisgICAgICAgICAgICBzY3Jv bGxlZFZpZXcgPSBjb3JlRnJhbWUtPnZpZXcoKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgIC8vIFNjcm9sbCB0aGUgc2VsZWN0ZWQgbGF5ZXIsIG1vZGlmeWluZyBkZWx0YXMgYXMgbmVj ZXNzYXJ5CisgICAgICAgICAgICBtX2dlc3R1cmVUYXJnZXROb2RlLT5yZW5kZXJlcigpLT5lbmNs b3NpbmdMYXllcigpLT5zY3JvbGxCeVJlY3Vyc2l2ZWx5KEludFNpemUoLWRlbHRhWCwgLWRlbHRh WSksIFdlYkNvcmU6OlJlbmRlckxheWVyOjpTY3JvbGxPZmZzZXRDbGFtcGVkLCBzY3JvbGxlZFZp ZXcpOworICAgICAgICB9CiAKLSAgICAgICAgLy8gV2UgbmVnYXRlIGhlcmUgc2luY2UgcGFubmlu ZyB1cCBtb3ZlcyB0aGUgY29udGVudCB1cCwgYnV0IG1vdmVzIHRoZSBzY3JvbGxiYXIgZG93bi4K LSAgICAgICAgbV9nZXN0dXJlVGFyZ2V0Tm9kZS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIo KS0+c2Nyb2xsQnlSZWN1cnNpdmVseShJbnRTaXplKC1kZWx0YVgsIC1kZWx0YVkpKTsKLSAgICAg ICAgICAgCiAgICAgICAgIGlmICghKFVwZGF0ZVBhbm5pbmdGZWVkYmFja1B0cigpICYmIEJlZ2lu UGFubmluZ0ZlZWRiYWNrUHRyKCkgJiYgRW5kUGFubmluZ0ZlZWRiYWNrUHRyKCkpKSB7CiAgICAg ICAgICAgICBDbG9zZUdlc3R1cmVJbmZvSGFuZGxlUHRyKCkoZ2VzdHVyZUhhbmRsZSk7CiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogCisgICAgICAgIC8vIEhhbmRsZSBvdmVy cGFubmluZwogICAgICAgICBpZiAoZ2kuZHdGbGFncyAmIEdGX0JFR0lOKSB7CiAgICAgICAgICAg ICBCZWdpblBhbm5pbmdGZWVkYmFja1B0cigpKG1fdmlld1dpbmRvdyk7CiAgICAgICAgICAgICBt X3lPdmVycGFuID0gMDsKKyAgICAgICAgICAgIG1feE92ZXJwYW4gPSAwOwogICAgICAgICB9IGVs c2UgaWYgKGdpLmR3RmxhZ3MgJiBHRl9FTkQpIHsKICAgICAgICAgICAgIEVuZFBhbm5pbmdGZWVk YmFja1B0cigpKG1fdmlld1dpbmRvdywgdHJ1ZSk7CiAgICAgICAgICAgICBtX3lPdmVycGFuID0g MDsKKyAgICAgICAgICAgIG1feE92ZXJwYW4gPSAwOwogICAgICAgICB9CiAKLSAgICAgICAgU2Ny b2xsVmlldyogdmlldyA9IGNvcmVGcmFtZS0+dmlldygpOwotICAgICAgICBpZiAoIXZpZXcpIHsK KyAgICAgICAgaWYgKCFzY3JvbGxlZFZpZXcpIHsKICAgICAgICAgICAgIENsb3NlR2VzdHVyZUlu Zm9IYW5kbGVQdHIoKShnZXN0dXJlSGFuZGxlKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICB9Ci0gICAgICAgIFNjcm9sbGJhciogdmVydFNjcm9sbGJhciA9IHZpZXctPnZlcnRp Y2FsU2Nyb2xsYmFyKCk7Ci0gICAgICAgIGlmICghdmVydFNjcm9sbGJhcikgewotICAgICAgICAg ICAgQ2xvc2VHZXN0dXJlSW5mb0hhbmRsZVB0cigpKGdlc3R1cmVIYW5kbGUpOwotICAgICAgICAg ICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KKyAgICAgICAgU2Nyb2xsYmFyKiB2ZXJ0U2Nyb2xs YmFyID0gc2Nyb2xsZWRWaWV3LT52ZXJ0aWNhbFNjcm9sbGJhcigpOwogCi0gICAgICAgIC8vIEZJ WE1FOiBTdXBwb3J0IEhvcml6b250YWwgV2luZG93IEJvdW5jZS4gPGh0dHBzOi8vd2Via2l0Lm9y Zy9iLzI4NTAwPi4KLSAgICAgICAgLy8gRklYTUU6IElmIHRoZSB1c2VyIHN0YXJ0cyBwYW5uaW5n IGRvd24gYWZ0ZXIgYSB3aW5kb3cgYm91bmNlIGhhcyBzdGFydGVkLCB0aGUgd2luZG93IGRvZXNu J3QgYm91bmNlIGJhY2sgCi0gICAgICAgIC8vIHVudGlsIHRoZXkgcmVsZWFzZSB0aGVpciBmaW5n ZXIuIDxodHRwczovL3dlYmtpdC5vcmcvYi8yODUwMT4uCi0gICAgICAgIGlmICh2ZXJ0U2Nyb2xs YmFyLT5jdXJyZW50UG9zKCkgPT0gMCkKLSAgICAgICAgICAgIFVwZGF0ZVBhbm5pbmdGZWVkYmFj a1B0cigpKG1fdmlld1dpbmRvdywgMCwgbV95T3ZlcnBhbiwgZ2kuZHdGbGFncyAmIEdGX0lORVJU SUEpOwotICAgICAgICBlbHNlIGlmICh2ZXJ0U2Nyb2xsYmFyLT5jdXJyZW50UG9zKCkgPj0gdmVy dFNjcm9sbGJhci0+bWF4aW11bSgpKQotICAgICAgICAgICAgVXBkYXRlUGFubmluZ0ZlZWRiYWNr UHRyKCkobV92aWV3V2luZG93LCAwLCBtX3lPdmVycGFuLCBnaS5kd0ZsYWdzICYgR0ZfSU5FUlRJ QSk7CisgICAgICAgIGludCB5cGFuID0gMDsKKyAgICAgICAgaW50IHhwYW4gPSAwOwogCisgICAg ICAgIGlmICh2ZXJ0U2Nyb2xsYmFyICYmICghdmVydFNjcm9sbGJhci0+Y3VycmVudFBvcygpIHx8 IHZlcnRTY3JvbGxiYXItPmN1cnJlbnRQb3MoKSA+PSB2ZXJ0U2Nyb2xsYmFyLT5tYXhpbXVtKCkp KQorICAgICAgICAgICAgeXBhbiA9IG1feU92ZXJwYW47CisKKyAgICAgICAgU2Nyb2xsYmFyKiBo b3JpU2Nyb2xsYmFyID0gc2Nyb2xsZWRWaWV3LT5ob3Jpem9udGFsU2Nyb2xsYmFyKCk7CisKKyAg ICAgICAgaWYgKGhvcmlTY3JvbGxiYXIgJiYgKCFob3JpU2Nyb2xsYmFyLT5jdXJyZW50UG9zKCkg fHwgaG9yaVNjcm9sbGJhci0+Y3VycmVudFBvcygpID49IGhvcmlTY3JvbGxiYXItPm1heGltdW0o KSkpCisgICAgICAgICAgICB4cGFuID0gbV94T3ZlcnBhbjsKKworICAgICAgICBVcGRhdGVQYW5u aW5nRmVlZGJhY2tQdHIoKShtX3ZpZXdXaW5kb3csIHhwYW4sIHlwYW4sIGdpLmR3RmxhZ3MgJiBH Rl9JTkVSVElBKTsKKwogICAgICAgICBDbG9zZUdlc3R1cmVJbmZvSGFuZGxlUHRyKCkoZ2VzdHVy ZUhhbmRsZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K 212253 2013-09-20 22:18:45 -0700 2013-09-20 23:13:07 -0700 follow-up fix NullCheck.txt text/plain 2121 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjIyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA5LTIwICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEhhbmRsZSBwYW5uaW5nIGdl c3R1cmVzIG1lc3NhZ2VzIHByb3Blcmx5IG9uIFdpbmRvd3MKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTcxMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDog KFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxCeVJlY3Vyc2l2ZWx5KToKKyAgICAgICAgQWRk ZWQgbnVsbCBjaGVja3MsIG5vdCBhbGwgY2FsbGVycyBhcmUgaW50ZXJlc3RlZCBpbiBzY3JvbGxl ZCB2aWV3IHBvaW50ZXIuCisKIDIwMTMtMDktMjAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgQmFkIGNhc3QgZnJvbSBDU1NJbml0aWFsVmFsdWUgdG8gQ1NTVmFs dWVMaXN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJl dmlzaW9uIDE1NjIyMikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNzgsNyArMjE3OCw4IEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OnNjcm9sbEJ5UmVjdXJzaXZlbHkoY28KICAgICBpZiAocmVuZGVyZXIoKS5oYXNPdmVyZmxvd0Ns aXAoKSAmJiAhcmVzdHJpY3RlZEJ5TGluZUNsYW1wKSB7CiAgICAgICAgIEludFNpemUgbmV3U2Ny b2xsT2Zmc2V0ID0gc2Nyb2xsT2Zmc2V0KCkgKyBkZWx0YTsKICAgICAgICAgc2Nyb2xsVG9PZmZz ZXQobmV3U2Nyb2xsT2Zmc2V0LCBjbGFtcCk7Ci0gICAgICAgICpzY3JvbGxlZFZpZXcgPSAmcmVu ZGVyZXIoKS52aWV3KCkuZnJhbWVWaWV3KCk7CisgICAgICAgIGlmIChzY3JvbGxlZFZpZXcpCisg ICAgICAgICAgICAqc2Nyb2xsZWRWaWV3ID0gJnJlbmRlcmVyKCkudmlldygpLmZyYW1lVmlldygp OwogCiAgICAgICAgIC8vIElmIHRoaXMgbGF5ZXIgY2FuJ3QgZG8gdGhlIHNjcm9sbCB3ZSBhc2sg dGhlIG5leHQgbGF5ZXIgdXAgdGhhdCBjYW4gc2Nyb2xsIHRvIHRyeQogICAgICAgICBJbnRTaXpl IHJlbWFpbmluZ1Njcm9sbE9mZnNldCA9IG5ld1Njcm9sbE9mZnNldCAtIHNjcm9sbE9mZnNldCgp OwpAQCAtMjE5Miw3ICsyMTkzLDggQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsQnlSZWN1cnNp dmVseShjbwogICAgICAgICAvLyBJZiB3ZSBhcmUgaGVyZSwgd2Ugd2VyZSBjYWxsZWQgb24gYSBy ZW5kZXJlciB0aGF0IGNhbiBiZSBwcm9ncmFtbWF0aWNhbGx5IHNjcm9sbGVkLCBidXQgZG9lc24n dAogICAgICAgICAvLyBoYXZlIGFuIG92ZXJmbG93IGNsaXAuIFdoaWNoIG1lYW5zIHRoYXQgaXQg aXMgYSBkb2N1bWVudCBub2RlIHRoYXQgY2FuIGJlIHNjcm9sbGVkLgogICAgICAgICByZW5kZXJl cigpLnZpZXcoKS5mcmFtZVZpZXcoKS5zY3JvbGxCeShkZWx0YSk7Ci0gICAgICAgICpzY3JvbGxl ZFZpZXcgPSAmcmVuZGVyZXIoKS52aWV3KCkuZnJhbWVWaWV3KCk7CisgICAgICAgIGlmIChzY3Jv bGxlZFZpZXcpCisgICAgICAgICAgICAqc2Nyb2xsZWRWaWV3ID0gJnJlbmRlcmVyKCkudmlldygp LmZyYW1lVmlldygpOwogCiAgICAgICAgIC8vIEZJWE1FOiBJZiB3ZSBkaWRuJ3Qgc2Nyb2xsIHRo ZSB3aG9sZSB3YXksIGRvIHdlIHdhbnQgdG8gdHJ5IGxvb2tpbmcgYXQgdGhlIGZyYW1lcyBvd25l ckVsZW1lbnQ/IAogICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjgyMzcK