25382 2009-04-24 16:07:02 -0700 Move scriptStateFromNode to ScriptState 2009-04-27 12:46:35 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dglazkov dglazkov darin oldest_to_newest 118763 0 dglazkov 2009-04-24 16:07:02 -0700 Now that the file is more than just a typedef and has scriptStateFromPage in it, it seems logical. 118767 1 29774 dglazkov 2009-04-24 16:08:32 -0700 Created attachment 29774 Move scriptStateFromNode to ScriptState, v1. WebCore/ChangeLog | 18 ++++++++++++++++++ WebCore/bindings/js/JSDOMBinding.cpp | 15 --------------- WebCore/bindings/js/JSDOMBinding.h | 2 -- WebCore/bindings/js/ScriptState.cpp | 16 ++++++++++++++++ WebCore/bindings/js/ScriptState.h | 6 +++--- WebCore/dom/NodeFilter.h | 1 - WebCore/dom/NodeIterator.h | 1 - WebCore/dom/TreeWalker.h | 1 - 8 files changed, 37 insertions(+), 23 deletions(-) 118996 2 29774 eric 2009-04-27 10:39:49 -0700 Comment on attachment 29774 Move scriptStateFromNode to ScriptState, v1. Seems to be missing the V8 side of things... 118998 3 29821 dglazkov 2009-04-27 11:21:42 -0700 Created attachment 29821 Move scriptStateFromNode to ScriptState, v2. WebCore/ChangeLog | 19 +++++++++++++++++++ WebCore/bindings/js/JSDOMBinding.cpp | 15 --------------- WebCore/bindings/js/JSDOMBinding.h | 2 -- WebCore/bindings/js/ScriptState.cpp | 16 ++++++++++++++++ WebCore/bindings/js/ScriptState.h | 8 ++++---- WebCore/bindings/v8/ScriptState.cpp | 11 +++++++++++ WebCore/bindings/v8/ScriptState.h | 4 +++- WebCore/dom/NodeFilter.h | 1 - WebCore/dom/NodeIterator.h | 1 - WebCore/dom/TreeWalker.h | 1 - 10 files changed, 53 insertions(+), 25 deletions(-) 118999 4 29821 eric 2009-04-27 11:23:46 -0700 Comment on attachment 29821 Move scriptStateFromNode to ScriptState, v2. I don't understand the #include <interpreter/CallFrame.h> include, but otherwise this looks fine! 119010 5 dglazkov 2009-04-27 12:46:35 -0700 Landed as http://trac.webkit.org/changeset/42901. 29774 2009-04-24 16:08:32 -0700 2009-04-27 11:21:51 -0700 Move scriptStateFromNode to ScriptState, v1. Move-scriptStateFromNode-to-ScriptState-v1..patch text/plain 4964 dglazkov NWNkMDU4OWI3OWFiMTRiNmRhYjdiYTU0NGYwM2Y4NzFkOTFiMzVkZApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MTc4MmZjLi42MjM4MmUx IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIxIEBACisyMDA5LTA0LTI0ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1MzgyCisgICAg ICAgIE1vdmUgc2NyaXB0U3RhdGVGcm9tTm9kZSB0byBTY3JpcHRTdGF0ZS4KKworICAgICAgICBX QVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICAqIGJpbmRp bmdzL2pzL0pTRE9NQmluZGluZy5jcHA6IE1vdmVkIHNjcmlwdFN0YXRlRnJvbU5vZGUgdG8gU2Ny aXB0U3RhdGUuCisgICAgICAgICogYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmg6IERpdHRvLgor ICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnNjcmlwdFN0YXRlRnJvbU5vZGUpOiBBZGRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY3Jp cHRTdGF0ZS5oOiBEaXR0by4KKyAgICAgICAgKiBkb20vTm9kZUZpbHRlci5oOiBSZW1vdmVkIEpT RE9NQmluZGluZyBoZWFkZXIgaW5jbHVkZS4KKyAgICAgICAgKiBkb20vTm9kZUl0ZXJhdG9yLmg6 IERpdHRvLgorICAgICAgICAqIGRvbS9UcmVlV2Fsa2VyLmg6IERpdHRvLgorCiAyMDA5LTA0LTI0 ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT aW1vbiBGcmFzZXIsIERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTRE9NQmluZGluZy5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5j cHAKaW5kZXggZDAwZTliZC4uNDJjNWZiMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RPTUJpbmRpbmcuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5n LmNwcApAQCAtNTE3LDIxICs1MTcsNiBAQCBKU1ZhbHVlUHRyIG9iamVjdFRvU3RyaW5nRnVuY3Rp b25HZXR0ZXIoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZQogICAgIHJl dHVybiBuZXcgKGV4ZWMpIFByb3RvdHlwZUZ1bmN0aW9uKGV4ZWMsIDAsIHByb3BlcnR5TmFtZSwg b2JqZWN0UHJvdG9GdW5jVG9TdHJpbmcpOwogfQogCi1TY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGVG cm9tTm9kZShOb2RlKiBub2RlKQotewotICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIDA7 Ci0gICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbm9kZS0+ZG9jdW1lbnQoKTsKLSAgICBpZiAoIWRv Y3VtZW50KQotICAgICAgICByZXR1cm4gMDsKLSAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ ZnJhbWUoKTsKLSAgICBpZiAoIWZyYW1lKQotICAgICAgICByZXR1cm4gMDsKLSAgICBpZiAoIWZy YW1lLT5zY3JpcHQoKS0+aXNFbmFibGVkKCkpCi0gICAgICAgIHJldHVybiAwOwotICAgIHJldHVy biBmcmFtZS0+c2NyaXB0KCktPmdsb2JhbE9iamVjdCgpLT5nbG9iYWxFeGVjKCk7Ci19Ci0KIFN0 cnVjdHVyZSogZ2V0Q2FjaGVkRE9NU3RydWN0dXJlKEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxP YmplY3QsIGNvbnN0IENsYXNzSW5mbyogY2xhc3NJbmZvKQogewogICAgIEpTRE9NU3RydWN0dXJl TWFwJiBzdHJ1Y3R1cmVzID0gZ2xvYmFsT2JqZWN0LT5zdHJ1Y3R1cmVzKCk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oIGIvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RPTUJpbmRpbmcuaAppbmRleCA1ODcwZWNjLi5kYWIzYzM0IDEwMDY0NAotLS0gYS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMv SlNET01CaW5kaW5nLmgKQEAgLTE4Nyw4ICsxODcsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgdm9pZCBwcmludEVycm9yTWVzc2FnZUZvckZyYW1lKEZyYW1lKiwgY29uc3QgU3RyaW5nJiBt ZXNzYWdlKTsKICAgICBKU0M6OkpTVmFsdWVQdHIgb2JqZWN0VG9TdHJpbmdGdW5jdGlvbkdldHRl cihKU0M6OkV4ZWNTdGF0ZSosIGNvbnN0IEpTQzo6SWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBj b25zdCBKU0M6OlByb3BlcnR5U2xvdCYpOwogCi0gICAgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRl RnJvbU5vZGUoTm9kZSopOwotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBK U0RPTUJpbmRpbmdfaApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRTdGF0 ZS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFN0YXRlLmNwcAppbmRleCA0YWU2YjRi Li44YmZhMzNkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFN0YXRlLmNw cAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFN0YXRlLmNwcApAQCAtMzIsMTAgKzMy LDI2IEBACiAjaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKIAogI2luY2x1ZGUgIkZyYW1lLmgiCisj aW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCitTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGVGcm9tTm9kZShOb2RlKiBub2RlKQoreworICAg IGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0g bm9kZS0+ZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50KQorICAgICAgICByZXR1cm4gMDsK KyAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQor ICAgICAgICByZXR1cm4gMDsKKyAgICBpZiAoIWZyYW1lLT5zY3JpcHQoKS0+aXNFbmFibGVkKCkp CisgICAgICAgIHJldHVybiAwOworICAgIHJldHVybiBmcmFtZS0+c2NyaXB0KCktPmdsb2JhbE9i amVjdCgpLT5nbG9iYWxFeGVjKCk7Cit9CisKIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21Q YWdlKFBhZ2UqIHBhZ2UpCiB7CiAgICAgcmV0dXJuIHBhZ2UtPm1haW5GcmFtZSgpLT5zY3JpcHQo KS0+Z2xvYmFsT2JqZWN0KCktPmdsb2JhbEV4ZWMoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NyaXB0U3RhdGUuaCBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U3RhdGUu aAppbmRleCAxOTYxNWMxLi41Y2RkOTQ3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pz L1NjcmlwdFN0YXRlLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRTdGF0ZS5oCkBA IC0zMiwxMSArMzIsMTAgQEAKICNpZm5kZWYgU2NyaXB0U3RhdGVfaAogI2RlZmluZSBTY3JpcHRT dGF0ZV9oCiAKLW5hbWVzcGFjZSBKU0MgewotICAgIGNsYXNzIEV4ZWNTdGF0ZTsKLX0KKyNpbmNs dWRlIDxpbnRlcnByZXRlci9DYWxsRnJhbWUuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgeworICAg IGNsYXNzIE5vZGU7CiAgICAgY2xhc3MgUGFnZTsKIAogICAgIC8vIFRoZSBpZGVhIGlzIHRvIGV4 cG9zZSAic3RhdGUtbGlrZSIgbWV0aG9kcyAoaGFkRXhjZXB0aW9uLCBhbmQgYW55IG90aGVyCkBA IC00NSw2ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBGb3Igbm93LCB0aGUg c2VwYXJhdGlvbiBpcyBwdXJlbHkgYnkgY29udmVudGlvbi4KICAgICB0eXBlZGVmIEpTQzo6RXhl Y1N0YXRlIFNjcmlwdFN0YXRlOwogCisgICAgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlRnJvbU5v ZGUoTm9kZSopOwogICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21QYWdlKFBhZ2UqIHBh Z2UpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9O b2RlRmlsdGVyLmggYi9XZWJDb3JlL2RvbS9Ob2RlRmlsdGVyLmgKaW5kZXggNDM1NjM1Ny4uOTRj ODdlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vTm9kZUZpbHRlci5oCisrKyBiL1dlYkNvcmUv ZG9tL05vZGVGaWx0ZXIuaApAQCAtMjUsNyArMjUsNiBAQAogI2lmbmRlZiBOb2RlRmlsdGVyX2gK ICNkZWZpbmUgTm9kZUZpbHRlcl9oCiAKLSNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIKICNpbmNs dWRlICJOb2RlRmlsdGVyQ29uZGl0aW9uLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4K ICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Ob2RlSXRl cmF0b3IuaCBiL1dlYkNvcmUvZG9tL05vZGVJdGVyYXRvci5oCmluZGV4IGQ3ZWVlMzYuLjJhOTky ZDMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL05vZGVJdGVyYXRvci5oCisrKyBiL1dlYkNvcmUv ZG9tL05vZGVJdGVyYXRvci5oCkBAIC0yNSw3ICsyNSw2IEBACiAjaWZuZGVmIE5vZGVJdGVyYXRv cl9oCiAjZGVmaW5lIE5vZGVJdGVyYXRvcl9oCiAKLSNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIK ICNpbmNsdWRlICJOb2RlRmlsdGVyLmgiCiAjaW5jbHVkZSAiVHJhdmVyc2FsLmgiCiAjaW5jbHVk ZSA8d3RmL1Bhc3NSZWZQdHIuaD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1RyZWVXYWxrZXIu aCBiL1dlYkNvcmUvZG9tL1RyZWVXYWxrZXIuaAppbmRleCBkMDZhY2I5Li40Y2M4ZTlhIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2RvbS9UcmVlV2Fsa2VyLmgKKysrIGIvV2ViQ29yZS9kb20vVHJlZVdh bGtlci5oCkBAIC0yNSw3ICsyNSw2IEBACiAjaWZuZGVmIFRyZWVXYWxrZXJfaAogI2RlZmluZSBU cmVlV2Fsa2VyX2gKIAotI2luY2x1ZGUgIkpTRE9NQmluZGluZy5oIgogI2luY2x1ZGUgIk5vZGVG aWx0ZXIuaCIKICNpbmNsdWRlICJUcmF2ZXJzYWwuaCIKICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0 ci5oPgo= 29821 2009-04-27 11:21:42 -0700 2009-04-27 11:23:46 -0700 Move scriptStateFromNode to ScriptState, v2. Move-scriptStateFromNode-to-ScriptState-v2..patch text/plain 6443 dglazkov ZDlkODhkMzEwOTMwZjNhODYzNzc3YTRjNjgxMWZhYmI1ODM3ZmVhNwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MTc4MmZjLi4wYTFmNDZj IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDA5LTA0LTI3ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1MzgyCisgICAg ICAgIE1vdmUgc2NyaXB0U3RhdGVGcm9tTm9kZSB0byBTY3JpcHRTdGF0ZS4KKworICAgICAgICAq IGJpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHA6IE1vdmVkIHNjcmlwdFN0YXRlRnJvbU5vZGUg dG8gU2NyaXB0U3RhdGUuCisgICAgICAgICogYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmg6IERp dHRvLgorICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdFN0YXRlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OnNjcmlwdFN0YXRlRnJvbU5vZGUpOiBBZGRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9q cy9TY3JpcHRTdGF0ZS5oOiBEaXR0by4KKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRTdGF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY3JpcHRTdGF0ZUZyb21Ob2RlKTogQWRkZWQuCisg ICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuaDogRGl0dG8uCisgICAgICAgICogZG9t L05vZGVGaWx0ZXIuaDogUmVtb3ZlZCBKU0RPTUJpbmRpbmcgaGVhZGVyIGluY2x1ZGUuCisgICAg ICAgICogZG9tL05vZGVJdGVyYXRvci5oOiBEaXR0by4KKyAgICAgICAgKiBkb20vVHJlZVdhbGtl ci5oOiBEaXR0by4KKwogMjAwOS0wNC0yNCAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLCBEYW4gQmVybnN0ZWluLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwIGIvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwCmluZGV4IGQwMGU5YmQuLjQyYzVmYjAgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcAorKysgYi9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAKQEAgLTUxNywyMSArNTE3LDYgQEAgSlNWYWx1 ZVB0ciBvYmplY3RUb1N0cmluZ0Z1bmN0aW9uR2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywgY29uc3Qg SWRlbnRpZmllciYgcHJvcGUKICAgICByZXR1cm4gbmV3IChleGVjKSBQcm90b3R5cGVGdW5jdGlv bihleGVjLCAwLCBwcm9wZXJ0eU5hbWUsIG9iamVjdFByb3RvRnVuY1RvU3RyaW5nKTsKIH0KIAot U2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlRnJvbU5vZGUoTm9kZSogbm9kZSkKLXsKLSAgICBpZiAo IW5vZGUpCi0gICAgICAgIHJldHVybiAwOwotICAgIERvY3VtZW50KiBkb2N1bWVudCA9IG5vZGUt PmRvY3VtZW50KCk7Ci0gICAgaWYgKCFkb2N1bWVudCkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAg RnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAg ICAgcmV0dXJuIDA7Ci0gICAgaWYgKCFmcmFtZS0+c2NyaXB0KCktPmlzRW5hYmxlZCgpKQotICAg ICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gZnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3Qo KS0+Z2xvYmFsRXhlYygpOwotfQotCiBTdHJ1Y3R1cmUqIGdldENhY2hlZERPTVN0cnVjdHVyZShK U0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBjb25zdCBDbGFzc0luZm8qIGNsYXNzSW5m bykKIHsKICAgICBKU0RPTVN0cnVjdHVyZU1hcCYgc3RydWN0dXJlcyA9IGdsb2JhbE9iamVjdC0+ c3RydWN0dXJlcygpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRp bmcuaCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmgKaW5kZXggNTg3MGVjYy4u ZGFiM2MzNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaAor KysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCkBAIC0xODcsOCArMTg3LDYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHZvaWQgcHJpbnRFcnJvck1lc3NhZ2VGb3JGcmFt ZShGcmFtZSosIGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7CiAgICAgSlNDOjpKU1ZhbHVlUHRyIG9i amVjdFRvU3RyaW5nRnVuY3Rpb25HZXR0ZXIoSlNDOjpFeGVjU3RhdGUqLCBjb25zdCBKU0M6Oklk ZW50aWZpZXImIHByb3BlcnR5TmFtZSwgY29uc3QgSlNDOjpQcm9wZXJ0eVNsb3QmKTsKIAotICAg IFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUqKTsKLQogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gSlNET01CaW5kaW5nX2gKZGlmZiAtLWdpdCBhL1dlYkNv cmUvYmluZGluZ3MvanMvU2NyaXB0U3RhdGUuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3Jp cHRTdGF0ZS5jcHAKaW5kZXggNGFlNmI0Yi4uOGJmYTMzZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHRTdGF0ZS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3Jp cHRTdGF0ZS5jcHAKQEAgLTMyLDEwICszMiwyNiBAQAogI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgi CiAKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIk5vZGUuaCIKICNpbmNsdWRlICJQYWdl LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlRnJv bU5vZGUoTm9kZSogbm9kZSkKK3sKKyAgICBpZiAoIW5vZGUpCisgICAgICAgIHJldHVybiAwOwor ICAgIERvY3VtZW50KiBkb2N1bWVudCA9IG5vZGUtPmRvY3VtZW50KCk7CisgICAgaWYgKCFkb2N1 bWVudCkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZy YW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKCFmcmFt ZS0+c2NyaXB0KCktPmlzRW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4g ZnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QoKS0+Z2xvYmFsRXhlYygpOworfQorCiBTY3Jp cHRTdGF0ZSogc2NyaXB0U3RhdGVGcm9tUGFnZShQYWdlKiBwYWdlKQogewogICAgIHJldHVybiBw YWdlLT5tYWluRnJhbWUoKS0+c2NyaXB0KCktPmdsb2JhbE9iamVjdCgpLT5nbG9iYWxFeGVjKCk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFN0YXRlLmggYi9XZWJDb3Jl L2JpbmRpbmdzL2pzL1NjcmlwdFN0YXRlLmgKaW5kZXggMTk2MTVjMS4uY2I4ZTgxZSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRTdGF0ZS5oCisrKyBiL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NyaXB0U3RhdGUuaApAQCAtMzIsMTEgKzMyLDEwIEBACiAjaWZuZGVmIFNjcmlw dFN0YXRlX2gKICNkZWZpbmUgU2NyaXB0U3RhdGVfaAogCi1uYW1lc3BhY2UgSlNDIHsKLSAgICBj bGFzcyBFeGVjU3RhdGU7Ci19CisjaW5jbHVkZSA8aW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmg+CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKKyAgICBjbGFzcyBOb2RlOwogICAgIGNsYXNzIFBhZ2U7CiAK ICAgICAvLyBUaGUgaWRlYSBpcyB0byBleHBvc2UgInN0YXRlLWxpa2UiIG1ldGhvZHMgKGhhZEV4 Y2VwdGlvbiwgYW5kIGFueSBvdGhlcgpAQCAtNDUsNyArNDQsOCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgLy8gRm9yIG5vdywgdGhlIHNlcGFyYXRpb24gaXMgcHVyZWx5IGJ5IGNvbnZlbnRp b24uCiAgICAgdHlwZWRlZiBKU0M6OkV4ZWNTdGF0ZSBTY3JpcHRTdGF0ZTsKIAotICAgIFNjcmlw dFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21QYWdlKFBhZ2UqIHBhZ2UpOworICAgIFNjcmlwdFN0YXRl KiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUqKTsKKyAgICBTY3JpcHRTdGF0ZSogc2NyaXB0U3Rh dGVGcm9tUGFnZShQYWdlKik7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdFN0YXRlLmNwcAppbmRleCBjYmNiN2Q2Li5iOWUyNDBjIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdFN0YXRlLmNwcApAQCAtMzIsOSArMzIsMTIgQEAKICNpbmNsdWRlICJTY3JpcHRT dGF0ZS5oIgogCiAjaW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVk ZSAiUGFnZS5oIgogI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKIAorI2luY2x1ZGUgPHd0 Zi9Bc3NlcnRpb25zLmg+CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU2NyaXB0U3RhdGU6OlNj cmlwdFN0YXRlKEZyYW1lKiBmcmFtZSkKQEAgLTQyLDYgKzQ1LDE0IEBAIFNjcmlwdFN0YXRlOjpT Y3JpcHRTdGF0ZShGcmFtZSogZnJhbWUpCiB7CiB9CiAKK1NjcmlwdFN0YXRlKiBzY3JpcHRTdGF0 ZUZyb21Ob2RlKE5vZGUqIG5vZGUpCit7CisgICAgLy8gVGhpcyBzaG91bGQgYmUgbmV2ZXIgcmVh Y2hlZCB3aXRoIFY4IGJpbmRpbmdzIChXZWJLaXQgb25seSB1c2VzIGl0CisgICAgLy8gZm9yIG5v bi1KUyBiaW5kaW5ncykKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gMDsK K30KKwogU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlRnJvbVBhZ2UoUGFnZSogcGFnZSkKIHsKICAg ICByZXR1cm4gcGFnZS0+bWFpbkZyYW1lKCktPnNjcmlwdCgpLT5zdGF0ZSgpOwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5oIGIvV2ViQ29yZS9iaW5kaW5ncy92 OC9TY3JpcHRTdGF0ZS5oCmluZGV4IGJjYjYzNGQuLjhmYmNmYTMgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nj cmlwdFN0YXRlLmgKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlIDx2OC5oPgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CisgICAgY2xhc3MgTm9kZTsKICAgICBjbGFzcyBQYWdlOwogICAgIGNsYXNz IEZyYW1lOwogCkBAIC01Niw3ICs1Nyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg RnJhbWUqIG1fZnJhbWU7CiAgICAgfTsKIAotICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZy b21QYWdlKFBhZ2UqIHBhZ2UpOworICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21Ob2Rl KE5vZGUqKTsKKyAgICBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGVGcm9tUGFnZShQYWdlKik7CiB9 CiAKICNlbmRpZiAvLyBTY3JpcHRTdGF0ZV9oCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Ob2Rl RmlsdGVyLmggYi9XZWJDb3JlL2RvbS9Ob2RlRmlsdGVyLmgKaW5kZXggNDM1NjM1Ny4uOTRjODdl MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vTm9kZUZpbHRlci5oCisrKyBiL1dlYkNvcmUvZG9t L05vZGVGaWx0ZXIuaApAQCAtMjUsNyArMjUsNiBAQAogI2lmbmRlZiBOb2RlRmlsdGVyX2gKICNk ZWZpbmUgTm9kZUZpbHRlcl9oCiAKLSNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIKICNpbmNsdWRl ICJOb2RlRmlsdGVyQ29uZGl0aW9uLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNp bmNsdWRlIDx3dGYvUmVmUHRyLmg+CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Ob2RlSXRlcmF0 b3IuaCBiL1dlYkNvcmUvZG9tL05vZGVJdGVyYXRvci5oCmluZGV4IGQ3ZWVlMzYuLjJhOTkyZDMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL05vZGVJdGVyYXRvci5oCisrKyBiL1dlYkNvcmUvZG9t L05vZGVJdGVyYXRvci5oCkBAIC0yNSw3ICsyNSw2IEBACiAjaWZuZGVmIE5vZGVJdGVyYXRvcl9o CiAjZGVmaW5lIE5vZGVJdGVyYXRvcl9oCiAKLSNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIKICNp bmNsdWRlICJOb2RlRmlsdGVyLmgiCiAjaW5jbHVkZSAiVHJhdmVyc2FsLmgiCiAjaW5jbHVkZSA8 d3RmL1Bhc3NSZWZQdHIuaD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1RyZWVXYWxrZXIuaCBi L1dlYkNvcmUvZG9tL1RyZWVXYWxrZXIuaAppbmRleCBkMDZhY2I5Li40Y2M4ZTlhIDEwMDY0NAot LS0gYS9XZWJDb3JlL2RvbS9UcmVlV2Fsa2VyLmgKKysrIGIvV2ViQ29yZS9kb20vVHJlZVdhbGtl ci5oCkBAIC0yNSw3ICsyNSw2IEBACiAjaWZuZGVmIFRyZWVXYWxrZXJfaAogI2RlZmluZSBUcmVl V2Fsa2VyX2gKIAotI2luY2x1ZGUgIkpTRE9NQmluZGluZy5oIgogI2luY2x1ZGUgIk5vZGVGaWx0 ZXIuaCIKICNpbmNsdWRlICJUcmF2ZXJzYWwuaCIKICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5o Pgo=