57419 2011-03-29 21:33:46 -0700 Move factory-like things in EventDispatcher::dispatchMouseEvent to a factory, clean up names and ordering. 2011-03-30 14:44:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 55515 1 dglazkov dglazkov darin eric oldest_to_newest 376026 0 dglazkov 2011-03-29 21:33:46 -0700 Move factory-like things in EventDispatcher::dispatchMouseEvent to a factory, clean up names and ordering. 376028 1 87463 dglazkov 2011-03-29 21:35:22 -0700 Created attachment 87463 Patch 376369 2 87545 dglazkov 2011-03-30 09:03:22 -0700 Created attachment 87545 Rebased against ToT. 376463 3 87545 darin 2011-03-30 10:43:33 -0700 Comment on attachment 87545 Rebased against ToT. View in context: https://bugs.webkit.org/attachment.cgi?id=87545&action=review > Source/WebCore/dom/MouseEvent.cpp:33 > +PassRefPtr<MouseEvent> MouseEvent::create(const AtomicString& eventType, PassRefPtr<AbstractView> view, const PlatformMouseEvent& event, const IntPoint& position, int detail, PassRefPtr<Node> relatedTargetArg) No need for arg in relatedTargetArg. > Source/WebCore/dom/MouseEvent.cpp:35 > + bool cancelable = eventType != eventNames().mousemoveEvent; Change this to isCancelable instead of cancelable please. > Source/WebCore/dom/MouseEvent.cpp:38 > + return MouseEvent::create(eventType, > + true, cancelable, view, Nitpickiest of nitpicks: I’d merge these two into one line. > Source/WebCore/dom/MouseEvent.cpp:41 > + relatedTargetArg, 0, false); Extra space here. > Source/WebCore/dom/MouseEvent.h:49 > + static PassRefPtr<MouseEvent> create(const AtomicString& eventType, PassRefPtr<AbstractView>, const PlatformMouseEvent&, const IntPoint&, int detail, PassRefPtr<Node> relatedTargetArg); No need for arg in relatedTargetArg. 376691 4 dglazkov 2011-03-30 14:43:09 -0700 Thanks for review, Darin. Will fix and land. 376693 5 dglazkov 2011-03-30 14:44:34 -0700 Committed r82501: <http://trac.webkit.org/changeset/82501> 87463 2011-03-29 21:35:22 -0700 2011-03-30 09:03:20 -0700 Patch bug-57419-20110329213520.patch text/plain 7204 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogODIzODQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYThjYzU3ZWU5NGM2NGQw NDVkNGMyOWVhZjZlYWVhZmRlMWU0NDMzLi40ZjliMWMzNTA1OTBmOGNjZWM2YzY5MDFkNmZhYmVk M2MyODU5NTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMjkgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGZhY3RvcnktbGlrZSB0aGluZ3MgaW4g RXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaE1vdXNlRXZlbnQgdG8gYSBmYWN0b3J5LCBjbGVhbiB1 cCBuYW1lcyBhbmQgb3JkZXJpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01NzQxOQorCisgICAgICAgIFJlZmFjdG9yaW5nLCBjb3ZlcmVkIGJ5IGV4 aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVudCk6IFJlb3Jk ZXJlZCBhbmQgY2xhcmlmaWVkIG5hbWVzLgorICAgICAgICAqIGRvbS9Nb3VzZUV2ZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok1vdXNlRXZlbnQ6OmNyZWF0ZSk6IEFkZGVkIGEgbmV3IGZhY3Rv cnkgbWV0aG9kIHRoYXQgdGFrZXMgUGxhdGZvcm1Nb3VzZUV2ZW50LgorICAgICAgICAqIGRvbS9N b3VzZUV2ZW50Lmg6IEFkZGVkIGRlY2wuCisKIDIwMTEtMDMtMjkgIEphbWVzIFJvYmluc29uICA8 amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3Nl bGwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCmluZGV4IDhjMTczN2Y5NDBm Yzk1YjVlOGY5ZDcyNTk2YzljYmQ2Zjc4MGFhZGYuLmM4YjMzMGQyY2U3YzA1MzZiZDBmNmI5MmVi MzhmMjI3N2JmZTFiMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3Bh dGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCkBA IC0zMTMsNiArMzEzLDggQEAgYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVu dChOb2RlKiBub2RlLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGUKICAgICBpbnQgZGV0YWls LCBOb2RlKiByZWxhdGVkVGFyZ2V0QXJnKQogewogICAgIEFTU0VSVCghZXZlbnREaXNwYXRjaEZv cmJpZGRlbigpKTsKKyAgICBBU1NFUlQoZXZlbnQuZXZlbnRUeXBlKCkgPT0gTW91c2VFdmVudE1v dmVkIHx8IGV2ZW50LmJ1dHRvbigpICE9IE5vQnV0dG9uKTsKKwogICAgIGlmIChub2RlLT5kaXNh YmxlZCgpKSAvLyBEb24ndCBldmVuIHNlbmQgRE9NIGV2ZW50cyBmb3IgZGlzYWJsZWQgY29udHJv bHMuLgogICAgICAgICByZXR1cm4gdHJ1ZTsKIApAQCAtMzIxLDM4ICszMjMsMjcgQEAgYm9vbCBF dmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVudChOb2RlKiBub2RlLCBjb25zdCBQbGF0 Zm9ybU1vdXNlRXZlbnQmIGUKIAogICAgIEV2ZW50RGlzcGF0Y2hlciBkaXNwYXRjaGVyKG5vZGUp OwogCi0gICAgSW50UG9pbnQgY29udGVudHNQb3M7Ci0gICAgaWYgKEZyYW1lVmlldyogdmlldyA9 IG5vZGUtPmRvY3VtZW50KCktPnZpZXcoKSkKLSAgICAgICAgY29udGVudHNQb3MgPSB2aWV3LT53 aW5kb3dUb0NvbnRlbnRzKGV2ZW50LnBvcygpKTsKLQotICAgIEFTU0VSVChldmVudC5ldmVudFR5 cGUoKSA9PSBNb3VzZUV2ZW50TW92ZWQgfHwgZXZlbnQuYnV0dG9uKCkgIT0gTm9CdXR0b24pOwot Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGluIG1vdXNlIGV2ZW50IGNvbnN0cnVjdG9y LgotICAgIGJvb2wgY2FuY2VsYWJsZSA9IGV2ZW50VHlwZSAhPSBldmVudE5hbWVzKCkubW91c2Vt b3ZlRXZlbnQ7Ci0KLSAgICBib29sIHN3YWxsb3dFdmVudCA9IGZhbHNlOwotCiAgICAgLy8gQXR0 ZW1wdGluZyB0byBkaXNwYXRjaCB3aXRoIGEgbm9uLUV2ZW50VGFyZ2V0IHJlbGF0ZWRUYXJnZXQg Y2F1c2VzIHRoZSByZWxhdGVkVGFyZ2V0IHRvIGJlIHNpbGVudGx5IGlnbm9yZWQuCiAgICAgUmVm UHRyPE5vZGU+IHJlbGF0ZWRUYXJnZXQgPSBwdWxsT3V0T2ZTaGFkb3cocmVsYXRlZFRhcmdldEFy Zyk7CiAKLSAgICBpbnQgYWRqdXN0ZWRQYWdlWCA9IGNvbnRlbnRzUG9zLngoKTsKLSAgICBpbnQg YWRqdXN0ZWRQYWdlWSA9IGNvbnRlbnRzUG9zLnkoKTsKKyAgICBJbnRQb2ludCBjb250ZW50c1Bv c2l0aW9uOworICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBub2RlLT5kb2N1bWVudCgpLT52aWV3 KCkpCisgICAgICAgIGNvbnRlbnRzUG9zaXRpb24gPSB2aWV3LT53aW5kb3dUb0NvbnRlbnRzKGV2 ZW50LnBvcygpKTsKKworICAgIEludFBvaW50IGFkanVzdGVkUGFnZVBvc2l0aW9uID0gY29udGVu dHNQb3NpdGlvbjsKICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbm9kZS0+ZG9jdW1lbnQoKS0+ZnJh bWUoKSkgewogICAgICAgICBmbG9hdCBwYWdlWm9vbSA9IGZyYW1lLT5wYWdlWm9vbUZhY3Rvcigp OwogICAgICAgICBpZiAocGFnZVpvb20gIT0gMS4wZikgewogICAgICAgICAgICAgLy8gQWRqdXN0 IG91ciBwYWdlWCBhbmQgcGFnZVkgdG8gYWNjb3VudCBmb3IgdGhlIHBhZ2Ugem9vbS4KLSAgICAg ICAgICAgIGFkanVzdGVkUGFnZVggPSBscm91bmRmKGNvbnRlbnRzUG9zLngoKSAvIHBhZ2Vab29t KTsKLSAgICAgICAgICAgIGFkanVzdGVkUGFnZVkgPSBscm91bmRmKGNvbnRlbnRzUG9zLnkoKSAv IHBhZ2Vab29tKTsKKyAgICAgICAgICAgIGFkanVzdGVkUGFnZVBvc2l0aW9uLnNldFgobHJvdW5k Zihjb250ZW50c1Bvc2l0aW9uLngoKSAvIHBhZ2Vab29tKSk7CisgICAgICAgICAgICBhZGp1c3Rl ZFBhZ2VQb3NpdGlvbi5zZXRZKGxyb3VuZGYoY29udGVudHNQb3NpdGlvbi55KCkgLyBwYWdlWm9v bSkpOwogICAgICAgICB9CiAgICAgfQogCi0gICAgUmVmUHRyPE1vdXNlRXZlbnQ+IG1vdXNlRXZl bnQgPSBNb3VzZUV2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLAotICAgICAgICB0cnVlLCBjYW5jZWxh YmxlLCBub2RlLT5kb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLAotICAgICAgICBkZXRhaWwsIGV2 ZW50Lmdsb2JhbFgoKSwgZXZlbnQuZ2xvYmFsWSgpLCBhZGp1c3RlZFBhZ2VYLCBhZGp1c3RlZFBh Z2VZLAotICAgICAgICBldmVudC5jdHJsS2V5KCksIGV2ZW50LmFsdEtleSgpLCBldmVudC5zaGlm dEtleSgpLCBldmVudC5tZXRhS2V5KCksIGV2ZW50LmJ1dHRvbigpLAotICAgICAgICByZWxhdGVk VGFyZ2V0LCAgMCwgZmFsc2UpOwotICAgIC8vIEZJWE1FOiBTaG91bGQgdGhpcyBiZSBhZGp1c3Rl ZFBhZ2VYLCBhZGp1c3RlZFBhZ2VZPwotICAgIG1vdXNlRXZlbnQtPnNldEFic29sdXRlTG9jYXRp b24oSW50UG9pbnQoY29udGVudHNQb3MueCgpLCBjb250ZW50c1Bvcy55KCkpKTsKKyAgICBSZWZQ dHI8TW91c2VFdmVudD4gbW91c2VFdmVudCA9IE1vdXNlRXZlbnQ6OmNyZWF0ZShldmVudFR5cGUs IG5vZGUtPmRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksIGV2ZW50LCBhZGp1c3RlZFBhZ2VQb3Np dGlvbiwgZGV0YWlsLCByZWxhdGVkVGFyZ2V0KTsKKyAgICBtb3VzZUV2ZW50LT5zZXRBYnNvbHV0 ZUxvY2F0aW9uKGNvbnRlbnRzUG9zaXRpb24pOworCisgICAgYm9vbCBzd2FsbG93RXZlbnQgPSBm YWxzZTsKIAogICAgIGRpc3BhdGNoZXIuZGlzcGF0Y2hFdmVudChtb3VzZUV2ZW50KTsKICAgICBi b29sIGRlZmF1bHRIYW5kbGVkID0gbW91c2VFdmVudC0+ZGVmYXVsdEhhbmRsZWQoKTsKQEAgLTM2 NCwxMSArMzU1LDcgQEAgYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVudChO b2RlKiBub2RlLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGUKICAgICAvLyBvZiB0aGUgRE9N IHNwZWNzLCBidXQgaXMgdXNlZCBmb3IgY29tcGF0aWJpbGl0eSB3aXRoIHRoZSBvbmRibGNsaWNr PSIiIGF0dHJpYnV0ZS4gVGhpcyBpcyB0cmVhdGVkCiAgICAgLy8gYXMgYSBzZXBhcmF0ZSBldmVu dCBpbiBvdGhlciBET00tY29tcGxpYW50IGJyb3dzZXJzIGxpa2UgRmlyZWZveCwgYW5kIHNvIHdl IGRvIHRoZSBzYW1lLgogICAgIGlmIChldmVudFR5cGUgPT0gZXZlbnROYW1lcygpLmNsaWNrRXZl bnQgJiYgZGV0YWlsID09IDIpIHsKLSAgICAgICAgUmVmUHRyPEV2ZW50PiBkb3VibGVDbGlja0V2 ZW50ID0gTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5kYmxjbGlja0V2ZW50LAotICAg ICAgICAgICAgdHJ1ZSwgY2FuY2VsYWJsZSwgbm9kZS0+ZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXco KSwKLSAgICAgICAgICAgIGRldGFpbCwgZXZlbnQuZ2xvYmFsWCgpLCBldmVudC5nbG9iYWxZKCks IGFkanVzdGVkUGFnZVgsIGFkanVzdGVkUGFnZVksCi0gICAgICAgICAgICBldmVudC5jdHJsS2V5 KCksIGV2ZW50LmFsdEtleSgpLCBldmVudC5zaGlmdEtleSgpLCBldmVudC5tZXRhS2V5KCksIGV2 ZW50LmJ1dHRvbigpLAotICAgICAgICAgICAgcmVsYXRlZFRhcmdldCwgMCwgZmFsc2UpOworICAg ICAgICBSZWZQdHI8RXZlbnQ+IGRvdWJsZUNsaWNrRXZlbnQgPSBNb3VzZUV2ZW50OjpjcmVhdGUo ZXZlbnROYW1lcygpLmRibGNsaWNrRXZlbnQsIG5vZGUtPmRvY3VtZW50KCktPmRlZmF1bHRWaWV3 KCksIGV2ZW50LCBhZGp1c3RlZFBhZ2VQb3NpdGlvbiwgZGV0YWlsLCByZWxhdGVkVGFyZ2V0KTsK ICAgICAgICAgaWYgKGRlZmF1bHRIYW5kbGVkKQogICAgICAgICAgICAgZG91YmxlQ2xpY2tFdmVu dC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAgICAgZGlzcGF0Y2hlci5kaXNwYXRjaEV2ZW50 KGRvdWJsZUNsaWNrRXZlbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL01vdXNl RXZlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuY3BwCmluZGV4IDJiMzM5 ZDg0YmEzNGQ5ZGE3ZDljNDZiZWYzY2ZkZTllZTllNTI5NjYuLjllMmYzZDIyMzk4ZDk2MjQyZThk ZmM5OTcxZjRlMmZjYjY4YzViYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3Vz ZUV2ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTW91c2VFdmVudC5jcHAKQEAgLTIz LDEwICsyMywyNCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIk1vdXNlRXZlbnQu aCIKIAorI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVk ZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKK1Bhc3NSZWZQdHI8TW91c2VFdmVudD4gTW91c2VFdmVudDo6Y3Jl YXRlKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBQYXNzUmVmUHRyPEFic3RyYWN0Vmll dz4gdmlldywgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCwgY29uc3QgSW50UG9pbnQm IHBvc2l0aW9uLCBpbnQgZGV0YWlsLCBQYXNzUmVmUHRyPE5vZGU+IHJlbGF0ZWRUYXJnZXRBcmcp Cit7CisgICAgYm9vbCBjYW5jZWxhYmxlID0gZXZlbnRUeXBlICE9IGV2ZW50TmFtZXMoKS5tb3Vz ZW1vdmVFdmVudDsKKworICAgIHJldHVybiBNb3VzZUV2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLAor ICAgICAgICB0cnVlLCBjYW5jZWxhYmxlLCB2aWV3LAorICAgICAgICBkZXRhaWwsIGV2ZW50Lmds b2JhbFgoKSwgZXZlbnQuZ2xvYmFsWSgpLCBwb3NpdGlvbi54KCksIHBvc2l0aW9uLnkoKSwKKyAg ICAgICAgZXZlbnQuY3RybEtleSgpLCBldmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXkoKSwg ZXZlbnQubWV0YUtleSgpLCBldmVudC5idXR0b24oKSwKKyAgICAgICAgcmVsYXRlZFRhcmdldEFy ZywgIDAsIGZhbHNlKTsKK30KKwogTW91c2VFdmVudDo6TW91c2VFdmVudCgpCiAgICAgOiBtX2J1 dHRvbigwKQogICAgICwgbV9idXR0b25Eb3duKGZhbHNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL01vdXNlRXZlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmgK aW5kZXggMWMwYTdlMGIzYjFmZGFkZDQ4ZGUxNmZiOWQ0NGYyNjk2MWM3MDFiYi4uM2MxNmFlMDFh MGExOTJkMDY2NWU5YTlmODgzODZlMDMxZDZhZTYxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZG9tL01vdXNlRXZlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTW91c2VFdmVudC5o CkBAIC0yOSw2ICsyOSw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgUGxhdGZv cm1Nb3VzZUV2ZW50OworCiAgICAgLy8gSW50cm9kdWNlZCBpbiBET00gTGV2ZWwgMgogICAgIGNs YXNzIE1vdXNlRXZlbnQgOiBwdWJsaWMgTW91c2VSZWxhdGVkRXZlbnQgewogICAgIHB1YmxpYzoK QEAgLTQ0LDcgKzQ2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBNb3VzZUV2ZW50KHR5cGUsIGNhbkJ1YmJsZSwgY2FuY2VsYWJsZSwgdmll dywgZGV0YWlsLCBzY3JlZW5YLCBzY3JlZW5ZLCBwYWdlWCwgcGFnZVksCiAgICAgICAgICAgICAg ICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtleSwgbWV0YUtleSwgYnV0dG9uLCByZWxhdGVkVGFy Z2V0LCBjbGlwYm9hcmQsIGlzU2ltdWxhdGVkKSk7CiAgICAgICAgIH0KLSAgICAgICAgc3RhdGlj IFBhc3NSZWZQdHI8TW91c2VFdmVudD4gY3JlYXRlU2ltdWxhdGVkKGNvbnN0IEF0b21pY1N0cmlu ZyYgZXZlbnRUeXBlLCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4sIFBhc3NSZWZQdHI8RXZlbnQ+ IHVuZGVybHlpbmdFdmVudCk7CisgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1vdXNlRXZlbnQ+ IGNyZWF0ZShjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgUGFzc1JlZlB0cjxBYnN0cmFj dFZpZXc+LCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmLCBjb25zdCBJbnRQb2ludCYsIGludCBk ZXRhaWwsIFBhc3NSZWZQdHI8Tm9kZT4gcmVsYXRlZFRhcmdldEFyZyk7CiAKICAgICAgICAgdmly dHVhbCB+TW91c2VFdmVudCgpOwogCg== 87545 2011-03-30 09:03:22 -0700 2011-03-30 10:43:32 -0700 Rebased against ToT. bug-57419-20110330090321.patch text/plain 7051 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogODI0NTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4ZWIyMjA0NzViNDgxNTE4 NzIzZTlkNTBjNDBkZTk0ZWI5MWQ3YmVmLi4xNmYyNzJkYzFhNDkzY2NiY2FlZjBlM2I2N2MzYWZj NzkxZTI3YjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMjkgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGZhY3RvcnktbGlrZSB0aGluZ3MgaW4g RXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaE1vdXNlRXZlbnQgdG8gYSBmYWN0b3J5LCBjbGVhbiB1 cCBuYW1lcyBhbmQgb3JkZXJpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01NzQxOQorCisgICAgICAgIFJlZmFjdG9yaW5nLCBjb3ZlcmVkIGJ5IGV4 aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTW91c2VFdmVudCk6IFJlb3Jk ZXJlZCBhbmQgY2xhcmlmaWVkIG5hbWVzLgorICAgICAgICAqIGRvbS9Nb3VzZUV2ZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok1vdXNlRXZlbnQ6OmNyZWF0ZSk6IEFkZGVkIGEgbmV3IGZhY3Rv cnkgbWV0aG9kIHRoYXQgdGFrZXMgUGxhdGZvcm1Nb3VzZUV2ZW50LgorICAgICAgICAqIGRvbS9N b3VzZUV2ZW50Lmg6IEFkZGVkIGRlY2wuCisKIDIwMTEtMDMtMzAgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQnVpbGQgZml4Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAppbmRleCA4YzE3MzdmOTQwZmM5NWI1 ZThmOWQ3MjU5NmM5Y2JkNmY3ODBhYWRmLi5jOGIzMzBkMmNlN2MwNTM2YmQwZjZiOTJlYjM4ZjIy NzdiZmUxYjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcApAQCAtMzEz LDYgKzMxMyw4IEBAIGJvb2wgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaE1vdXNlRXZlbnQoTm9k ZSogbm9kZSwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBlCiAgICAgaW50IGRldGFpbCwgTm9k ZSogcmVsYXRlZFRhcmdldEFyZykKIHsKICAgICBBU1NFUlQoIWV2ZW50RGlzcGF0Y2hGb3JiaWRk ZW4oKSk7CisgICAgQVNTRVJUKGV2ZW50LmV2ZW50VHlwZSgpID09IE1vdXNlRXZlbnRNb3ZlZCB8 fCBldmVudC5idXR0b24oKSAhPSBOb0J1dHRvbik7CisKICAgICBpZiAobm9kZS0+ZGlzYWJsZWQo KSkgLy8gRG9uJ3QgZXZlbiBzZW5kIERPTSBldmVudHMgZm9yIGRpc2FibGVkIGNvbnRyb2xzLi4K ICAgICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTMyMSwzOCArMzIzLDI3IEBAIGJvb2wgRXZlbnRE aXNwYXRjaGVyOjpkaXNwYXRjaE1vdXNlRXZlbnQoTm9kZSogbm9kZSwgY29uc3QgUGxhdGZvcm1N b3VzZUV2ZW50JiBlCiAKICAgICBFdmVudERpc3BhdGNoZXIgZGlzcGF0Y2hlcihub2RlKTsKIAot ICAgIEludFBvaW50IGNvbnRlbnRzUG9zOwotICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBub2Rl LT5kb2N1bWVudCgpLT52aWV3KCkpCi0gICAgICAgIGNvbnRlbnRzUG9zID0gdmlldy0+d2luZG93 VG9Db250ZW50cyhldmVudC5wb3MoKSk7Ci0KLSAgICBBU1NFUlQoZXZlbnQuZXZlbnRUeXBlKCkg PT0gTW91c2VFdmVudE1vdmVkIHx8IGV2ZW50LmJ1dHRvbigpICE9IE5vQnV0dG9uKTsKLQotICAg IC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBpbiBtb3VzZSBldmVudCBjb25zdHJ1Y3Rvci4KLSAg ICBib29sIGNhbmNlbGFibGUgPSBldmVudFR5cGUgIT0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2 ZW50OwotCi0gICAgYm9vbCBzd2FsbG93RXZlbnQgPSBmYWxzZTsKLQogICAgIC8vIEF0dGVtcHRp bmcgdG8gZGlzcGF0Y2ggd2l0aCBhIG5vbi1FdmVudFRhcmdldCByZWxhdGVkVGFyZ2V0IGNhdXNl cyB0aGUgcmVsYXRlZFRhcmdldCB0byBiZSBzaWxlbnRseSBpZ25vcmVkLgogICAgIFJlZlB0cjxO b2RlPiByZWxhdGVkVGFyZ2V0ID0gcHVsbE91dE9mU2hhZG93KHJlbGF0ZWRUYXJnZXRBcmcpOwog Ci0gICAgaW50IGFkanVzdGVkUGFnZVggPSBjb250ZW50c1Bvcy54KCk7Ci0gICAgaW50IGFkanVz dGVkUGFnZVkgPSBjb250ZW50c1Bvcy55KCk7CisgICAgSW50UG9pbnQgY29udGVudHNQb3NpdGlv bjsKKyAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbm9kZS0+ZG9jdW1lbnQoKS0+dmlldygpKQor ICAgICAgICBjb250ZW50c1Bvc2l0aW9uID0gdmlldy0+d2luZG93VG9Db250ZW50cyhldmVudC5w b3MoKSk7CisKKyAgICBJbnRQb2ludCBhZGp1c3RlZFBhZ2VQb3NpdGlvbiA9IGNvbnRlbnRzUG9z aXRpb247CiAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IG5vZGUtPmRvY3VtZW50KCktPmZyYW1lKCkp IHsKICAgICAgICAgZmxvYXQgcGFnZVpvb20gPSBmcmFtZS0+cGFnZVpvb21GYWN0b3IoKTsKICAg ICAgICAgaWYgKHBhZ2Vab29tICE9IDEuMGYpIHsKICAgICAgICAgICAgIC8vIEFkanVzdCBvdXIg cGFnZVggYW5kIHBhZ2VZIHRvIGFjY291bnQgZm9yIHRoZSBwYWdlIHpvb20uCi0gICAgICAgICAg ICBhZGp1c3RlZFBhZ2VYID0gbHJvdW5kZihjb250ZW50c1Bvcy54KCkgLyBwYWdlWm9vbSk7Ci0g ICAgICAgICAgICBhZGp1c3RlZFBhZ2VZID0gbHJvdW5kZihjb250ZW50c1Bvcy55KCkgLyBwYWdl Wm9vbSk7CisgICAgICAgICAgICBhZGp1c3RlZFBhZ2VQb3NpdGlvbi5zZXRYKGxyb3VuZGYoY29u dGVudHNQb3NpdGlvbi54KCkgLyBwYWdlWm9vbSkpOworICAgICAgICAgICAgYWRqdXN0ZWRQYWdl UG9zaXRpb24uc2V0WShscm91bmRmKGNvbnRlbnRzUG9zaXRpb24ueSgpIC8gcGFnZVpvb20pKTsK ICAgICAgICAgfQogICAgIH0KIAotICAgIFJlZlB0cjxNb3VzZUV2ZW50PiBtb3VzZUV2ZW50ID0g TW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50VHlwZSwKLSAgICAgICAgdHJ1ZSwgY2FuY2VsYWJsZSwg bm9kZS0+ZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwKLSAgICAgICAgZGV0YWlsLCBldmVudC5n bG9iYWxYKCksIGV2ZW50Lmdsb2JhbFkoKSwgYWRqdXN0ZWRQYWdlWCwgYWRqdXN0ZWRQYWdlWSwK LSAgICAgICAgZXZlbnQuY3RybEtleSgpLCBldmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXko KSwgZXZlbnQubWV0YUtleSgpLCBldmVudC5idXR0b24oKSwKLSAgICAgICAgcmVsYXRlZFRhcmdl dCwgIDAsIGZhbHNlKTsKLSAgICAvLyBGSVhNRTogU2hvdWxkIHRoaXMgYmUgYWRqdXN0ZWRQYWdl WCwgYWRqdXN0ZWRQYWdlWT8KLSAgICBtb3VzZUV2ZW50LT5zZXRBYnNvbHV0ZUxvY2F0aW9uKElu dFBvaW50KGNvbnRlbnRzUG9zLngoKSwgY29udGVudHNQb3MueSgpKSk7CisgICAgUmVmUHRyPE1v dXNlRXZlbnQ+IG1vdXNlRXZlbnQgPSBNb3VzZUV2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLCBub2Rl LT5kb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCBldmVudCwgYWRqdXN0ZWRQYWdlUG9zaXRpb24s IGRldGFpbCwgcmVsYXRlZFRhcmdldCk7CisgICAgbW91c2VFdmVudC0+c2V0QWJzb2x1dGVMb2Nh dGlvbihjb250ZW50c1Bvc2l0aW9uKTsKKworICAgIGJvb2wgc3dhbGxvd0V2ZW50ID0gZmFsc2U7 CiAKICAgICBkaXNwYXRjaGVyLmRpc3BhdGNoRXZlbnQobW91c2VFdmVudCk7CiAgICAgYm9vbCBk ZWZhdWx0SGFuZGxlZCA9IG1vdXNlRXZlbnQtPmRlZmF1bHRIYW5kbGVkKCk7CkBAIC0zNjQsMTEg KzM1NSw3IEBAIGJvb2wgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaE1vdXNlRXZlbnQoTm9kZSog bm9kZSwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBlCiAgICAgLy8gb2YgdGhlIERPTSBzcGVj cywgYnV0IGlzIHVzZWQgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCB0aGUgb25kYmxjbGljaz0iIiBh dHRyaWJ1dGUuIFRoaXMgaXMgdHJlYXRlZAogICAgIC8vIGFzIGEgc2VwYXJhdGUgZXZlbnQgaW4g b3RoZXIgRE9NLWNvbXBsaWFudCBicm93c2VycyBsaWtlIEZpcmVmb3gsIGFuZCBzbyB3ZSBkbyB0 aGUgc2FtZS4KICAgICBpZiAoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50ICYm IGRldGFpbCA9PSAyKSB7Ci0gICAgICAgIFJlZlB0cjxFdmVudD4gZG91YmxlQ2xpY2tFdmVudCA9 IE1vdXNlRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuZGJsY2xpY2tFdmVudCwKLSAgICAgICAg ICAgIHRydWUsIGNhbmNlbGFibGUsIG5vZGUtPmRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksCi0g ICAgICAgICAgICBkZXRhaWwsIGV2ZW50Lmdsb2JhbFgoKSwgZXZlbnQuZ2xvYmFsWSgpLCBhZGp1 c3RlZFBhZ2VYLCBhZGp1c3RlZFBhZ2VZLAotICAgICAgICAgICAgZXZlbnQuY3RybEtleSgpLCBl dmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXkoKSwgZXZlbnQubWV0YUtleSgpLCBldmVudC5i dXR0b24oKSwKLSAgICAgICAgICAgIHJlbGF0ZWRUYXJnZXQsIDAsIGZhbHNlKTsKKyAgICAgICAg UmVmUHRyPEV2ZW50PiBkb3VibGVDbGlja0V2ZW50ID0gTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50 TmFtZXMoKS5kYmxjbGlja0V2ZW50LCBub2RlLT5kb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCBl dmVudCwgYWRqdXN0ZWRQYWdlUG9zaXRpb24sIGRldGFpbCwgcmVsYXRlZFRhcmdldCk7CiAgICAg ICAgIGlmIChkZWZhdWx0SGFuZGxlZCkKICAgICAgICAgICAgIGRvdWJsZUNsaWNrRXZlbnQtPnNl dERlZmF1bHRIYW5kbGVkKCk7CiAgICAgICAgIGRpc3BhdGNoZXIuZGlzcGF0Y2hFdmVudChkb3Vi bGVDbGlja0V2ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmNwcAppbmRleCAyYjMzOWQ4NGJh MzRkOWRhN2Q5YzQ2YmVmM2NmZGU5ZWU5ZTUyOTY2Li45ZTJmM2QyMjM5OGQ5NjI0MmU4ZGZjOTk3 MWY0ZTJmY2I2OGM1YmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTW91c2VFdmVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuY3BwCkBAIC0yMywxMCAr MjMsMjQgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJNb3VzZUV2ZW50LmgiCiAK KyNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkV2 ZW50TmFtZXMuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCitQYXNzUmVmUHRyPE1vdXNlRXZlbnQ+IE1vdXNlRXZlbnQ6OmNyZWF0ZShj b25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgUGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+IHZp ZXcsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQsIGNvbnN0IEludFBvaW50JiBwb3Np dGlvbiwgaW50IGRldGFpbCwgUGFzc1JlZlB0cjxOb2RlPiByZWxhdGVkVGFyZ2V0QXJnKQorewor ICAgIGJvb2wgY2FuY2VsYWJsZSA9IGV2ZW50VHlwZSAhPSBldmVudE5hbWVzKCkubW91c2Vtb3Zl RXZlbnQ7CisKKyAgICByZXR1cm4gTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50VHlwZSwKKyAgICAg ICAgdHJ1ZSwgY2FuY2VsYWJsZSwgdmlldywKKyAgICAgICAgZGV0YWlsLCBldmVudC5nbG9iYWxY KCksIGV2ZW50Lmdsb2JhbFkoKSwgcG9zaXRpb24ueCgpLCBwb3NpdGlvbi55KCksCisgICAgICAg IGV2ZW50LmN0cmxLZXkoKSwgZXZlbnQuYWx0S2V5KCksIGV2ZW50LnNoaWZ0S2V5KCksIGV2ZW50 Lm1ldGFLZXkoKSwgZXZlbnQuYnV0dG9uKCksCisgICAgICAgIHJlbGF0ZWRUYXJnZXRBcmcsICAw LCBmYWxzZSk7Cit9CisKIE1vdXNlRXZlbnQ6Ok1vdXNlRXZlbnQoKQogICAgIDogbV9idXR0b24o MCkKICAgICAsIG1fYnV0dG9uRG93bihmYWxzZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Nb3VzZUV2ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTW91c2VFdmVudC5oCmluZGV4 IDYzNGVlN2JlNzMwOTRjMTNiNzdlY2IwZTdjNTYwYzM0MmRjYTk3NmEuLjNjMTZhZTAxYTBhMTky ZDA2NjVlOWE5Zjg4Mzg2ZTAzMWQ2YWU2MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Nb3VzZUV2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuaApAQCAt MjksNiArMjksOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIFBsYXRmb3JtTW91 c2VFdmVudDsKKwogICAgIC8vIEludHJvZHVjZWQgaW4gRE9NIExldmVsIDIKICAgICBjbGFzcyBN b3VzZUV2ZW50IDogcHVibGljIE1vdXNlUmVsYXRlZEV2ZW50IHsKICAgICBwdWJsaWM6CkBAIC00 NCw2ICs0Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIHJldHVybiBhZG9w dFJlZihuZXcgTW91c2VFdmVudCh0eXBlLCBjYW5CdWJibGUsIGNhbmNlbGFibGUsIHZpZXcsIGRl dGFpbCwgc2NyZWVuWCwgc2NyZWVuWSwgcGFnZVgsIHBhZ2VZLAogICAgICAgICAgICAgICAgIGN0 cmxLZXksIGFsdEtleSwgc2hpZnRLZXksIG1ldGFLZXksIGJ1dHRvbiwgcmVsYXRlZFRhcmdldCwg Y2xpcGJvYXJkLCBpc1NpbXVsYXRlZCkpOwogICAgICAgICB9CisgICAgICAgIHN0YXRpYyBQYXNz UmVmUHRyPE1vdXNlRXZlbnQ+IGNyZWF0ZShjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwg UGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+LCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmLCBjb25z dCBJbnRQb2ludCYsIGludCBkZXRhaWwsIFBhc3NSZWZQdHI8Tm9kZT4gcmVsYXRlZFRhcmdldEFy Zyk7CiAKICAgICAgICAgdmlydHVhbCB+TW91c2VFdmVudCgpOwogCg==