30605 2009-10-20 16:05:45 -0700 Unsupported attribute set on QGraphicsWebView 2009-11-09 17:31:44 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 kenneth hausmann eric hausmann oldest_to_newest 156328 0 kenneth 2009-10-20 16:05:45 -0700 Using Qt 4.6 trunk and the QGraphicsWebView I get a lot of error output like: QGraphicsWidget::setAttribute: unsupported attribute 14 According to Qt docs, 14 is the Qt::WA_InputMethodEnabled which is indeed being set: WebKit/qt/Api/qgraphicswebview.cpp: q->setAttribute(Qt::WA_InputMethodEnabled, enable); This line doesn't seem to be doing what it is supposed to, so either it should be replaced or Qt should be fixed to make it work. 159721 1 hausmann 2009-11-01 19:58:38 -0800 Right, it's calling the wrong method, it should be calling QGraphicsItem::setItemFlag instead with ItemAcceptsInputMethod. I'm preparing a patch. 159745 2 42302 hausmann 2009-11-01 22:39:09 -0800 Created attachment 42302 [Qt] Fix enabling of input method support on QGraphicsWebView. 161334 3 42302 zecke 2009-11-07 01:11:44 -0800 Comment on attachment 42302 [Qt] Fix enabling of input method support on QGraphicsWebView. Looks good... I wonder if you want to call setGeometry on the QWebView too? 161847 4 42302 commit-queue 2009-11-09 17:16:32 -0800 Comment on attachment 42302 [Qt] Fix enabling of input method support on QGraphicsWebView. Rejecting patch 42302 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Holger Freyther', '--force']" exit_code: 1 patching file WebKit/qt/Api/qgraphicswebview.cpp Hunk #1 FAILED at 105. 1 out of 1 hunk FAILED -- saving rejects to file WebKit/qt/Api/qgraphicswebview.cpp.rej patching file WebKit/qt/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/qt/tests/qwebpage/tst_qwebpage.cpp Hunk #1 FAILED at 21. Hunk #2 FAILED at 123. Hunk #3 FAILED at 1266. Hunk #4 FAILED at 1346. Hunk #5 FAILED at 1395. 5 out of 5 hunks FAILED -- saving rejects to file WebKit/qt/tests/qwebpage/tst_qwebpage.cpp.rej 161857 5 eric 2009-11-09 17:31:44 -0800 Looks like this was landed as r50551 but just not closed. :( 42302 2009-11-01 22:39:09 -0800 2009-11-09 17:16:32 -0800 [Qt] Fix enabling of input method support on QGraphicsWebView. bug-30605-20091102073907.patch text/plain 9525 hausmann ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDUwYTA5ODYuLjg1MTU3MTUgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMTA1LDggKzEwNSw5IEBAIHZvaWQgUUdyYXBo aWNzV2ViVmlld1ByaXZhdGU6OnVwZGF0ZShjb25zdCBRUmVjdCAmIGRpcnR5UmVjdCkKIAogdm9p ZCBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6c2V0SW5wdXRNZXRob2RFbmFibGVkKGJvb2wgZW5h YmxlKQogewotICAgIHEtPnNldEF0dHJpYnV0ZShRdDo6V0FfSW5wdXRNZXRob2RFbmFibGVkLCBl bmFibGUpOworICAgIHEtPnNldEZsYWcoUUdyYXBoaWNzSXRlbTo6SXRlbUFjY2VwdHNJbnB1dE1l dGhvZCwgZW5hYmxlKTsKIH0KKwogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA2MDAKIHZvaWQgUUdy YXBoaWNzV2ViVmlld1ByaXZhdGU6OnNldElucHV0TWV0aG9kSGludChRdDo6SW5wdXRNZXRob2RI aW50IGhpbnQsIGJvb2wgZW5hYmxlKQogewpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxv ZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggODVmMWI4Yi4uMDNiOTdjNiAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjUgQEAKKzIwMDktMTEtMDEgIFNpbW9uIEhhdXNtYW5uICA8aGF1c21hbm5Ad2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IEZpeCBlbmFibGluZyBvZiBpbnB1dCBtZXRob2Qgc3VwcG9ydCBvbiBRR3JhcGhpY3NXZWJWaWV3 LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA2MDUK KworICAgICAgICBJbnN0ZWFkIG9mIHNldHRpbmcgdGhlIHVuc3VwcG9ydGVkIHdpZGdldCBhdHRy aWJ1dGUgb24gdGhlCisgICAgICAgIFFHcmFwaGljc1dpZGdldCBpbiBzZXRJbnB1dE1ldGhvZEVu YWJsZWQoKSBzZXQgdGhlIAorICAgICAgICBJdGVtQWNjZXB0c0lucHV0TWV0aG9kIEdyYXBoaWNz SXRlbSBmbGFnIGRpcmVjdGx5LgorCisgICAgICAgIENoYW5nZWQgdGhlIGV4aXN0aW5nIGlucHV0 IG1ldGhvZCBhdXRvIHRlc3QgdG8gcnVuIG9uY2UKKyAgICAgICAgb24gYSBRV2ViVmlldyBhbmQg b25jZSBvbiBhIFFHcmFwaGljc1dlYlZpZXcuCisKKyAgICAgICAgKiBBcGkvcWdyYXBoaWNzd2Vi dmlldy5jcHA6CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6c2V0SW5wdXRNZXRo b2RFbmFibGVkKToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgor ICAgICAgICAodHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHNfZGF0YSk6CisgICAgICAgIChpbnB1 dE1ldGhvZEhpbnRzKToKKyAgICAgICAgKGlucHV0TWV0aG9kRW5hYmxlZCk6CisgICAgICAgICh0 c3RfUVdlYlBhZ2U6OmlucHV0TWV0aG9kcyk6CisKIDIwMDktMTAtMzAgIEV2YW4gU3RhZGUgIDxl c3RhZGVAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpk aWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9X ZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCAwY2Y4NWVlLi43 Y2U5NTA2IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAt MjEsNiArMjEsOSBAQAogCiAjaW5jbHVkZSA8UXRUZXN0L1F0VGVzdD4KIAorI2luY2x1ZGUgPHFn cmFwaGljc3NjZW5lLmg+CisjaW5jbHVkZSA8cWdyYXBoaWNzdmlldy5oPgorI2luY2x1ZGUgPHFn cmFwaGljc3dlYnZpZXcuaD4KICNpbmNsdWRlIDxxd2ViZWxlbWVudC5oPgogI2luY2x1ZGUgPHF3 ZWJwYWdlLmg+CiAjaW5jbHVkZSA8cXdpZGdldC5oPgpAQCAtMTIwLDYgKzEyMyw3IEBAIHByaXZh dGUgc2xvdHM6CiAgICAgdm9pZCB0ZXN0T3B0aW9uYWxKU09iamVjdHMoKTsKICAgICB2b2lkIHRl c3RFbmFibGVQZXJzaXN0ZW50U3RvcmFnZSgpOwogICAgIHZvaWQgY29uc29sZU91dHB1dCgpOwor ICAgIHZvaWQgaW5wdXRNZXRob2RzX2RhdGEoKTsKICAgICB2b2lkIGlucHV0TWV0aG9kcygpOwog ICAgIHZvaWQgZGVmYXVsdFRleHRFbmNvZGluZygpOwogICAgIHZvaWQgZXJyb3JQYWdlRXh0ZW5z aW9uKCk7CkBAIC0xMjYyLDI4ICsxMjY2LDc4IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjpmcmFtZUF0 KCkKICAgICBmcmFtZUF0SGVscGVyKHdlYlBhZ2UsIHdlYlBhZ2UtPm1haW5GcmFtZSgpLCB3ZWJQ YWdlLT5tYWluRnJhbWUoKS0+cG9zKCkpOwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6aW5wdXRN ZXRob2RzX2RhdGEoKQoreworICAgIFFUZXN0OjphZGRDb2x1bW48UVN0cmluZz4oInZpZXdUeXBl Iik7CisgICAgUVRlc3Q6Om5ld1JvdygiUVdlYlZpZXciKSA8PCAiUVdlYlZpZXciOworICAgIFFU ZXN0OjpuZXdSb3coIlFHcmFwaGljc1dlYlZpZXciKSA8PCAiUUdyYXBoaWNzV2ViVmlldyI7Cit9 CisKK3N0YXRpYyBRdDo6SW5wdXRNZXRob2RIaW50cyBpbnB1dE1ldGhvZEhpbnRzKFFPYmplY3Qq IG9iamVjdCkKK3sKKyAgICBpZiAoUUdyYXBoaWNzT2JqZWN0KiBvID0gcW9iamVjdF9jYXN0PFFH cmFwaGljc09iamVjdCo+KG9iamVjdCkpCisgICAgICAgIHJldHVybiBvLT5pbnB1dE1ldGhvZEhp bnRzKCk7CisgICAgZWxzZSBpZiAoUVdpZGdldCogdyA9IHFvYmplY3RfY2FzdDxRV2lkZ2V0Kj4o b2JqZWN0KSkKKyAgICAgICAgcmV0dXJuIHctPmlucHV0TWV0aG9kSGludHMoKTsKKyAgICByZXR1 cm4gUXQ6OklucHV0TWV0aG9kSGludHMoKTsKK30KKworc3RhdGljIGJvb2wgaW5wdXRNZXRob2RF bmFibGVkKFFPYmplY3QqIG9iamVjdCkKK3sKKyAgICBpZiAoUUdyYXBoaWNzT2JqZWN0KiBvID0g cW9iamVjdF9jYXN0PFFHcmFwaGljc09iamVjdCo+KG9iamVjdCkpCisgICAgICAgIHJldHVybiBv LT5mbGFncygpICYgUUdyYXBoaWNzSXRlbTo6SXRlbUFjY2VwdHNJbnB1dE1ldGhvZDsKKyAgICBl bHNlIGlmIChRV2lkZ2V0KiB3ID0gcW9iamVjdF9jYXN0PFFXaWRnZXQqPihvYmplY3QpKQorICAg ICAgICByZXR1cm4gdy0+dGVzdEF0dHJpYnV0ZShRdDo6V0FfSW5wdXRNZXRob2RFbmFibGVkKTsK KyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgdHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMo KQogewotICAgIG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKS0+c2V0SHRtbCgiPGh0bWw+PGJv ZHk+IiBcCisgICAgUUZFVENIKFFTdHJpbmcsIHZpZXdUeXBlKTsKKyAgICBRV2ViUGFnZSogcGFn ZSA9IG5ldyBRV2ViUGFnZTsKKyAgICBRT2JqZWN0KiB2aWV3ID0gMDsKKyAgICBRT2JqZWN0KiBj b250YWluZXIgPSAwOworICAgIGlmICh2aWV3VHlwZSA9PSAiUVdlYlZpZXciKSB7CisgICAgICAg IFFXZWJWaWV3KiB3diA9IG5ldyBRV2ViVmlldzsKKyAgICAgICAgd3YtPnNldFBhZ2UocGFnZSk7 CisgICAgICAgIHZpZXcgPSB3djsKKyAgICAgICAgY29udGFpbmVyID0gdmlldzsKKyAgICB9IGVs c2UgaWYgKHZpZXdUeXBlID09ICJRR3JhcGhpY3NXZWJWaWV3IikgeworICAgICAgICBRR3JhcGhp Y3NXZWJWaWV3KiB3diA9IG5ldyBRR3JhcGhpY3NXZWJWaWV3OworICAgICAgICB3di0+c2V0UGFn ZShwYWdlKTsKKyAgICAgICAgdmlldyA9IHd2OworCisgICAgICAgIFFHcmFwaGljc1ZpZXcqIGd2 ID0gbmV3IFFHcmFwaGljc1ZpZXc7CisgICAgICAgIFFHcmFwaGljc1NjZW5lKiBzY2VuZSA9IG5l dyBRR3JhcGhpY3NTY2VuZShndik7CisgICAgICAgIGd2LT5zZXRTY2VuZShzY2VuZSk7CisgICAg ICAgIHNjZW5lLT5hZGRJdGVtKHd2KTsKKyAgICAgICAgd3YtPnNldEdlb21ldHJ5KFFSZWN0KDAs IDAsIDUwMCwgNTAwKSk7CisKKyAgICAgICAgY29udGFpbmVyID0gZ3Y7CisgICAgfSBlbHNlIHsK KyAgICAgICAgUVZFUklGWTIoZmFsc2UsICJVbmtub3duIHZpZXcgdHlwZSIpOworICAgIH0KKwor ICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5zZXRIdG1sKCI8aHRtbD48Ym9keT4iIFwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjxpbnB1dCB0eXBlPSd0ZXh0JyBp ZD0naW5wdXQxJyBzdHlsZT0nZm9udC1mYW1pbHk6IHNlcmlmJyB2YWx1ZT0nJyBtYXhsZW5ndGg9 JzIwJy8+PGJyPiIgXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiPGlucHV0IHR5cGU9J3Bhc3N3b3JkJy8+IiBcCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICI8L2JvZHk+PC9odG1sPiIpOwotICAgIG1fdmlldy0+cGFnZSgp LT5tYWluRnJhbWUoKS0+c2V0Rm9jdXMoKTsKKyAgICBwYWdlLT5tYWluRnJhbWUoKS0+c2V0Rm9j dXMoKTsKIAotICAgIFFXZWJFbGVtZW50Q29sbGVjdGlvbiBpbnB1dHMgPSBtX3ZpZXctPnBhZ2Uo KS0+bWFpbkZyYW1lKCktPmRvY3VtZW50RWxlbWVudCgpLmZpbmRBbGwoImlucHV0Iik7CisgICAg UVdlYkVsZW1lbnRDb2xsZWN0aW9uIGlucHV0cyA9IHBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVu dEVsZW1lbnQoKS5maW5kQWxsKCJpbnB1dCIpOwogCiAgICAgUU1vdXNlRXZlbnQgZXZwcmVzKFFF dmVudDo6TW91c2VCdXR0b25QcmVzcywgaW5wdXRzLmF0KDApLmdlb21ldHJ5KCkuY2VudGVyKCks IFF0OjpMZWZ0QnV0dG9uLCBRdDo6Tm9CdXR0b24sIFF0OjpOb01vZGlmaWVyKTsKLSAgICBtX3Zp ZXctPnBhZ2UoKS0+ZXZlbnQoJmV2cHJlcyk7CisgICAgcGFnZS0+ZXZlbnQoJmV2cHJlcyk7CiAg ICAgUU1vdXNlRXZlbnQgZXZyZWwoUUV2ZW50OjpNb3VzZUJ1dHRvblJlbGVhc2UsIGlucHV0cy5h dCgwKS5nZW9tZXRyeSgpLmNlbnRlcigpLCBRdDo6TGVmdEJ1dHRvbiwgUXQ6Ok5vQnV0dG9uLCBR dDo6Tm9Nb2RpZmllcik7Ci0gICAgbV92aWV3LT5wYWdlKCktPmV2ZW50KCZldnJlbCk7CisgICAg cGFnZS0+ZXZlbnQoJmV2cmVsKTsKIAogICAgIC8vSW1NaWNyb0ZvY3VzCi0gICAgUVZhcmlhbnQg dmFyaWFudCA9IG1fdmlldy0+cGFnZSgpLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9j dXMpOworICAgIFFWYXJpYW50IHZhcmlhbnQgPSBwYWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJ bU1pY3JvRm9jdXMpOwogICAgIFFSZWN0IGZvY3VzUmVjdCA9IHZhcmlhbnQudG9SZWN0KCk7CiAg ICAgUVZFUklGWShpbnB1dHMuYXQoMCkuZ2VvbWV0cnkoKS5jb250YWlucyh2YXJpYW50LnRvUmVj dCgpLnRvcExlZnQoKSkpOwogCiAgICAgLy9JbUZvbnQKLSAgICB2YXJpYW50ID0gbV92aWV3LT5w YWdlKCktPmlucHV0TWV0aG9kUXVlcnkoUXQ6OkltRm9udCk7CisgICAgdmFyaWFudCA9IHBhZ2Ut PmlucHV0TWV0aG9kUXVlcnkoUXQ6OkltRm9udCk7CiAgICAgUUZvbnQgZm9udCA9IHZhcmlhbnQu dmFsdWU8UUZvbnQ+KCk7CiAgICAgUUNPTVBBUkUoUVN0cmluZygiLXdlYmtpdC1zZXJpZiIpLCBm b250LmZhbWlseSgpKTsKIApAQCAtMTI5Miw0NSArMTM0Niw0NSBAQCB2b2lkIHRzdF9RV2ViUGFn ZTo6aW5wdXRNZXRob2RzKCkKICAgICAvL0luc2VydCB0ZXh0LgogICAgIHsKICAgICAgICAgUUlu cHV0TWV0aG9kRXZlbnQgZXZlbnRUZXh0KCJRdFdlYktpdCIsIGlucHV0QXR0cmlidXRlcyk7Ci0g ICAgICAgIFFTaWduYWxTcHkgc2lnbmFsU3B5KG1fdmlldy0+cGFnZSgpLCBTSUdOQUwobWljcm9G b2N1c0NoYW5nZWQoKSkpOwotICAgICAgICBtX3ZpZXctPnBhZ2UoKS0+ZXZlbnQoJmV2ZW50VGV4 dCk7CisgICAgICAgIFFTaWduYWxTcHkgc2lnbmFsU3B5KHBhZ2UsIFNJR05BTChtaWNyb0ZvY3Vz Q2hhbmdlZCgpKSk7CisgICAgICAgIHBhZ2UtPmV2ZW50KCZldmVudFRleHQpOwogICAgICAgICBR Q09NUEFSRShzaWduYWxTcHkuY291bnQoKSwgMCk7CiAgICAgfQogCiAgICAgewogICAgICAgICBR SW5wdXRNZXRob2RFdmVudCBldmVudFRleHQoIiIsIGlucHV0QXR0cmlidXRlcyk7CiAgICAgICAg IGV2ZW50VGV4dC5zZXRDb21taXRTdHJpbmcoUVN0cmluZygiUXRXZWJLaXQiKSwgMCwgMCk7Ci0g ICAgICAgIG1fdmlldy0+cGFnZSgpLT5ldmVudCgmZXZlbnRUZXh0KTsKKyAgICAgICAgcGFnZS0+ ZXZlbnQoJmV2ZW50VGV4dCk7CiAgICAgfQogCiAjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAog ICAgIC8vSW1NYXhpbXVtVGV4dExlbmd0aAotICAgIHZhcmlhbnQgPSBtX3ZpZXctPnBhZ2UoKS0+ aW5wdXRNZXRob2RRdWVyeShRdDo6SW1NYXhpbXVtVGV4dExlbmd0aCk7CisgICAgdmFyaWFudCA9 IHBhZ2UtPmlucHV0TWV0aG9kUXVlcnkoUXQ6OkltTWF4aW11bVRleHRMZW5ndGgpOwogICAgIFFD T01QQVJFKDIwLCB2YXJpYW50LnRvSW50KCkpOwogCiAgICAgLy9TZXQgc2VsZWN0aW9uCiAgICAg aW5wdXRBdHRyaWJ1dGVzIDw8IFFJbnB1dE1ldGhvZEV2ZW50OjpBdHRyaWJ1dGUoUUlucHV0TWV0 aG9kRXZlbnQ6OlNlbGVjdGlvbiwgMywgMiwgUVZhcmlhbnQoKSk7CiAgICAgUUlucHV0TWV0aG9k RXZlbnQgZXZlbnRTZWxlY3Rpb24oIiIsaW5wdXRBdHRyaWJ1dGVzKTsKLSAgICBtX3ZpZXctPnBh Z2UoKS0+ZXZlbnQoJmV2ZW50U2VsZWN0aW9uKTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRTZWxl Y3Rpb24pOwogCiAgICAgLy9JbUFuY2hvclBvc2l0aW9uCi0gICAgdmFyaWFudCA9IG1fdmlldy0+ cGFnZSgpLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbUFuY2hvclBvc2l0aW9uKTsKKyAgICB2YXJp YW50ID0gcGFnZS0+aW5wdXRNZXRob2RRdWVyeShRdDo6SW1BbmNob3JQb3NpdGlvbik7CiAgICAg aW50IGFuY2hvclBvc2l0aW9uID0gIHZhcmlhbnQudG9JbnQoKTsKICAgICBRQ09NUEFSRShhbmNo b3JQb3NpdGlvbiwgMyk7CiAKICAgICAvL0ltQ3Vyc29yUG9zaXRpb24KLSAgICB2YXJpYW50ID0g bV92aWV3LT5wYWdlKCktPmlucHV0TWV0aG9kUXVlcnkoUXQ6OkltQ3Vyc29yUG9zaXRpb24pOwor ICAgIHZhcmlhbnQgPSBwYWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbUN1cnNvclBvc2l0aW9u KTsKICAgICBpbnQgY3Vyc29yUG9zaXRpb24gPSAgdmFyaWFudC50b0ludCgpOwogICAgIFFDT01Q QVJFKGN1cnNvclBvc2l0aW9uLCA1KTsKIAogICAgIC8vSW1DdXJyZW50U2VsZWN0aW9uCi0gICAg dmFyaWFudCA9IG1fdmlldy0+cGFnZSgpLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbUN1cnJlbnRT ZWxlY3Rpb24pOworICAgIHZhcmlhbnQgPSBwYWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbUN1 cnJlbnRTZWxlY3Rpb24pOwogICAgIFFTdHJpbmcgc2VsZWN0aW9uVmFsdWUgPSB2YXJpYW50LnZh bHVlPFFTdHJpbmc+KCk7CiAgICAgUUNPTVBBUkUoc2VsZWN0aW9uVmFsdWUsIFFTdHJpbmcoImVi IikpOwogI2VuZGlmCiAKICAgICAvL0ltU3Vycm91bmRpbmdUZXh0Ci0gICAgdmFyaWFudCA9IG1f dmlldy0+cGFnZSgpLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbVN1cnJvdW5kaW5nVGV4dCk7Cisg ICAgdmFyaWFudCA9IHBhZ2UtPmlucHV0TWV0aG9kUXVlcnkoUXQ6OkltU3Vycm91bmRpbmdUZXh0 KTsKICAgICBRU3RyaW5nIHZhbHVlID0gdmFyaWFudC52YWx1ZTxRU3RyaW5nPigpOwogICAgIFFD T01QQVJFKHZhbHVlLCBRU3RyaW5nKCJRdFdlYktpdCIpKTsKIApAQCAtMTM0MSwyOSArMTM5NSwz MSBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6aW5wdXRNZXRob2RzKCkKICAgICAgICAgUUlucHV0TWV0 aG9kRXZlbnQ6OkF0dHJpYnV0ZSBuZXdTZWxlY3Rpb24oUUlucHV0TWV0aG9kRXZlbnQ6OlNlbGVj dGlvbiwgMCwgMCwgUVZhcmlhbnQoKSk7CiAgICAgICAgIGF0dHJpYnV0ZXMuYXBwZW5kKG5ld1Nl bGVjdGlvbik7CiAgICAgICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50KCJjb21wb3NpdGlvbiIs IGF0dHJpYnV0ZXMpOwotICAgICAgICBtX3ZpZXctPnBhZ2UoKS0+ZXZlbnQoJmV2ZW50KTsKKyAg ICAgICAgcGFnZS0+ZXZlbnQoJmV2ZW50KTsKICAgICB9CiAKICAgICAvLyBBIG9uZ29pbmcgY29t cG9zaXRpb24gc2hvdWxkIG5vdCBjaGFuZ2UgdGhlIHN1cnJvdW5kaW5nIHRleHQgYmVmb3JlIGl0 IGlzIGNvbW1pdHRlZC4KLSAgICB2YXJpYW50ID0gbV92aWV3LT5wYWdlKCktPmlucHV0TWV0aG9k UXVlcnkoUXQ6OkltU3Vycm91bmRpbmdUZXh0KTsKKyAgICB2YXJpYW50ID0gcGFnZS0+aW5wdXRN ZXRob2RRdWVyeShRdDo6SW1TdXJyb3VuZGluZ1RleHQpOwogICAgIHZhbHVlID0gdmFyaWFudC52 YWx1ZTxRU3RyaW5nPigpOwogICAgIFFDT01QQVJFKHZhbHVlLCBRU3RyaW5nKCJRdFdlYktpdCIp KTsKICNlbmRpZgogCiAgICAgLy9JbWhIaWRkZW5UZXh0CiAgICAgUU1vdXNlRXZlbnQgZXZwcmVz UGFzc3dvcmQoUUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzLCBpbnB1dHMuYXQoMSkuZ2VvbWV0cnko KS5jZW50ZXIoKSwgUXQ6OkxlZnRCdXR0b24sIFF0OjpOb0J1dHRvbiwgUXQ6Ok5vTW9kaWZpZXIp OwotICAgIG1fdmlldy0+cGFnZSgpLT5ldmVudCgmZXZwcmVzUGFzc3dvcmQpOworICAgIHBhZ2Ut PmV2ZW50KCZldnByZXNQYXNzd29yZCk7CiAgICAgUU1vdXNlRXZlbnQgZXZyZWxQYXNzd29yZChR RXZlbnQ6Ok1vdXNlQnV0dG9uUmVsZWFzZSwgaW5wdXRzLmF0KDEpLmdlb21ldHJ5KCkuY2VudGVy KCksIFF0OjpMZWZ0QnV0dG9uLCBRdDo6Tm9CdXR0b24sIFF0OjpOb01vZGlmaWVyKTsKLSAgICBt X3ZpZXctPnBhZ2UoKS0+ZXZlbnQoJmV2cmVsUGFzc3dvcmQpOworICAgIHBhZ2UtPmV2ZW50KCZl dnJlbFBhc3N3b3JkKTsKIAotICAgIFFWRVJJRlkobV92aWV3LT50ZXN0QXR0cmlidXRlKFF0OjpX QV9JbnB1dE1ldGhvZEVuYWJsZWQpKTsKKyAgICBRVkVSSUZZKGlucHV0TWV0aG9kRW5hYmxlZCh2 aWV3KSk7CiAjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAotICAgIFFWRVJJRlkobV92aWV3LT5p bnB1dE1ldGhvZEhpbnRzKCkgJiBRdDo6SW1oSGlkZGVuVGV4dCk7CisgICAgUVZFUklGWShpbnB1 dE1ldGhvZEhpbnRzKHZpZXcpICYgUXQ6OkltaEhpZGRlblRleHQpOwogCi0gICAgbV92aWV3LT5w YWdlKCktPmV2ZW50KCZldnByZXMpOwotICAgIG1fdmlldy0+cGFnZSgpLT5ldmVudCgmZXZyZWwp OwotICAgIFFWRVJJRlkoIShtX3ZpZXctPmlucHV0TWV0aG9kSGludHMoKSAmIFF0OjpJbWhIaWRk ZW5UZXh0KSk7CisgICAgcGFnZS0+ZXZlbnQoJmV2cHJlcyk7CisgICAgcGFnZS0+ZXZlbnQoJmV2 cmVsKTsKKyAgICBRVkVSSUZZKCEoaW5wdXRNZXRob2RIaW50cyh2aWV3KSAmIFF0OjpJbWhIaWRk ZW5UZXh0KSk7CiAjZW5kaWYKKworICAgIGRlbGV0ZSBjb250YWluZXI7CiB9CiAKIC8vIGltcG9y dCBhIGxpdHRsZSBEUlQgaGVscGVyIGZ1bmN0aW9uIHRvIHRyaWdnZXIgdGhlIGdhcmJhZ2UgY29s bGVjdG9y