21833 2008-10-23 11:31:13 -0700 Put Web Inspector's JS debugger hooks under ENABLE(JAVASCRIPT_DEBUGGER) 2008-10-23 12:38:11 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 pkasting pkasting oldest_to_newest 96359 0 pkasting 2008-10-23 11:31:13 -0700 In the Chromium port, we can't yet use the JavaScript Debugger. To obviate the need to fork files, I plan to place the hooks to support the debugger under ENABLE(JAVASCRIPT_DEBUGGER), which will be on by default. This flag can go away eventually once we can support the debugger in our port. 96363 1 24605 pkasting 2008-10-23 11:48:35 -0700 Created attachment 24605 patch v1 Notable points to review: * Make sure I didn't erroneously cover any non-debugger functions. * If there are more helper functions, #includes, etc. that can also go under this #if, I may have missed them; feel free to point that out. 96366 2 24605 aroben 2008-10-23 11:56:05 -0700 Comment on attachment 24605 patch v1 > @@ -1114,12 +1125,16 @@ void InspectorController::setWindowVisib > populateScriptObjects(); > if (m_nodeToFocus) > focusNode(); > +#if ENABLE(JAVASCRIPT_DEBUGGER) > if (m_attachDebuggerWhenShown) > startDebugging(); > +#endif > if (m_showAfterVisible != CurrentPanel) > showPanel(m_showAfterVisible); > } else { > +#if ENABLE(JAVASCRIPT_DEBUGGER) > stopDebugging(); > +#endif I wonder if it would be better to make startDebugging() and stopDebugging() (and probably some of the other InspectorController functions) be no-ops when the debugger is disabled. That would allow us to add fewer #ifdefs, I think. But I guess that's inconsistent with how we normally use the ENABLE() macro. r=me 96373 3 pkasting 2008-10-23 12:38:11 -0700 Fixed in r37820. 24605 2008-10-23 11:48:35 -0700 2008-10-23 11:56:05 -0700 patch v1 patch text/plain 12573 pkasting SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM3ODE1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDgtMTAtMjMgIFBldGVyIEth c3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTgzMworICAgICAgICBQbGFjZSBKYXZhU2NyaXB0IERlYnVnZ2VyIGhvb2tzIHVuZGVy ICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikuCisKKyAgICAgICAgKiB3dGYvUGxhdGZv cm0uaDoKKwogMjAwOC0xMC0yMyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAg ICAgICAgLSByb2xsIG91dCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE3MzIKSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAzNzgxNSkKKysrIEphdmFT Y3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMjcsNiArMzI3LDEw IEBACiAjZGVmaW5lIEVOQUJMRV9EQVRBQkFTRSAxCiAjZW5kaWYKIAorI2lmICFkZWZpbmVkKEVO QUJMRV9KQVZBU0NSSVBUX0RFQlVHR0VSKQorI2RlZmluZSBFTkFCTEVfSkFWQVNDUklQVF9ERUJV R0dFUiAxCisjZW5kaWYKKwogI2lmICFkZWZpbmVkKEVOQUJMRV9GVFBESVIpCiAjZGVmaW5lIEVO QUJMRV9GVFBESVIgMQogI2VuZGlmCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMzc4MTUpCisrKyBXZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDA4LTEwLTIzICBQZXRlciBL YXN0aW5nICA8cGthc3RpbmdAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE4MzMKKyAgICAgICAgUGxhY2UgSmF2YVNjcmlwdCBEZWJ1Z2dlciBob29rcyB1bmRl ciAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpLgorCisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JDb250cm9sbGVyOjpzZXRXaW5kb3dWaXNpYmxlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckNvbnRyb2xsZXI6OndpbmRvd1NjcmlwdE9iamVjdEF2YWlsYWJsZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSk6CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6UGFnZSk6CisKIDIwMDgtMTAtMjMgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDog V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDM3ODE1 KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQ4LDE0ICs0OCwxMSBAQAogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKICNp bmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JDbGll bnQuaCIKLSNpbmNsdWRlICJKYXZhU2NyaXB0Q2FsbEZyYW1lLmgiCiAjaW5jbHVkZSAiSlNET01X aW5kb3cuaCIKICNpbmNsdWRlICJKU0luc3BlY3RlZE9iamVjdFdyYXBwZXIuaCIKICNpbmNsdWRl ICJKU0luc3BlY3RvckNhbGxiYWNrV3JhcHBlci5oIgotI2luY2x1ZGUgIkpTSmF2YVNjcmlwdENh bGxGcmFtZS5oIgogI2luY2x1ZGUgIkpTTm9kZS5oIgogI2luY2x1ZGUgIkpTUmFuZ2UuaCIKLSNp bmNsdWRlICJKYXZhU2NyaXB0RGVidWdTZXJ2ZXIuaCIKICNpbmNsdWRlICJKYXZhU2NyaXB0UHJv ZmlsZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJSYW5nZS5oIgpAQCAtODMsNiAr ODAsMTIgQEAKICNpbmNsdWRlICJKU0RhdGFiYXNlLmgiCiAjZW5kaWYKIAorI2lmIEVOQUJMRShK QVZBU0NSSVBUX0RFQlVHR0VSKQorI2luY2x1ZGUgIkphdmFTY3JpcHRDYWxsRnJhbWUuaCIKKyNp bmNsdWRlICJKYXZhU2NyaXB0RGVidWdTZXJ2ZXIuaCIKKyNpbmNsdWRlICJKU0phdmFTY3JpcHRD YWxsRnJhbWUuaCIKKyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgSlNDOwogdXNpbmcgbmFtZXNw YWNlIHN0ZDsKIApAQCAtNDMxLDYgKzQzNCw3IEBAIFNJTVBMRV9JTlNQRUNUT1JfQ0FMTEJBQ0so bG9hZGVkLCBzY3JpcHQKIFNJTVBMRV9JTlNQRUNUT1JfQ0FMTEJBQ0sodW5sb2FkaW5nLCBjbG9z ZSk7CiBTSU1QTEVfSU5TUEVDVE9SX0NBTExCQUNLKGF0dGFjaCwgYXR0YWNoV2luZG93KTsKIFNJ TVBMRV9JTlNQRUNUT1JfQ0FMTEJBQ0soZGV0YWNoLCBkZXRhY2hXaW5kb3cpOworI2lmIEVOQUJM RShKQVZBU0NSSVBUX0RFQlVHR0VSKQogU0lNUExFX0lOU1BFQ1RPUl9DQUxMQkFDSyhzdGFydERl YnVnZ2luZywgc3RhcnREZWJ1Z2dpbmcpOwogU0lNUExFX0lOU1BFQ1RPUl9DQUxMQkFDSyhzdG9w RGVidWdnaW5nLCBzdG9wRGVidWdnaW5nKTsKIFNJTVBMRV9JTlNQRUNUT1JfQ0FMTEJBQ0socGF1 c2VJbkRlYnVnZ2VyLCBwYXVzZUluRGVidWdnZXIpOwpAQCAtNDM4LDYgKzQ0Miw3IEBAIFNJTVBM RV9JTlNQRUNUT1JfQ0FMTEJBQ0socmVzdW1lRGVidWdnZXIKIFNJTVBMRV9JTlNQRUNUT1JfQ0FM TEJBQ0soc3RlcE92ZXJTdGF0ZW1lbnRJbkRlYnVnZ2VyLCBzdGVwT3ZlclN0YXRlbWVudEluRGVi dWdnZXIpOwogU0lNUExFX0lOU1BFQ1RPUl9DQUxMQkFDSyhzdGVwSW50b1N0YXRlbWVudEluRGVi dWdnZXIsIHN0ZXBJbnRvU3RhdGVtZW50SW5EZWJ1Z2dlcik7CiBTSU1QTEVfSU5TUEVDVE9SX0NB TExCQUNLKHN0ZXBPdXRPZkZ1bmN0aW9uSW5EZWJ1Z2dlciwgc3RlcE91dE9mRnVuY3Rpb25JbkRl YnVnZ2VyKTsKKyNlbmRpZgogU0lNUExFX0lOU1BFQ1RPUl9DQUxMQkFDSyhjbG9zZVdpbmRvdywg Y2xvc2VXaW5kb3cpOwogU0lNUExFX0lOU1BFQ1RPUl9DQUxMQkFDSyhjbGVhck1lc3NhZ2VzLCBj bGVhckNvbnNvbGVNZXNzYWdlcyk7CiBTSU1QTEVfSU5TUEVDVE9SX0NBTExCQUNLKHN0YXJ0UHJv ZmlsaW5nLCBzdGFydFVzZXJJbml0aWF0ZWRQcm9maWxpbmcpOwpAQCAtNDUyLDggKzQ1NywxMCBA QCBzdGF0aWMgSlNWYWx1ZVJlZiBqc0Z1bmN0aW9uKEpTQ29udGV4dFJlCiAgICAgcmV0dXJuIEpT VmFsdWVNYWtlVW5kZWZpbmVkKGN0eCk7IFwKIH0KIAorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RF QlVHR0VSKQogQk9PTF9JTlNQRUNUT1JfQ0FMTEJBQ0soZGVidWdnZXJBdHRhY2hlZCwgZGVidWdn ZXJBdHRhY2hlZCk7CiBCT09MX0lOU1BFQ1RPUl9DQUxMQkFDSyhwYXVzZU9uRXhjZXB0aW9ucywg cGF1c2VPbkV4Y2VwdGlvbnMpOworI2VuZGlmCiBCT09MX0lOU1BFQ1RPUl9DQUxMQkFDSyhpc1dp bmRvd1Zpc2libGUsIHdpbmRvd1Zpc2libGUpOwogQk9PTF9JTlNQRUNUT1JfQ0FMTEJBQ0soc2Vh cmNoaW5nRm9yTm9kZSwgc2VhcmNoaW5nRm9yTm9kZUluUGFnZSk7CiAKQEAgLTgyOCw2ICs4MzUs NyBAQCBzdGF0aWMgSlNWYWx1ZVJlZiB3cmFwQ2FsbGJhY2soSlNDb250ZXh0CiAgICAgcmV0dXJu IHRvUmVmKEpTSW5zcGVjdG9yQ2FsbGJhY2tXcmFwcGVyOjp3cmFwKHRvSlMoY3R4KSwgdG9KUyhh cmd1bWVudHNbMF0pKSk7CiB9CiAKKyNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKIHN0 YXRpYyBKU1ZhbHVlUmVmIGN1cnJlbnRDYWxsRnJhbWUoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmpl Y3RSZWYgLypmdW5jdGlvbiovLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgLyphcmd1 bWVudENvdW50Ki8sIGNvbnN0IEpTVmFsdWVSZWZbXSAvKmFyZ3VtZW50cyovLCBKU1ZhbHVlUmVm KiAvKmV4Y2VwdGlvbiovKQogewogICAgIEluc3BlY3RvckNvbnRyb2xsZXIqIGNvbnRyb2xsZXIg PSByZWludGVycHJldF9jYXN0PEluc3BlY3RvckNvbnRyb2xsZXIqPihKU09iamVjdEdldFByaXZh dGUodGhpc09iamVjdCkpOwpAQCAtOTAxLDYgKzkwOSw3IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIHJl bW92ZUJyZWFrcG9pbnQoSlNDb24KIAogICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChj dHgpOwogfQorI2VuZGlmCiAKIHN0YXRpYyBKU1ZhbHVlUmVmIHByb2ZpbGVzKEpTQ29udGV4dFJl ZiBjdHgsIEpTT2JqZWN0UmVmIC8qZnVuY3Rpb24qLywgSlNPYmplY3RSZWYgdGhpc09iamVjdCwg c2l6ZV90IC8qYXJndW1lbnRDb3VudCovLCBjb25zdCBKU1ZhbHVlUmVmW10gLyphcmd1bWVudHMq LywgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQogewpAQCAtOTU0LDggKzk2MywxMCBAQCBJbnNwZWN0 b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyCiAgICAgLCBtX2NvbnRyb2xsZXJTY3Jp cHRPYmplY3QoMCkKICAgICAsIG1fc2NyaXB0Q29udGV4dCgwKQogICAgICwgbV93aW5kb3dWaXNp YmxlKGZhbHNlKQorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQogICAgICwgbV9kZWJ1 Z2dlckF0dGFjaGVkKGZhbHNlKQogICAgICwgbV9hdHRhY2hEZWJ1Z2dlcldoZW5TaG93bihmYWxz ZSkKKyNlbmRpZgogICAgICwgbV9yZWNvcmRpbmdVc2VySW5pdGlhdGVkUHJvZmlsZShmYWxzZSkK ICAgICAsIG1fc2hvd0FmdGVyVmlzaWJsZShFbGVtZW50c1BhbmVsKQogICAgICwgbV9uZXh0SWRl bnRpZmllcigtMikKQEAgLTExMTQsMTIgKzExMjUsMTYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9s bGVyOjpzZXRXaW5kb3dWaXNpYgogICAgICAgICBwb3B1bGF0ZVNjcmlwdE9iamVjdHMoKTsKICAg ICAgICAgaWYgKG1fbm9kZVRvRm9jdXMpCiAgICAgICAgICAgICBmb2N1c05vZGUoKTsKKyNpZiBF TkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKICAgICAgICAgaWYgKG1fYXR0YWNoRGVidWdnZXJX aGVuU2hvd24pCiAgICAgICAgICAgICBzdGFydERlYnVnZ2luZygpOworI2VuZGlmCiAgICAgICAg IGlmIChtX3Nob3dBZnRlclZpc2libGUgIT0gQ3VycmVudFBhbmVsKQogICAgICAgICAgICAgc2hv d1BhbmVsKG1fc2hvd0FmdGVyVmlzaWJsZSk7CiAgICAgfSBlbHNlIHsKKyNpZiBFTkFCTEUoSkFW QVNDUklQVF9ERUJVR0dFUikKICAgICAgICAgc3RvcERlYnVnZ2luZygpOworI2VuZGlmCiAgICAg ICAgIHJlc2V0U2NyaXB0T2JqZWN0cygpOwogICAgIH0KIApAQCAtMTMyMiw2ICsxMzM3LDcgQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3aW5kb3dTY3JpcHRPYgogICAgICAgICB7ICJ3aW5k b3dVbmxvYWRpbmciLCBXZWJDb3JlOjp1bmxvYWRpbmcsIGtKU1Byb3BlcnR5QXR0cmlidXRlTm9u ZSB9LAogICAgICAgICB7ICJhdHRhY2giLCBXZWJDb3JlOjphdHRhY2gsIGtKU1Byb3BlcnR5QXR0 cmlidXRlTm9uZSB9LAogICAgICAgICB7ICJkZXRhY2giLCBXZWJDb3JlOjpkZXRhY2gsIGtKU1By b3BlcnR5QXR0cmlidXRlTm9uZSB9LAorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQog ICAgICAgICB7ICJzdGFydERlYnVnZ2luZyIsIFdlYkNvcmU6OnN0YXJ0RGVidWdnaW5nLCBrSlNQ cm9wZXJ0eUF0dHJpYnV0ZU5vbmUgfSwKICAgICAgICAgeyAic3RvcERlYnVnZ2luZyIsIFdlYkNv cmU6OnN0b3BEZWJ1Z2dpbmcsIGtKU1Byb3BlcnR5QXR0cmlidXRlTm9uZSB9LAogICAgICAgICB7 ICJwYXVzZUluRGVidWdnZXIiLCBXZWJDb3JlOjpwYXVzZUluRGVidWdnZXIsIGtKU1Byb3BlcnR5 QXR0cmlidXRlTm9uZSB9LApAQCAtMTMyOSw2ICsxMzQ1LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250 cm9sbGVyOjp3aW5kb3dTY3JpcHRPYgogICAgICAgICB7ICJzdGVwT3ZlclN0YXRlbWVudEluRGVi dWdnZXIiLCBXZWJDb3JlOjpzdGVwT3ZlclN0YXRlbWVudEluRGVidWdnZXIsIGtKU1Byb3BlcnR5 QXR0cmlidXRlTm9uZSB9LAogICAgICAgICB7ICJzdGVwSW50b1N0YXRlbWVudEluRGVidWdnZXIi LCBXZWJDb3JlOjpzdGVwSW50b1N0YXRlbWVudEluRGVidWdnZXIsIGtKU1Byb3BlcnR5QXR0cmli dXRlTm9uZSB9LAogICAgICAgICB7ICJzdGVwT3V0T2ZGdW5jdGlvbkluRGVidWdnZXIiLCBXZWJD b3JlOjpzdGVwT3V0T2ZGdW5jdGlvbkluRGVidWdnZXIsIGtKU1Byb3BlcnR5QXR0cmlidXRlTm9u ZSB9LAorI2VuZGlmCiAgICAgICAgIHsgImNsb3NlV2luZG93IiwgV2ViQ29yZTo6Y2xvc2VXaW5k b3csIGtKU1Byb3BlcnR5QXR0cmlidXRlTm9uZSB9LAogICAgICAgICB7ICJjbGVhck1lc3NhZ2Vz IiwgV2ViQ29yZTo6Y2xlYXJNZXNzYWdlcywga0pTUHJvcGVydHlBdHRyaWJ1dGVOb25lIH0sCiAg ICAgICAgIHsgInN0YXJ0UHJvZmlsaW5nIiwgV2ViQ29yZTo6c3RhcnRQcm9maWxpbmcsIGtKU1By b3BlcnR5QXR0cmlidXRlTm9uZSB9LApAQCAtMTMzNiw4ICsxMzUzLDEwIEBAIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6d2luZG93U2NyaXB0T2IKICAgICAgICAgeyAidG9nZ2xlTm9kZVNlYXJj aCIsIFdlYkNvcmU6OnRvZ2dsZU5vZGVTZWFyY2gsIGtKU1Byb3BlcnR5QXR0cmlidXRlTm9uZSB9 LAogCiAgICAgICAgIC8vIEJPT0xfSU5TUEVDVE9SX0NBTExCQUNLCisjaWYgRU5BQkxFKEpBVkFT Q1JJUFRfREVCVUdHRVIpCiAgICAgICAgIHsgImRlYnVnZ2VyQXR0YWNoZWQiLCBXZWJDb3JlOjpk ZWJ1Z2dlckF0dGFjaGVkLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZU5vbmUgfSwKICAgICAgICAgeyAi cGF1c2VPbkV4Y2VwdGlvbnMiLCBXZWJDb3JlOjpwYXVzZU9uRXhjZXB0aW9ucywga0pTUHJvcGVy dHlBdHRyaWJ1dGVOb25lIH0sCisjZW5kaWYKICAgICAgICAgeyAiaXNXaW5kb3dWaXNpYmxlIiwg V2ViQ29yZTo6aXNXaW5kb3dWaXNpYmxlLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZU5vbmUgfSwKICAg ICAgICAgeyAic2VhcmNoaW5nRm9yTm9kZSIsIFdlYkNvcmU6OnNlYXJjaGluZ0Zvck5vZGUsIGtK U1Byb3BlcnR5QXR0cmlidXRlTm9uZSB9LAogCkBAIC0xMzU2LDEwICsxMzc1LDEyIEBAIHZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6d2luZG93U2NyaXB0T2IKICAgICAgICAgeyAibW92ZUJ5VW5y ZXN0cmljdGVkIiwgV2ViQ29yZTo6bW92ZUJ5VW5yZXN0cmljdGVkLCBrSlNQcm9wZXJ0eUF0dHJp YnV0ZU5vbmUgfSwKICAgICAgICAgeyAic2V0QXR0YWNoZWRXaW5kb3dIZWlnaHQiLCBXZWJDb3Jl OjpzZXRBdHRhY2hlZFdpbmRvd0hlaWdodCwga0pTUHJvcGVydHlBdHRyaWJ1dGVOb25lIH0sCiAg ICAgICAgIHsgIndyYXBDYWxsYmFjayIsIFdlYkNvcmU6OndyYXBDYWxsYmFjaywga0pTUHJvcGVy dHlBdHRyaWJ1dGVOb25lIH0sCisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAg ICAgIHsgImN1cnJlbnRDYWxsRnJhbWUiLCBXZWJDb3JlOjpjdXJyZW50Q2FsbEZyYW1lLCBrSlNQ cm9wZXJ0eUF0dHJpYnV0ZU5vbmUgfSwKICAgICAgICAgeyAic2V0UGF1c2VPbkV4Y2VwdGlvbnMi LCBXZWJDb3JlOjpzZXRQYXVzZU9uRXhjZXB0aW9ucywga0pTUHJvcGVydHlBdHRyaWJ1dGVOb25l IH0sCiAgICAgICAgIHsgImFkZEJyZWFrcG9pbnQiLCBXZWJDb3JlOjphZGRCcmVha3BvaW50LCBr SlNQcm9wZXJ0eUF0dHJpYnV0ZU5vbmUgfSwKICAgICAgICAgeyAicmVtb3ZlQnJlYWtwb2ludCIs IFdlYkNvcmU6OnJlbW92ZUJyZWFrcG9pbnQsIGtKU1Byb3BlcnR5QXR0cmlidXRlTm9uZSB9LAor I2VuZGlmCiAgICAgICAgIHsgInByb2ZpbGVzIiwgV2ViQ29yZTo6cHJvZmlsZXMsIGtKU1Byb3Bl cnR5QXR0cmlidXRlTm9uZSB9LAogICAgICAgICB7IDAsIDAsIDAgfQogICAgIH07CkBAIC0xNDc3 LDcgKzE0OTgsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmNsb3NlKCkKICAgICAgICAg cmV0dXJuOwogCiAgICAgc3RvcFVzZXJJbml0aWF0ZWRQcm9maWxpbmcoKTsKKyNpZiBFTkFCTEUo SkFWQVNDUklQVF9ERUJVR0dFUikKICAgICBzdG9wRGVidWdnaW5nKCk7CisjZW5kaWYKICAgICBj bG9zZVdpbmRvdygpOwogCiAgICAgaWYgKG1fc2NyaXB0Q29udGV4dCAmJiBtX3NjcmlwdE9iamVj dCkKQEAgLTIzMTMsNiArMjMzNiw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6bW92ZVdp bmRvd0J5KGYKICAgICBtX3BhZ2UtPmNocm9tZSgpLT5zZXRXaW5kb3dSZWN0KGZyYW1lUmVjdCk7 CiB9CiAKKyNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKIHZvaWQgSW5zcGVjdG9yQ29u dHJvbGxlcjo6c3RhcnREZWJ1Z2dpbmcoKQogewogICAgIGlmICghZW5hYmxlZCgpKQpAQCAtMjQw Nyw2ICsyNDMxLDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZW1vdmVCcmVha3BvaQog ewogICAgIEphdmFTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkucmVtb3ZlQnJlYWtwb2ludChz b3VyY2VJRCwgbGluZU51bWJlcik7CiB9CisjZW5kaWYKIAogc3RhdGljIHZvaWQgZHJhd091dGxp bmVkUmVjdChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QsIGNv bnN0IENvbG9yJiBmaWxsQ29sb3IpCiB7CkBAIC0yNTc0LDYgKzI1OTksNyBAQCBib29sIEluc3Bl Y3RvckNvbnRyb2xsZXI6OmhhbmRsZUV4Y2VwdGlvCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKKyNp ZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKIC8vIEphdmFTY3JpcHREZWJ1Z0xpc3RlbmVy IGZ1bmN0aW9ucwogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFBhcnNlU291cmNlKEV4 ZWNTdGF0ZSogZXhlYywgY29uc3QgU291cmNlQ29kZSYgc291cmNlKQpAQCAtMjYwNiw1ICsyNjMy LDYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRQYXVzZSgpCiAgICAgSlNWYWx1ZVJl ZiBleGNlcHRpb24gPSAwOwogICAgIGNhbGxGdW5jdGlvbihtX3NjcmlwdENvbnRleHQsIG1fc2Ny aXB0T2JqZWN0LCAicGF1c2VkU2NyaXB0IiwgMCwgMCwgZXhjZXB0aW9uKTsKIH0KKyNlbmRpZgog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5oCShyZXZpc2lvbiAzNzgxNSkKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksOSBAQAogI2lmbmRl ZiBJbnNwZWN0b3JDb250cm9sbGVyX2gKICNkZWZpbmUgSW5zcGVjdG9yQ29udHJvbGxlcl9oCiAK KyNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKICNpbmNsdWRlICJKYXZhU2NyaXB0RGVi dWdMaXN0ZW5lci5oIgorI2VuZGlmCiAKICNpbmNsdWRlICJDb25zb2xlLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKQEAgLTYzLDcgKzY1LDExIEBAIHN0cnVjdCBJbnNwZWN0b3JEYXRh YmFzZVJlc291cmNlOwogc3RydWN0IEluc3BlY3RvclJlc291cmNlOwogY2xhc3MgUmVzb3VyY2VS ZXF1ZXN0OwogCi1jbGFzcyBJbnNwZWN0b3JDb250cm9sbGVyIDogSmF2YVNjcmlwdERlYnVnTGlz dGVuZXIgeworY2xhc3MgSW5zcGVjdG9yQ29udHJvbGxlcgorI2lmIEVOQUJMRShKQVZBU0NSSVBU X0RFQlVHR0VSKQorICAgICAgICAgICAgICAgICAgICAgICAgICA6IEphdmFTY3JpcHREZWJ1Z0xp c3RlbmVyCisjZW5kaWYKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB7CiBwdWJsaWM6CiAgICAgdHlwZWRlZiBIYXNoTWFwPGxvbmcgbG9uZywgUmVm UHRyPEluc3BlY3RvclJlc291cmNlPiA+IFJlc291cmNlc01hcDsKICAgICB0eXBlZGVmIEhhc2hN YXA8UmVmUHRyPEZyYW1lPiwgUmVzb3VyY2VzTWFwKj4gRnJhbWVSZXNvdXJjZXNNYXA7CkBAIC0x NjAsNiArMTY2LDcgQEAgcHVibGljOgogICAgIHZvaWQgbW92ZVdpbmRvd0J5KGZsb2F0IHgsIGZs b2F0IHkpIGNvbnN0OwogICAgIHZvaWQgY2xvc2VXaW5kb3coKTsKIAorI2lmIEVOQUJMRShKQVZB U0NSSVBUX0RFQlVHR0VSKQogICAgIHZvaWQgc3RhcnREZWJ1Z2dpbmcoKTsKICAgICB2b2lkIHN0 b3BEZWJ1Z2dpbmcoKTsKICAgICBib29sIGRlYnVnZ2VyQXR0YWNoZWQoKSBjb25zdCB7IHJldHVy biBtX2RlYnVnZ2VyQXR0YWNoZWQ7IH0KQEAgLTE3OCw2ICsxODUsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBzdGVwT3ZlclN0YXRlbWVudEluRGVidWdnZXIoKTsKICAgICB2b2lkIHN0ZXBJbnRvU3Rh dGVtZW50SW5EZWJ1Z2dlcigpOwogICAgIHZvaWQgc3RlcE91dE9mRnVuY3Rpb25JbkRlYnVnZ2Vy KCk7CisjZW5kaWYKIAogICAgIHZvaWQgZHJhd05vZGVIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0 JikgY29uc3Q7CiAgICAgCkBAIC0yMjQsOSArMjMyLDExIEBAIHByaXZhdGU6CiAKICAgICB2b2lk IHNob3dXaW5kb3coKTsKIAorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQogICAgIHZp cnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShKU0M6OkV4ZWNTdGF0ZSosIGNvbnN0IEpTQzo6U291 cmNlQ29kZSYpOwogICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291cmNlKEpTQzo6RXhl Y1N0YXRlKiwgY29uc3QgSlNDOjpTb3VyY2VDb2RlJiwgaW50IGVycm9yTGluZSwgY29uc3QgSlND OjpVU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRQYXVzZSgpOwor I2VuZGlmCiAKICAgICBQYWdlKiBtX2luc3BlY3RlZFBhZ2U7CiAgICAgSW5zcGVjdG9yQ2xpZW50 KiBtX2NsaWVudDsKQEAgLTI0Nyw4ICsyNTcsMTAgQEAgcHJpdmF0ZToKICAgICBKU09iamVjdFJl ZiBtX2NvbnRyb2xsZXJTY3JpcHRPYmplY3Q7CiAgICAgSlNDb250ZXh0UmVmIG1fc2NyaXB0Q29u dGV4dDsKICAgICBib29sIG1fd2luZG93VmlzaWJsZTsKKyNpZiBFTkFCTEUoSkFWQVNDUklQVF9E RUJVR0dFUikKICAgICBib29sIG1fZGVidWdnZXJBdHRhY2hlZDsKICAgICBib29sIG1fYXR0YWNo RGVidWdnZXJXaGVuU2hvd247CisjZW5kaWYKICAgICBib29sIG1fcmVjb3JkaW5nVXNlckluaXRp YXRlZFByb2ZpbGU7CiAgICAgU3BlY2lhbFBhbmVscyBtX3Nob3dBZnRlclZpc2libGU7CiAgICAg bG9uZyBsb25nIG1fbmV4dElkZW50aWZpZXI7CkluZGV4OiBXZWJDb3JlL3BhZ2UvUGFnZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCShyZXZpc2lvbiAzNzgxNSkKKysr IFdlYkNvcmUvcGFnZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNiBAQAog I2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkhpc3RvcnlJdGVtLmgiCiAjaW5jbHVk ZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgotI2luY2x1ZGUgIkphdmFTY3JpcHREZWJ1Z1NlcnZl ci5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJOZXR3b3JrU3RhdGVOb3RpZmll ci5oIgogI2luY2x1ZGUgIk5hdmlnYXRvci5oIgpAQCAtNjIsNiArNjEsMTAgQEAKICNpbmNsdWRl ICJTdG9yYWdlQXJlYS5oIgogI2VuZGlmCiAKKyNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dF UikKKyNpbmNsdWRlICJKYXZhU2NyaXB0RGVidWdTZXJ2ZXIuaCIKKyNlbmRpZgorCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBFdmVudE5hbWVzOwpAQCAtMTM1LDcgKzEz OCw5IEBAIFBhZ2U6OlBhZ2UoQ2hyb21lQ2xpZW50KiBjaHJvbWVDbGllbnQsIEMKICAgICBBU1NF UlQoIWFsbFBhZ2VzLT5jb250YWlucyh0aGlzKSk7CiAgICAgYWxsUGFnZXMtPmFkZCh0aGlzKTsK IAorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQogICAgIEphdmFTY3JpcHREZWJ1Z1Nl cnZlcjo6c2hhcmVkKCkucGFnZUNyZWF0ZWQodGhpcyk7CisjZW5kaWYKIAogI2lmbmRlZiBOREVC VUcKICAgICBwYWdlQ291bnRlci5pbmNyZW1lbnQoKTsK