41995 2010-07-09 14:52:09 -0700 [Qt] Enable binding of QObjects to JavaScript environment for inspector frontend 2010-08-24 07:11:55 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 jamey.hicks webkit-qt-unassigned commit-queue hausmann kling laszlo.gombos webkit.review.bot oldest_to_newest 249304 0 61104 jamey.hicks 2010-07-09 14:52:09 -0700 Created attachment 61104 patch to enable binding QObject to the javascript environment of a QWebInspector The attached patch enables QObjects to be bound to global variables in the javascript environment of the inspector frontend. This is useful for writing alternate inspector frontends in javascript which need additional native functionality. It's a lighter-weight alternative from using an NPAPI plugin. The code which instantiates QWebInspector uses this by setting the dynamic property "q_inspector_js_objects" on the QWebInspector. The value of this property should be a QMap<QString,QVariant>mapping global variable name to QObject. I have used this to add support for eclipse/chrome remote debugging in QtTestBrowser. 249523 1 61104 kling 2010-07-10 09:30:22 -0700 Comment on attachment 61104 patch to enable binding QObject to the javascript environment of a QWebInspector First off, every patch needs a ChangeLog entry. You can use WebKitTools/Scripts/prepare-ChangeLog to generate most of it. >WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:79 > + QVariant qvJsObjectMap = property("_q_inspector_js_objects"); Missing #ifndef QT_NO_PROPERTIES >WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:80 > + if (qvJsObjectMap.isValid()) { WebKit normally uses early-return style, so this would be: if (!qvJsObjectMap.isValid()) return; >WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:123 > + QVariant qvJsObjectMap = inspector->property("_q_inspector_js_objects"); One too many spaces in the indentation here. r- for missing QT_NO_PROPERTIES check. Change itself looks reasonable to me. 249797 2 61219 jamey.hicks 2010-07-12 06:23:06 -0700 Created attachment 61219 patch revised to address comments Patch revised to address comments. 251123 3 webkit.review.bot 2010-07-14 05:20:37 -0700 Attachment 61219 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/qt/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:10: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:11: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:13: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:14: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:15: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:16: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:18: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:20: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:21: Line contains tab character. [whitespace/tab] [5] Total errors found: 11 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 251127 4 61508 jamey.hicks 2010-07-14 05:36:22 -0700 Created attachment 61508 Patch 253150 5 61508 kenneth 2010-07-19 05:26:50 -0700 Comment on attachment 61508 Patch WebKit/qt/ChangeLog:14 + dynamic property "q_inspector_js_objects" on the That is not normally how we name our private dynamic properties, plus I find the name quite non-descriptive. I believe the others are prefixed with _qt_ or _qt_webkit_ - you will have to check. WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:81 + if (!qvJsObjectMap.isValid()) qvJsObjectMap - please come up with a more descriptive name WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:85 + for (QMap<QString, QVariant>::const_iterator it = jsObjectMap.constBegin(); it != jsObjectMap.constEnd(); ++it) { I would move QMap<QString, QVariant>::const_iterator it = jsObjectMap.constBegin() outside the look. 253679 6 62061 jamey.hicks 2010-07-20 06:05:53 -0700 Created attachment 62061 Patch 253898 7 62061 kenneth 2010-07-20 13:51:17 -0700 Comment on attachment 62061 Patch WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:126 + QVariant inspectorJavaScriptWindowObjects = inspector->property("_q_inspectorJavaScriptWindowObjects"); indentation error 253899 8 62061 kenneth 2010-07-20 13:51:47 -0700 Comment on attachment 62061 Patch WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:128 + inspectorPage->setProperty("_q_inspectorJavaScriptWindowObjects", inspectorJavaScriptWindowObjects); and here as well 254283 9 62180 jamey.hicks 2010-07-21 08:01:55 -0700 Created attachment 62180 Patch 254776 10 jamey.hicks 2010-07-22 07:30:17 -0700 We would like this included in QtWebKit 2.1 for use in on-device debugging and profiling. 254859 11 62180 commit-queue 2010-07-22 10:02:27 -0700 Comment on attachment 62180 Patch Clearing flags on attachment: 62180 Committed r63899: <http://trac.webkit.org/changeset/63899> 254860 12 commit-queue 2010-07-22 10:02:33 -0700 All reviewed patches have been landed. Closing bug. 258129 13 hausmann 2010-07-30 04:11:42 -0700 Revision r63899 cherry-picked into qtwebkit-2.1 with commit e4306d5c4e0a48a34152e7d2498feaf4654e2bf9 61104 2010-07-09 14:52:09 -0700 2010-07-12 06:23:06 -0700 patch to enable binding QObject to the javascript environment of a QWebInspector qt-inspector-js-objects.patch text/plain 2129 jamey.hicks ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5j cHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwCmluZGV4 IGZkZTA1NTYuLmE3NzNiNmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9J bnNwZWN0b3JDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3Bl Y3RvckNsaWVudFF0LmNwcApAQCAtNDQsNiArNDQsNyBAQAogI2luY2x1ZGUgInF3ZWJ2aWV3Lmgi CiAjaW5jbHVkZSA8UXRDb3JlL1FDb3JlQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UXRDb3JlL1FT ZXR0aW5ncz4KKyNpbmNsdWRlIDxRdENvcmUvUVZhcmlhbnQ+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIApAQCAtNjAsNiArNjEsNyBAQCBwdWJsaWM6CiAgICAgSW5zcGVjdG9yQ2xpZW50V2ViUGFn ZShRT2JqZWN0KiBwYXJlbnQgPSAwKQogICAgICAgICA6IFFXZWJQYWdlKHBhcmVudCkKICAgICB7 CisgICAgICAgIGNvbm5lY3QobWFpbkZyYW1lKCksIFNJR05BTChqYXZhU2NyaXB0V2luZG93T2Jq ZWN0Q2xlYXJlZCgpKSwgU0xPVChqYXZhU2NyaXB0V2luZG93T2JqZWN0Q2xlYXJlZCgpKSk7CiAg ICAgfQogCiAgICAgUVdlYlBhZ2UqIGNyZWF0ZVdpbmRvdyhRV2ViUGFnZTo6V2ViV2luZG93VHlw ZSkKQEAgLTcwLDYgKzcyLDIyIEBAIHB1YmxpYzoKICAgICAgICAgdmlldy0+c2V0QXR0cmlidXRl KFF0OjpXQV9EZWxldGVPbkNsb3NlKTsKICAgICAgICAgcmV0dXJuIHBhZ2U7CiAgICAgfQorCitw dWJsaWMgc2xvdHM6CisgICAgdm9pZCBqYXZhU2NyaXB0V2luZG93T2JqZWN0Q2xlYXJlZCgpIAor ICAgIHsKKyAgICAgICAgUVZhcmlhbnQgcXZKc09iamVjdE1hcCA9IHByb3BlcnR5KCJfcV9pbnNw ZWN0b3JfanNfb2JqZWN0cyIpOworICAgICAgICBpZiAocXZKc09iamVjdE1hcC5pc1ZhbGlkKCkp IHsKKyAgICAgICAgICAgIFFNYXA8UVN0cmluZywgUVZhcmlhbnQ+IGpzT2JqZWN0TWFwID0gcXZK c09iamVjdE1hcC50b01hcCgpOworICAgICAgICAgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1haW5G cmFtZSgpOworICAgICAgICAgICAgZm9yIChRTWFwPFFTdHJpbmcsIFFWYXJpYW50Pjo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBqc09iamVjdE1hcC5jb25zdEJlZ2luKCk7IGl0ICE9IGpzT2JqZWN0TWFw LmNvbnN0RW5kKCk7ICsraXQpIHsKKyAgICAgICAgICAgICAgICBRU3RyaW5nIG5hbWUgPSBpdC5r ZXkoKTsKKyAgICAgICAgICAgICAgICBRVmFyaWFudCB2YWx1ZSA9IGl0LnZhbHVlKCk7CisgICAg ICAgICAgICAgICAgUU9iamVjdCogb2JqID0gdmFsdWUudmFsdWU8UU9iamVjdCo+KCk7CisgICAg ICAgICAgICAgICAgZnJhbWUtPmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChuYW1lLCBvYmop OworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQogfTsKIAogSW5zcGVjdG9yQ2xpZW50 UXQ6Okluc3BlY3RvckNsaWVudFF0KFFXZWJQYWdlKiBwYWdlKQpAQCAtMTAwLDYgKzExOCwxMiBA QCB2b2lkIEluc3BlY3RvckNsaWVudFF0OjpvcGVuSW5zcGVjdG9yRnJvbnRlbmQoV2ViQ29yZTo6 SW5zcGVjdG9yQ29udHJvbGxlciopCiAjZW5kaWYKICAgICBpZiAoIWluc3BlY3RvclVybC5pc1Zh bGlkKCkpCiAgICAgICAgIGluc3BlY3RvclVybCA9IFFVcmwoInFyYzovd2Via2l0L2luc3BlY3Rv ci9pbnNwZWN0b3IuaHRtbCIpOworCisjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKKyAgICAgUVZh cmlhbnQgcXZKc09iamVjdE1hcCA9IGluc3BlY3Rvci0+cHJvcGVydHkoIl9xX2luc3BlY3Rvcl9q c19vYmplY3RzIik7CisgICAgaWYgKHF2SnNPYmplY3RNYXAuaXNWYWxpZCgpKQorICAgICAgICBp bnNwZWN0b3JQYWdlLT5zZXRQcm9wZXJ0eSgiX3FfaW5zcGVjdG9yX2pzX29iamVjdHMiLCBxdkpz T2JqZWN0TWFwKTsKKyNlbmRpZgogICAgIGluc3BlY3RvclZpZXctPnBhZ2UoKS0+bWFpbkZyYW1l KCktPmxvYWQoaW5zcGVjdG9yVXJsKTsKICAgICBtX2luc3BlY3RlZFdlYlBhZ2UtPmQtPmluc3Bl Y3RvckZyb250ZW5kID0gaW5zcGVjdG9yVmlldzsKICAgICBpbnNwZWN0b3ItPmQtPnNldEZyb250 ZW5kKGluc3BlY3RvclZpZXcpOwo= 61219 2010-07-12 06:23:06 -0700 2010-07-14 05:36:18 -0700 patch revised to address comments qt-inspector-qobjects.patch text/plain 3515 jamey.hicks ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGU2N2FiY2EuLjViMjVhMjQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEwLTA3LTEyICBKYW1l eSBIaWNrcyAgPGphbWV5LmhpY2tzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgYnJvd3NlciB0byBiaW5kIFF0IG9iamVj dHMgaW4gSW5zcGVjdG9yRnJvbnRlbmQgamF2YXNjcmlwdCBlbnZpcm9ubWVudAorCisgICAgICAg IFRoaXMgcGF0Y2ggZW5hYmxlcyBRT2JqZWN0cyB0byBiZSBib3VuZCB0byBnbG9iYWwgdmFyaWFi bGVzIGluIHRoZQorCWphdmFzY3JpcHQgZW52aXJvbm1lbnQgb2YgdGhlIGluc3BlY3RvciBmcm9u dGVuZC4gVGhpcyBpcyB1c2VmdWwKKwlmb3Igd3JpdGluZyBhbHRlcm5hdGUgaW5zcGVjdG9yIGZy b250ZW5kcyBpbiBqYXZhc2NyaXB0IHdoaWNoIG5lZWQKKwlhZGRpdGlvbmFsIG5hdGl2ZSBmdW5j dGlvbmFsaXR5LiBJdCdzIGEgbGlnaHRlci13ZWlnaHQgYWx0ZXJuYXRpdmUKKwlmcm9tIHVzaW5n IGFuIE5QQVBJIHBsdWdpbi4KKworCVRoZSBjb2RlIHdoaWNoIGluc3RhbnRpYXRlcyBRV2ViSW5z cGVjdG9yIHVzZXMgdGhpcyBieSBzZXR0aW5nIHRoZQorCWR5bmFtaWMgcHJvcGVydHkgInFfaW5z cGVjdG9yX2pzX29iamVjdHMiIG9uIHRoZQorCVFXZWJJbnNwZWN0b3IuIFRoZSB2YWx1ZSBvZiB0 aGlzIHByb3BlcnR5IHNob3VsZCBiZSBhCisJUU1hcDxRU3RyaW5nLFFWYXJpYW50Pm1hcHBpbmcg Z2xvYmFsIHZhcmlhYmxlIG5hbWUgdG8gUU9iamVjdC4KKworCUkgaGF2ZSB1c2VkIHRoaXMgdG8g YWRkIHN1cHBvcnQgZm9yIGVjbGlwc2UvY2hyb21lIHJlbW90ZSBkZWJ1Z2dpbmcgaW4gUXRUZXN0 QnJvd3Nlci4KKworCWh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTk5 NQorCQorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFdlYlBhZ2U6Okluc3BlY3RvckNsaWVudFdl YlBhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50V2ViUGFnZTo6amF2YVNj cmlwdFdpbmRvd09iamVjdENsZWFyZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xp ZW50UXQ6Om9wZW5JbnNwZWN0b3JGcm9udGVuZCk6CisKIDIwMTAtMDctMDkgIFlhZWwgQWhhcm9u ICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IExhc3psbyBH b21ib3MuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xp ZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNw cAppbmRleCAyY2M3ZTUwLi4zZThhNDZlIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9JbnNwZWN0b3JDbGllbnRRdC5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAKICNpbmNsdWRlICJxd2Vi dmlldy5oIgogI2luY2x1ZGUgPFF0Q29yZS9RQ29yZUFwcGxpY2F0aW9uPgogI2luY2x1ZGUgPFF0 Q29yZS9RU2V0dGluZ3M+CisjaW5jbHVkZSA8UXRDb3JlL1FWYXJpYW50PgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTYwLDYgKzYxLDcgQEAgcHVibGljOgogICAgIEluc3BlY3RvckNsaWVu dFdlYlBhZ2UoUU9iamVjdCogcGFyZW50ID0gMCkKICAgICAgICAgOiBRV2ViUGFnZShwYXJlbnQp CiAgICAgeworICAgICAgICBjb25uZWN0KG1haW5GcmFtZSgpLCBTSUdOQUwoamF2YVNjcmlwdFdp bmRvd09iamVjdENsZWFyZWQoKSksIFNMT1QoamF2YVNjcmlwdFdpbmRvd09iamVjdENsZWFyZWQo KSkpOwogICAgIH0KIAogICAgIFFXZWJQYWdlKiBjcmVhdGVXaW5kb3coUVdlYlBhZ2U6OldlYldp bmRvd1R5cGUpCkBAIC03MCw2ICs3MiwyNCBAQCBwdWJsaWM6CiAgICAgICAgIHZpZXctPnNldEF0 dHJpYnV0ZShRdDo6V0FfRGVsZXRlT25DbG9zZSk7CiAgICAgICAgIHJldHVybiBwYWdlOwogICAg IH0KKworcHVibGljIHNsb3RzOgorICAgIHZvaWQgamF2YVNjcmlwdFdpbmRvd09iamVjdENsZWFy ZWQoKSAKKyAgICB7CisjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKKyAgICAgICAgUVZhcmlhbnQg cXZKc09iamVjdE1hcCA9IHByb3BlcnR5KCJfcV9pbnNwZWN0b3JfanNfb2JqZWN0cyIpOworICAg ICAgICBpZiAoIXF2SnNPYmplY3RNYXAuaXNWYWxpZCgpKQorICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICBRTWFwPFFTdHJpbmcsIFFWYXJpYW50PiBqc09iamVjdE1hcCA9IHF2SnNPYmplY3RN YXAudG9NYXAoKTsKKyAgICAgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1haW5GcmFtZSgpOworICAg ICAgICBmb3IgKFFNYXA8UVN0cmluZywgUVZhcmlhbnQ+Ojpjb25zdF9pdGVyYXRvciBpdCA9IGpz T2JqZWN0TWFwLmNvbnN0QmVnaW4oKTsgaXQgIT0ganNPYmplY3RNYXAuY29uc3RFbmQoKTsgKytp dCkgeworICAgICAgICAgICAgUVN0cmluZyBuYW1lID0gaXQua2V5KCk7CisgICAgICAgICAgICBR VmFyaWFudCB2YWx1ZSA9IGl0LnZhbHVlKCk7CisgICAgICAgICAgICBRT2JqZWN0KiBvYmogPSB2 YWx1ZS52YWx1ZTxRT2JqZWN0Kj4oKTsKKyAgICAgICAgICAgIGZyYW1lLT5hZGRUb0phdmFTY3Jp cHRXaW5kb3dPYmplY3QobmFtZSwgb2JqKTsKKyAgICAgICAgfQorI2VuZGlmCisgICAgfQogfTsK IAogSW5zcGVjdG9yQ2xpZW50UXQ6Okluc3BlY3RvckNsaWVudFF0KFFXZWJQYWdlKiBwYWdlKQpA QCAtMTAwLDYgKzEyMCwxMiBAQCB2b2lkIEluc3BlY3RvckNsaWVudFF0OjpvcGVuSW5zcGVjdG9y RnJvbnRlbmQoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlciopCiAjZW5kaWYKICAgICBpZiAo IWluc3BlY3RvclVybC5pc1ZhbGlkKCkpCiAgICAgICAgIGluc3BlY3RvclVybCA9IFFVcmwoInFy Yzovd2Via2l0L2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbCIpOworCisjaWZuZGVmIFFUX05PX1BS T1BFUlRJRVMKKyAgICAgUVZhcmlhbnQgcXZKc09iamVjdE1hcCA9IGluc3BlY3Rvci0+cHJvcGVy dHkoIl9xX2luc3BlY3Rvcl9qc19vYmplY3RzIik7CisgICAgaWYgKHF2SnNPYmplY3RNYXAuaXNW YWxpZCgpKQorICAgICAgICBpbnNwZWN0b3JQYWdlLT5zZXRQcm9wZXJ0eSgiX3FfaW5zcGVjdG9y X2pzX29iamVjdHMiLCBxdkpzT2JqZWN0TWFwKTsKKyNlbmRpZgogICAgIGluc3BlY3RvclZpZXct PnBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQoaW5zcGVjdG9yVXJsKTsKICAgICBtX2luc3BlY3Rl ZFdlYlBhZ2UtPmQtPmluc3BlY3RvckZyb250ZW5kID0gaW5zcGVjdG9yVmlldzsKICAgICBpbnNw ZWN0b3ItPmQtPnNldEZyb250ZW5kKGluc3BlY3RvclZpZXcpOwo= 61508 2010-07-14 05:36:22 -0700 2010-07-20 06:05:48 -0700 Patch bug-41995-20100714083620.patch text/plain 3731 jamey.hicks ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IDE2MDI0MGYzMDgzZjY3ZDdhMGFiNGMwMjY4ZTFjOGMzYjg0ODUzYjIuLjE5NjBiOGU3NDll NjliY2RjMjU0M2RhNDYwYTlkNzc2MTY0NjY5YjcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEwLTA3 LTEyICBKYW1leSBIaWNrcyAgPGphbWV5LmhpY2tzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgYnJvd3NlciB0byBiaW5k IFF0IG9iamVjdHMgaW4gSW5zcGVjdG9yRnJvbnRlbmQgamF2YXNjcmlwdCBlbnZpcm9ubWVudAor CisgICAgICAgIFRoaXMgcGF0Y2ggZW5hYmxlcyBRT2JqZWN0cyB0byBiZSBib3VuZCB0byBnbG9i YWwgdmFyaWFibGVzIGluIHRoZQorICAgICAgICBqYXZhc2NyaXB0IGVudmlyb25tZW50IG9mIHRo ZSBpbnNwZWN0b3IgZnJvbnRlbmQuIFRoaXMgaXMgdXNlZnVsCisgICAgICAgIGZvciB3cml0aW5n IGFsdGVybmF0ZSBpbnNwZWN0b3IgZnJvbnRlbmRzIGluIGphdmFzY3JpcHQgd2hpY2ggbmVlZAor ICAgICAgICBhZGRpdGlvbmFsIG5hdGl2ZSBmdW5jdGlvbmFsaXR5LiBJdCdzIGEgbGlnaHRlci13 ZWlnaHQgYWx0ZXJuYXRpdmUKKyAgICAgICAgZnJvbSB1c2luZyBhbiBOUEFQSSBwbHVnaW4uCisK KyAgICAgICAgVGhlIGNvZGUgd2hpY2ggaW5zdGFudGlhdGVzIFFXZWJJbnNwZWN0b3IgdXNlcyB0 aGlzIGJ5IHNldHRpbmcgdGhlCisgICAgICAgIGR5bmFtaWMgcHJvcGVydHkgInFfaW5zcGVjdG9y X2pzX29iamVjdHMiIG9uIHRoZQorICAgICAgICBRV2ViSW5zcGVjdG9yLiBUaGUgdmFsdWUgb2Yg dGhpcyBwcm9wZXJ0eSBzaG91bGQgYmUgYQorICAgICAgICBRTWFwPFFTdHJpbmcsUVZhcmlhbnQ+ bWFwcGluZyBnbG9iYWwgdmFyaWFibGUgbmFtZSB0byBRT2JqZWN0LgorCisgICAgICAgIEkgaGF2 ZSB1c2VkIHRoaXMgdG8gYWRkIHN1cHBvcnQgZm9yIGVjbGlwc2UvY2hyb21lIHJlbW90ZSBkZWJ1 Z2dpbmcgaW4gUXRUZXN0QnJvd3Nlci4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDE5OTUKKyAgICAgICAgCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xp ZW50V2ViUGFnZTo6SW5zcGVjdG9yQ2xpZW50V2ViUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JDbGllbnRXZWJQYWdlOjpqYXZhU2NyaXB0V2luZG93T2JqZWN0Q2xlYXJlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6b3Blbkluc3BlY3RvckZyb250ZW5k KToKKwogMjAxMC0wNy0wNyAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwIGIvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcAppbmRleCAyY2M3ZTUwNWMyZGMz Njc2MzIzNDA0MTk2NDcyNTUwODdjNmFkZWU4Li4zZThhNDZlNzAzNTg0OWVjYzMxNWQyZTk4Yjkz NmQyZDYzNGY1YjU0IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVj dG9yQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JD bGllbnRRdC5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAKICNpbmNsdWRlICJxd2Vidmlldy5oIgogI2lu Y2x1ZGUgPFF0Q29yZS9RQ29yZUFwcGxpY2F0aW9uPgogI2luY2x1ZGUgPFF0Q29yZS9RU2V0dGlu Z3M+CisjaW5jbHVkZSA8UXRDb3JlL1FWYXJpYW50PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK QEAgLTYwLDYgKzYxLDcgQEAgcHVibGljOgogICAgIEluc3BlY3RvckNsaWVudFdlYlBhZ2UoUU9i amVjdCogcGFyZW50ID0gMCkKICAgICAgICAgOiBRV2ViUGFnZShwYXJlbnQpCiAgICAgeworICAg ICAgICBjb25uZWN0KG1haW5GcmFtZSgpLCBTSUdOQUwoamF2YVNjcmlwdFdpbmRvd09iamVjdENs ZWFyZWQoKSksIFNMT1QoamF2YVNjcmlwdFdpbmRvd09iamVjdENsZWFyZWQoKSkpOwogICAgIH0K IAogICAgIFFXZWJQYWdlKiBjcmVhdGVXaW5kb3coUVdlYlBhZ2U6OldlYldpbmRvd1R5cGUpCkBA IC03MCw2ICs3MiwyNCBAQCBwdWJsaWM6CiAgICAgICAgIHZpZXctPnNldEF0dHJpYnV0ZShRdDo6 V0FfRGVsZXRlT25DbG9zZSk7CiAgICAgICAgIHJldHVybiBwYWdlOwogICAgIH0KKworcHVibGlj IHNsb3RzOgorICAgIHZvaWQgamF2YVNjcmlwdFdpbmRvd09iamVjdENsZWFyZWQoKSAKKyAgICB7 CisjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKKyAgICAgICAgUVZhcmlhbnQgcXZKc09iamVjdE1h cCA9IHByb3BlcnR5KCJfcV9pbnNwZWN0b3JfanNfb2JqZWN0cyIpOworICAgICAgICBpZiAoIXF2 SnNPYmplY3RNYXAuaXNWYWxpZCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBRTWFw PFFTdHJpbmcsIFFWYXJpYW50PiBqc09iamVjdE1hcCA9IHF2SnNPYmplY3RNYXAudG9NYXAoKTsK KyAgICAgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1haW5GcmFtZSgpOworICAgICAgICBmb3IgKFFN YXA8UVN0cmluZywgUVZhcmlhbnQ+Ojpjb25zdF9pdGVyYXRvciBpdCA9IGpzT2JqZWN0TWFwLmNv bnN0QmVnaW4oKTsgaXQgIT0ganNPYmplY3RNYXAuY29uc3RFbmQoKTsgKytpdCkgeworICAgICAg ICAgICAgUVN0cmluZyBuYW1lID0gaXQua2V5KCk7CisgICAgICAgICAgICBRVmFyaWFudCB2YWx1 ZSA9IGl0LnZhbHVlKCk7CisgICAgICAgICAgICBRT2JqZWN0KiBvYmogPSB2YWx1ZS52YWx1ZTxR T2JqZWN0Kj4oKTsKKyAgICAgICAgICAgIGZyYW1lLT5hZGRUb0phdmFTY3JpcHRXaW5kb3dPYmpl Y3QobmFtZSwgb2JqKTsKKyAgICAgICAgfQorI2VuZGlmCisgICAgfQogfTsKIAogSW5zcGVjdG9y Q2xpZW50UXQ6Okluc3BlY3RvckNsaWVudFF0KFFXZWJQYWdlKiBwYWdlKQpAQCAtMTAwLDYgKzEy MCwxMiBAQCB2b2lkIEluc3BlY3RvckNsaWVudFF0OjpvcGVuSW5zcGVjdG9yRnJvbnRlbmQoV2Vi Q29yZTo6SW5zcGVjdG9yQ29udHJvbGxlciopCiAjZW5kaWYKICAgICBpZiAoIWluc3BlY3RvclVy bC5pc1ZhbGlkKCkpCiAgICAgICAgIGluc3BlY3RvclVybCA9IFFVcmwoInFyYzovd2Via2l0L2lu c3BlY3Rvci9pbnNwZWN0b3IuaHRtbCIpOworCisjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKKyAg ICAgUVZhcmlhbnQgcXZKc09iamVjdE1hcCA9IGluc3BlY3Rvci0+cHJvcGVydHkoIl9xX2luc3Bl Y3Rvcl9qc19vYmplY3RzIik7CisgICAgaWYgKHF2SnNPYmplY3RNYXAuaXNWYWxpZCgpKQorICAg ICAgICBpbnNwZWN0b3JQYWdlLT5zZXRQcm9wZXJ0eSgiX3FfaW5zcGVjdG9yX2pzX29iamVjdHMi LCBxdkpzT2JqZWN0TWFwKTsKKyNlbmRpZgogICAgIGluc3BlY3RvclZpZXctPnBhZ2UoKS0+bWFp bkZyYW1lKCktPmxvYWQoaW5zcGVjdG9yVXJsKTsKICAgICBtX2luc3BlY3RlZFdlYlBhZ2UtPmQt Pmluc3BlY3RvckZyb250ZW5kID0gaW5zcGVjdG9yVmlldzsKICAgICBpbnNwZWN0b3ItPmQtPnNl dEZyb250ZW5kKGluc3BlY3RvclZpZXcpOwo= 62061 2010-07-20 06:05:53 -0700 2010-07-21 08:01:51 -0700 Patch bug-41995-20100720090551.patch text/plain 3919 jamey.hicks ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGVkYzhmNTJhMjRkM2IyNjE3OTExZmMwZGY3NzA1Yjk4MTYzY2Y5MjguLmEyNDU4ZWE0Njk4 NzJkOTA5NTk5ZDcyM2E0NDM1ZjUzZDk3NjkwN2IgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEwLTA3 LTIwICBKYW1leSBIaWNrcyAgPGphbWV5LmhpY2tzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGVuYWJsZXMgUU9i amVjdHMgdG8gYmUgYm91bmQgdG8gZ2xvYmFsIHZhcmlhYmxlcyBpbiB0aGUKKyAgICAgICAgamF2 YXNjcmlwdCBlbnZpcm9ubWVudCBvZiB0aGUgaW5zcGVjdG9yIGZyb250ZW5kLiBUaGlzIGlzIHVz ZWZ1bAorICAgICAgICBmb3Igd3JpdGluZyBhbHRlcm5hdGUgaW5zcGVjdG9yIGZyb250ZW5kcyBp biBqYXZhc2NyaXB0IHdoaWNoIG5lZWQKKyAgICAgICAgYWRkaXRpb25hbCBuYXRpdmUgZnVuY3Rp b25hbGl0eS4gSXQncyBhIGxpZ2h0ZXItd2VpZ2h0IGFsdGVybmF0aXZlCisgICAgICAgIHRoYW4g dXNpbmcgYW4gTlBBUEkgcGx1Z2luLgorCisgICAgICAgIFRoZSBjb2RlIHdoaWNoIGluc3RhbnRp YXRlcyBRV2ViSW5zcGVjdG9yIHVzZXMgdGhpcyBieSBzZXR0aW5nIHRoZQorICAgICAgICBkeW5h bWljIHByb3BlcnR5ICJxX2luc3BlY3RvckphdmFTY3JpcHRXaW5kb3dPYmplY3RzIiBvbiB0aGUK KyAgICAgICAgUVdlYkluc3BlY3Rvci4gVGhlIHZhbHVlIG9mIHRoaXMgcHJvcGVydHkgc2hvdWxk IGJlIGEKKyAgICAgICAgUU1hcDxRU3RyaW5nLFFWYXJpYW50PiBtYXBwaW5nIGdsb2JhbCB2YXJp YWJsZSBuYW1lIHRvIFFPYmplY3QuCisKKyAgICAgICAgSSBoYXZlIHVzZWQgdGhpcyB0byBhZGQg c3VwcG9ydCBmb3IgZWNsaXBzZS9jaHJvbWUgcmVtb3RlIGRlYnVnZ2luZyBpbiBRdFRlc3RCcm93 c2VyLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MTk5NQorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50V2ViUGFnZTo6SW5zcGVjdG9yQ2xpZW50 V2ViUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRXZWJQYWdlOjpqYXZh U2NyaXB0V2luZG93T2JqZWN0Q2xlYXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JD bGllbnRRdDo6b3Blbkluc3BlY3RvckZyb250ZW5kKToKKwogMjAxMC0wNy0yMCAgS2VubmV0aCBS b2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVuYm9zc2Eub3JnPgog CiAgICAgICAgIFtRdF0gQWRkIEFQSSB0byBkZWZpbmUgZGV2aWNlLXdpZHRoIGFuZCBoZWlnaHQg Zm9yIHVzZSB3aXRoIHRoZSB2aWV3cG9ydCBtZXRhIHRhZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAKaW5kZXggMmNjN2U1MDVjMmRjMzY3NjMyMzQw NDE5NjQ3MjU1MDg3YzZhZGVlOC4uZWNhMWU0ZWU3NTI0YjhhMzJkZGQ4N2QxMGM4MjkwZDU1YjU3 YWYzZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQu Y3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAicXdlYnZpZXcuaCIKICNpbmNsdWRlIDxR dENvcmUvUUNvcmVBcHBsaWNhdGlvbj4KICNpbmNsdWRlIDxRdENvcmUvUVNldHRpbmdzPgorI2lu Y2x1ZGUgPFF0Q29yZS9RVmFyaWFudD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02MCw2 ICs2MSw3IEBAIHB1YmxpYzoKICAgICBJbnNwZWN0b3JDbGllbnRXZWJQYWdlKFFPYmplY3QqIHBh cmVudCA9IDApCiAgICAgICAgIDogUVdlYlBhZ2UocGFyZW50KQogICAgIHsKKyAgICAgICAgY29u bmVjdChtYWluRnJhbWUoKSwgU0lHTkFMKGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVhcmVkKCkp LCBTTE9UKGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVhcmVkKCkpKTsKICAgICB9CiAKICAgICBR V2ViUGFnZSogY3JlYXRlV2luZG93KFFXZWJQYWdlOjpXZWJXaW5kb3dUeXBlKQpAQCAtNzAsNiAr NzIsMjUgQEAgcHVibGljOgogICAgICAgICB2aWV3LT5zZXRBdHRyaWJ1dGUoUXQ6OldBX0RlbGV0 ZU9uQ2xvc2UpOwogICAgICAgICByZXR1cm4gcGFnZTsKICAgICB9CisKK3B1YmxpYyBzbG90czoK KyAgICB2b2lkIGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVhcmVkKCkgCisgICAgeworI2lmbmRl ZiBRVF9OT19QUk9QRVJUSUVTCisgICAgICAgIFFWYXJpYW50IGluc3BlY3RvckphdmFTY3JpcHRX aW5kb3dPYmplY3RzID0gcHJvcGVydHkoIl9xX2luc3BlY3RvckphdmFTY3JpcHRXaW5kb3dPYmpl Y3RzIik7CisgICAgICAgIGlmICghaW5zcGVjdG9ySmF2YVNjcmlwdFdpbmRvd09iamVjdHMuaXNW YWxpZCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBRTWFwPFFTdHJpbmcsIFFWYXJp YW50PiBqYXZhU2NyaXB0TmFtZU9iamVjdE1hcCA9IGluc3BlY3RvckphdmFTY3JpcHRXaW5kb3dP YmplY3RzLnRvTWFwKCk7CisgICAgICAgIFFXZWJGcmFtZSogZnJhbWUgPSBtYWluRnJhbWUoKTsK KyAgICAgICAgUU1hcDxRU3RyaW5nLCBRVmFyaWFudD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gamF2 YVNjcmlwdE5hbWVPYmplY3RNYXAuY29uc3RCZWdpbigpOworICAgICAgICBmb3IgKCA7IGl0ICE9 IGphdmFTY3JpcHROYW1lT2JqZWN0TWFwLmNvbnN0RW5kKCk7ICsraXQpIHsKKyAgICAgICAgICAg IFFTdHJpbmcgbmFtZSA9IGl0LmtleSgpOworICAgICAgICAgICAgUVZhcmlhbnQgdmFsdWUgPSBp dC52YWx1ZSgpOworICAgICAgICAgICAgUU9iamVjdCogb2JqID0gdmFsdWUudmFsdWU8UU9iamVj dCo+KCk7CisgICAgICAgICAgICBmcmFtZS0+YWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KG5h bWUsIG9iaik7CisgICAgICAgIH0KKyNlbmRpZgorICAgIH0KIH07CiAKIEluc3BlY3RvckNsaWVu dFF0OjpJbnNwZWN0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkKQEAgLTEwMCw2ICsxMjEsMTIg QEAgdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6b3Blbkluc3BlY3RvckZyb250ZW5kKFdlYkNvcmU6 Okluc3BlY3RvckNvbnRyb2xsZXIqKQogI2VuZGlmCiAgICAgaWYgKCFpbnNwZWN0b3JVcmwuaXNW YWxpZCgpKQogICAgICAgICBpbnNwZWN0b3JVcmwgPSBRVXJsKCJxcmM6L3dlYmtpdC9pbnNwZWN0 b3IvaW5zcGVjdG9yLmh0bWwiKTsKKworI2lmbmRlZiBRVF9OT19QUk9QRVJUSUVTCisgICAgIFFW YXJpYW50IGluc3BlY3RvckphdmFTY3JpcHRXaW5kb3dPYmplY3RzID0gaW5zcGVjdG9yLT5wcm9w ZXJ0eSgiX3FfaW5zcGVjdG9ySmF2YVNjcmlwdFdpbmRvd09iamVjdHMiKTsKKyAgICBpZiAoaW5z cGVjdG9ySmF2YVNjcmlwdFdpbmRvd09iamVjdHMuaXNWYWxpZCgpKQorICAgICAgaW5zcGVjdG9y UGFnZS0+c2V0UHJvcGVydHkoIl9xX2luc3BlY3RvckphdmFTY3JpcHRXaW5kb3dPYmplY3RzIiwg aW5zcGVjdG9ySmF2YVNjcmlwdFdpbmRvd09iamVjdHMpOworI2VuZGlmCiAgICAgaW5zcGVjdG9y Vmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKS0+bG9hZChpbnNwZWN0b3JVcmwpOwogICAgIG1faW5z cGVjdGVkV2ViUGFnZS0+ZC0+aW5zcGVjdG9yRnJvbnRlbmQgPSBpbnNwZWN0b3JWaWV3OwogICAg IGluc3BlY3Rvci0+ZC0+c2V0RnJvbnRlbmQoaW5zcGVjdG9yVmlldyk7Cg== 62180 2010-07-21 08:01:55 -0700 2010-07-22 10:02:27 -0700 Patch bug-41995-20100721110153.patch text/plain 4034 jamey.hicks ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGVkYzhmNTJhMjRkM2IyNjE3OTExZmMwZGY3NzA1Yjk4MTYzY2Y5MjguLjhiZmRhMjBlZWUy NzVmNzkwODNmNWUyYWQ1ZDEzZGU4NDI5MTIxMWMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEwLTA3 LTIxICBKYW1leSBIaWNrcyAgPGphbWV5LmhpY2tzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBbUXRdIEVuYWJs ZSBiaW5kaW5nIG9mIFFPYmplY3RzIHRvIEphdmFTY3JpcHQgZW52aXJvbm1lbnQgZm9yIGluc3Bl Y3RvciBmcm9udGVuZAorCisgICAgICAgIFRoaXMgcGF0Y2ggZW5hYmxlcyBRT2JqZWN0cyB0byBi ZSBib3VuZCB0byBnbG9iYWwgdmFyaWFibGVzIGluIHRoZQorICAgICAgICBqYXZhc2NyaXB0IGVu dmlyb25tZW50IG9mIHRoZSBpbnNwZWN0b3IgZnJvbnRlbmQuIFRoaXMgaXMgdXNlZnVsCisgICAg ICAgIGZvciB3cml0aW5nIGFsdGVybmF0ZSBpbnNwZWN0b3IgZnJvbnRlbmRzIGluIGphdmFzY3Jp cHQgd2hpY2ggbmVlZAorICAgICAgICBhZGRpdGlvbmFsIG5hdGl2ZSBmdW5jdGlvbmFsaXR5LiBJ dCdzIGEgbGlnaHRlci13ZWlnaHQgYWx0ZXJuYXRpdmUKKyAgICAgICAgdGhhbiB1c2luZyBhbiBO UEFQSSBwbHVnaW4uCisgCisgICAgICAgIFRoZSBjb2RlIHdoaWNoIGluc3RhbnRpYXRlcyBRV2Vi SW5zcGVjdG9yIHVzZXMgdGhpcyBieSBzZXR0aW5nIHRoZQorICAgICAgICBkeW5hbWljIHByb3Bl cnR5ICJxX2luc3BlY3RvckphdmFTY3JpcHRXaW5kb3dPYmplY3RzIiBvbiB0aGUKKyAgICAgICAg UVdlYkluc3BlY3Rvci4gVGhlIHZhbHVlIG9mIHRoaXMgcHJvcGVydHkgc2hvdWxkIGJlIGEKKyAg ICAgICAgUU1hcDxRU3RyaW5nLFFWYXJpYW50PiBtYXBwaW5nIGdsb2JhbCB2YXJpYWJsZSBuYW1l IHRvIFFPYmplY3QuCisKKyAgICAgICAgSSBoYXZlIHVzZWQgdGhpcyB0byBhZGQgc3VwcG9ydCBm b3IgZWNsaXBzZS9jaHJvbWUgcmVtb3RlCisgICAgICAgIGRlYnVnZ2luZyBpbiBRdFRlc3RCcm93 c2VyLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MTk5NQorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50V2ViUGFnZTo6SW5zcGVjdG9yQ2xpZW50 V2ViUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRXZWJQYWdlOjpqYXZh U2NyaXB0V2luZG93T2JqZWN0Q2xlYXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JD bGllbnRRdDo6b3Blbkluc3BlY3RvckZyb250ZW5kKToKKwogMjAxMC0wNy0yMCAgS2VubmV0aCBS b2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVuYm9zc2Eub3JnPgog CiAgICAgICAgIFtRdF0gQWRkIEFQSSB0byBkZWZpbmUgZGV2aWNlLXdpZHRoIGFuZCBoZWlnaHQg Zm9yIHVzZSB3aXRoIHRoZSB2aWV3cG9ydCBtZXRhIHRhZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAKaW5kZXggMmNjN2U1MDVjMmRjMzY3NjMyMzQw NDE5NjQ3MjU1MDg3YzZhZGVlOC4uZTEzZjZjMzcxODYxZDJiNzgxMWIzZWNhNTUyM2JjZjFjYWVm YTFmMCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQu Y3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAicXdlYnZpZXcuaCIKICNpbmNsdWRlIDxR dENvcmUvUUNvcmVBcHBsaWNhdGlvbj4KICNpbmNsdWRlIDxRdENvcmUvUVNldHRpbmdzPgorI2lu Y2x1ZGUgPFF0Q29yZS9RVmFyaWFudD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02MCw2 ICs2MSw3IEBAIHB1YmxpYzoKICAgICBJbnNwZWN0b3JDbGllbnRXZWJQYWdlKFFPYmplY3QqIHBh cmVudCA9IDApCiAgICAgICAgIDogUVdlYlBhZ2UocGFyZW50KQogICAgIHsKKyAgICAgICAgY29u bmVjdChtYWluRnJhbWUoKSwgU0lHTkFMKGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVhcmVkKCkp LCBTTE9UKGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVhcmVkKCkpKTsKICAgICB9CiAKICAgICBR V2ViUGFnZSogY3JlYXRlV2luZG93KFFXZWJQYWdlOjpXZWJXaW5kb3dUeXBlKQpAQCAtNzAsNiAr NzIsMjUgQEAgcHVibGljOgogICAgICAgICB2aWV3LT5zZXRBdHRyaWJ1dGUoUXQ6OldBX0RlbGV0 ZU9uQ2xvc2UpOwogICAgICAgICByZXR1cm4gcGFnZTsKICAgICB9CisKK3B1YmxpYyBzbG90czoK KyAgICB2b2lkIGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVhcmVkKCkgCisgICAgeworI2lmbmRl ZiBRVF9OT19QUk9QRVJUSUVTCisgICAgICAgIFFWYXJpYW50IGluc3BlY3RvckphdmFTY3JpcHRX aW5kb3dPYmplY3RzID0gcHJvcGVydHkoIl9xX2luc3BlY3RvckphdmFTY3JpcHRXaW5kb3dPYmpl Y3RzIik7CisgICAgICAgIGlmICghaW5zcGVjdG9ySmF2YVNjcmlwdFdpbmRvd09iamVjdHMuaXNW YWxpZCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBRTWFwPFFTdHJpbmcsIFFWYXJp YW50PiBqYXZhU2NyaXB0TmFtZU9iamVjdE1hcCA9IGluc3BlY3RvckphdmFTY3JpcHRXaW5kb3dP YmplY3RzLnRvTWFwKCk7CisgICAgICAgIFFXZWJGcmFtZSogZnJhbWUgPSBtYWluRnJhbWUoKTsK KyAgICAgICAgUU1hcDxRU3RyaW5nLCBRVmFyaWFudD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gamF2 YVNjcmlwdE5hbWVPYmplY3RNYXAuY29uc3RCZWdpbigpOworICAgICAgICBmb3IgKCA7IGl0ICE9 IGphdmFTY3JpcHROYW1lT2JqZWN0TWFwLmNvbnN0RW5kKCk7ICsraXQpIHsKKyAgICAgICAgICAg IFFTdHJpbmcgbmFtZSA9IGl0LmtleSgpOworICAgICAgICAgICAgUVZhcmlhbnQgdmFsdWUgPSBp dC52YWx1ZSgpOworICAgICAgICAgICAgUU9iamVjdCogb2JqID0gdmFsdWUudmFsdWU8UU9iamVj dCo+KCk7CisgICAgICAgICAgICBmcmFtZS0+YWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KG5h bWUsIG9iaik7CisgICAgICAgIH0KKyNlbmRpZgorICAgIH0KIH07CiAKIEluc3BlY3RvckNsaWVu dFF0OjpJbnNwZWN0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkKQEAgLTEwMCw2ICsxMjEsMTIg QEAgdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6b3Blbkluc3BlY3RvckZyb250ZW5kKFdlYkNvcmU6 Okluc3BlY3RvckNvbnRyb2xsZXIqKQogI2VuZGlmCiAgICAgaWYgKCFpbnNwZWN0b3JVcmwuaXNW YWxpZCgpKQogICAgICAgICBpbnNwZWN0b3JVcmwgPSBRVXJsKCJxcmM6L3dlYmtpdC9pbnNwZWN0 b3IvaW5zcGVjdG9yLmh0bWwiKTsKKworI2lmbmRlZiBRVF9OT19QUk9QRVJUSUVTCisgICAgUVZh cmlhbnQgaW5zcGVjdG9ySmF2YVNjcmlwdFdpbmRvd09iamVjdHMgPSBpbnNwZWN0b3ItPnByb3Bl cnR5KCJfcV9pbnNwZWN0b3JKYXZhU2NyaXB0V2luZG93T2JqZWN0cyIpOworICAgIGlmIChpbnNw ZWN0b3JKYXZhU2NyaXB0V2luZG93T2JqZWN0cy5pc1ZhbGlkKCkpCisgICAgICAgIGluc3BlY3Rv clBhZ2UtPnNldFByb3BlcnR5KCJfcV9pbnNwZWN0b3JKYXZhU2NyaXB0V2luZG93T2JqZWN0cyIs IGluc3BlY3RvckphdmFTY3JpcHRXaW5kb3dPYmplY3RzKTsKKyNlbmRpZgogICAgIGluc3BlY3Rv clZpZXctPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQoaW5zcGVjdG9yVXJsKTsKICAgICBtX2lu c3BlY3RlZFdlYlBhZ2UtPmQtPmluc3BlY3RvckZyb250ZW5kID0gaW5zcGVjdG9yVmlldzsKICAg ICBpbnNwZWN0b3ItPmQtPnNldEZyb250ZW5kKGluc3BlY3RvclZpZXcpOwo=