52152 2011-01-10 09:04:32 -0800 Chromium DevTools: get rid of APU-related code in WebKit/chromium 2011-01-11 04:32:22 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman eric jaimeyap jamesr yurys oldest_to_newest 331650 0 pfeldman 2011-01-10 09:04:32 -0800 APU should pretend to be an alternate devtools front-end. 331662 1 78405 pfeldman 2011-01-10 09:36:30 -0800 Created attachment 78405 [PATCH] Proposed change. 331768 2 jamesr 2011-01-10 11:37:17 -0800 Are the changes under WebCore/ meant to be part of this patch? 331803 3 pfeldman 2011-01-10 12:02:03 -0800 (In reply to comment #2) > Are the changes under WebCore/ meant to be part of this patch? Yes. This is a drive-by. Frontend reuse code went to WebCore (and now can be used both by Chromium port and WebKit2). It just became obvious that it belongs there while I was getting rid of APU. 332257 4 78405 yurys 2011-01-11 04:24:28 -0800 Comment on attachment 78405 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=78405&action=review > Source/WebCore/inspector/InspectorController.cpp:-503 > -void InspectorController::reuseFrontend() Please remove this from the header as well. > WebKit/chromium/src/WebDevToolsAgentImpl.cpp:-402 > - m_client->sendDispatchToAPU(message); sendDispatchToAPU should go away 332262 5 78405 pfeldman 2011-01-11 04:32:12 -0800 Comment on attachment 78405 [PATCH] Proposed change. Clearing flags on attachment: 78405 Committed r75486: <http://trac.webkit.org/changeset/75486> 332263 6 pfeldman 2011-01-11 04:32:22 -0800 All reviewed patches have been landed. Closing bug. 78405 2011-01-10 09:36:30 -0800 2011-01-11 04:32:12 -0800 [PATCH] Proposed change. no_apu text/plain 9658 pfeldman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmOWJhNDQ3Li5lMWZlOGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDEtMTAgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hyb21pdW0g RGV2VG9vbHM6IGdldCByaWQgb2YgQVBVLXJlbGF0ZWQgY29kZSBpbiBXZWJLaXQvY2hyb21pdW0u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjE1Mgor CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cmVzdG9yZUluc3BlY3RvclN0YXRlRnJvbUNv b2tpZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzZXRJbmplY3Rl ZFNjcmlwdFNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0YXRlOjpJbnNwZWN0b3JTdGF0ZSk6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanM6CisKIDIwMTEtMDEtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2Jp bnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcAppbmRleCA3MjQ4ZGM5Li41MjI1NzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0yMzAsMTIgKzIzMCwyMyBAQCB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OmdldEluc3BlY3RvclN0YXRlKFJlZlB0cjxJbnNwZWN0b3JP YmplY3Q+KiBzdGF0ZSkKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cmVzdG9yZUluc3BlY3Rv clN0YXRlRnJvbUNvb2tpZShjb25zdCBTdHJpbmcmIGluc3BlY3RvclN0YXRlQ29va2llKQogewog ICAgIG1fc3RhdGUtPnJlc3RvcmVGcm9tSW5zcGVjdG9yQ29va2llKGluc3BlY3RvclN0YXRlQ29v a2llKTsKKworICAgIFN0cmluZyBpbmplY3RlZFNjcmlwdFNvdXJjZSA9IG1fc3RhdGUtPmdldFN0 cmluZyhJbnNwZWN0b3JTdGF0ZTo6aW5qZWN0ZWRTY3JpcHRTb3VyY2UpOworICAgIGlmICghaW5q ZWN0ZWRTY3JpcHRTb3VyY2UuaXNFbXB0eSgpKQorICAgICAgICBpbmplY3RlZFNjcmlwdEhvc3Qo KS0+c2V0SW5qZWN0ZWRTY3JpcHRTb3VyY2UoaW5qZWN0ZWRTY3JpcHRTb3VyY2UpOworCisgICAg aWYgKCFtX2Zyb250ZW5kKQorICAgICAgICBjb25uZWN0RnJvbnRlbmQoKTsKKwogICAgIGlmICht X3N0YXRlLT5nZXRCb29sZWFuKEluc3BlY3RvclN0YXRlOjp0aW1lbGluZVByb2ZpbGVyRW5hYmxl ZCkpCiAgICAgICAgIHN0YXJ0VGltZWxpbmVQcm9maWxlcigpOworCiAjaWYgRU5BQkxFKEpBVkFT Q1JJUFRfREVCVUdHRVIpCisgICAgcmVzdG9yZURlYnVnZ2VyKCk7CisgICAgcmVzdG9yZVByb2Zp bGVyKFByb2ZpbGVyUmVzdG9yZVJlc2V0QWdlbnQpOwogICAgIGlmIChtX3N0YXRlLT5nZXRCb29s ZWFuKEluc3BlY3RvclN0YXRlOjp1c2VySW5pdGlhdGVkUHJvZmlsaW5nKSkKICAgICAgICAgc3Rh cnRVc2VySW5pdGlhdGVkUHJvZmlsaW5nKCk7Ci0jZW5kaWYgICAgCisjZW5kaWYKIH0KIAogdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjppbnNwZWN0KE5vZGUqIG5vZGUpCkBAIC01MDAsMTMgKzUx MSw2IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKCkKICAgICBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyb250ZW5kQ3JlYXRlZCgpOwogfQogCi12b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OnJldXNlRnJvbnRlbmQoKQotewotICAgIGNvbm5lY3RGcm9udGVu ZCgpOwotICAgIHJlc3RvcmVEZWJ1Z2dlcigpOwotICAgIHJlc3RvcmVQcm9maWxlcihQcm9maWxl clJlc3RvcmVSZXNldEFnZW50KTsKLX0KLQogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzaG93 KCkKIHsKICAgICBpZiAoIWVuYWJsZWQoKSkKQEAgLTE0MzAsNiArMTQzNCw3IEBAIGJvb2wgSW5z cGVjdG9yQ29udHJvbGxlcjo6aGFzWEhSQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIHVybCwgU3Ry aW5nKiBicmVha3BvaW50CiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnNldEluamVjdGVkU2Ny aXB0U291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlKQogewogICAgICBpbmplY3RlZFNjcmlwdEhv c3QoKS0+c2V0SW5qZWN0ZWRTY3JpcHRTb3VyY2Uoc291cmNlKTsKKyAgICAgbV9zdGF0ZS0+c2V0 U3RyaW5nKEluc3BlY3RvclN0YXRlOjppbmplY3RlZFNjcmlwdFNvdXJjZSwgc291cmNlKTsKIH0K IAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaXNwYXRjaE9uSW5qZWN0ZWRTY3JpcHQobG9u ZyBpbmplY3RlZFNjcmlwdElkLCBjb25zdCBTdHJpbmcmIG1ldGhvZE5hbWUsIGNvbnN0IFN0cmlu ZyYgYXJndW1lbnRzLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQsIGJvb2wqIGhhZEV4 Y2VwdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JT dGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuY3BwCmlu ZGV4IDA4NjU2NDguLjU5MWVlZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclN0YXRlLmNwcApAQCAtNTAsNiArNTAsNyBAQCBJbnNwZWN0b3JTdGF0ZTo6SW5zcGVjdG9y U3RhdGUoSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCiAgICAgcmVnaXN0ZXJCb29sZWFuKGNvbnNv bGVNZXNzYWdlc0VuYWJsZWQsIGZhbHNlLCAiY29uc29sZU1lc3NhZ2VzRW5hYmxlZCIsIFN0cmlu ZygpKTsKICAgICByZWdpc3RlckJvb2xlYW4odXNlckluaXRpYXRlZFByb2ZpbGluZywgZmFsc2Us ICJ1c2VySW5pdGlhdGVkUHJvZmlsaW5nIiwgU3RyaW5nKCkpOwogICAgIHJlZ2lzdGVyT2JqZWN0 KHN0aWNreUJyZWFrcG9pbnRzLCBTdHJpbmcoKSwgU3RyaW5nKCkpOworICAgIHJlZ2lzdGVyU3Ry aW5nKGluamVjdGVkU2NyaXB0U291cmNlLCBTdHJpbmcoKSwgU3RyaW5nKCksIFN0cmluZygpKTsK IH0KIAogdm9pZCBJbnNwZWN0b3JTdGF0ZTo6cmVzdG9yZUZyb21JbnNwZWN0b3JDb29raWUoY29u c3QgU3RyaW5nJiBqc29uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUu aAppbmRleCA0ZjU3ZGE3Li41NmFiNTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yU3RhdGUuaApAQCAtNTYsNiArNTYsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNvbnNvbGVN ZXNzYWdlc0VuYWJsZWQsCiAgICAgICAgIHVzZXJJbml0aWF0ZWRQcm9maWxpbmcsCiAgICAgICAg IHN0aWNreUJyZWFrcG9pbnRzLAorICAgICAgICBpbmplY3RlZFNjcmlwdFNvdXJjZSwKICAgICAg ICAgbGFzdFByb3BlcnR5SWQKICAgICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDMzYTc1ZDcuLmIxZjBjNzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC00OTMs NiArNDkzLDcgQEAgV2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0aW9uKCkKIFdlYkluc3BlY3Rv ci5kb0xvYWRlZERvbmUgPSBmdW5jdGlvbigpCiB7CiAgICAgSW5zcGVjdG9yQmFja2VuZC5zZXRJ bmplY3RlZFNjcmlwdFNvdXJjZSgiKCIgKyBpbmplY3RlZFNjcmlwdENvbnN0cnVjdG9yICsgIik7 Iik7CisgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmxvYWRlZCgpOwogCiAgICAgdmFyIHBsYXRm b3JtID0gV2ViSW5zcGVjdG9yLnBsYXRmb3JtOwogICAgIGRvY3VtZW50LmJvZHkuYWRkU3R5bGVD bGFzcygicGxhdGZvcm0tIiArIHBsYXRmb3JtKTsKQEAgLTUwMiw3ICs1MDMsNiBAQCBXZWJJbnNw ZWN0b3IuZG9Mb2FkZWREb25lID0gZnVuY3Rpb24oKQogICAgIHZhciBwb3J0ID0gV2ViSW5zcGVj dG9yLnBvcnQ7CiAgICAgZG9jdW1lbnQuYm9keS5hZGRTdHlsZUNsYXNzKCJwb3J0LSIgKyBwb3J0 KTsKIAotICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5sb2FkZWQoKTsKICAgICBXZWJJbnNwZWN0 b3Iuc2V0dGluZ3MgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmdzKCk7CiAKICAgICB0aGlzLl9y ZWdpc3RlclNob3J0Y3V0cygpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNDEwZGVkMy4uMDNmNWVhMiAxMDA2 NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDEtMTAgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hyb21pdW0gRGV2VG9vbHM6IGdldCByaWQgb2YgQVBVLXJlbGF0ZWQg Y29kZSBpbiBXZWJLaXQvY2hyb21pdW0uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MjE1MgorCisgICAgICAgICogc3JjL1dlYkRldlRvb2xzQWdlbnRJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6OldlYkRldlRv b2xzQWdlbnRJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6OmRl dGFjaCk6CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjpmcm9udGVuZExv YWRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjpzZXRSdW50aW1l UHJvcGVydHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29sc0FnZW50SW1wbDo6c2VuZE1l c3NhZ2VUb0Zyb250ZW5kKToKKyAgICAgICAgKiBzcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuaDoK KwogMjAxMS0wMS0wOSAgSm9obm55IERpbmcgIDxqbmRAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIGZpeCBDaHJvbWl1bSB3aW5kb3dzIGNvbXBpbGF0aW9uIGVycm9yIGFjY29y ZGluZyB0byBKYW1lcyBSb2JpbnNvbidzIHJlcG9ydC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKaW5kZXggOWY0Y2U4Ny4uZGJkNmRjYSAxMDA2NDQKLS0t IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKKysrIGIvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKQEAgLTgzLDcgKzgzLDYg QEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIG5hbWVzcGFjZSB7CiAKLXN0YXRpYyBjb25zdCBjaGFy IGtBcHVBZ2VudEZlYXR1cmVOYW1lW10gPSAiYXB1LWFnZW50IjsKIHN0YXRpYyBjb25zdCBjaGFy IGtGcm9udGVuZENvbm5lY3RlZEZlYXR1cmVOYW1lW10gPSAiZnJvbnRlbmQtY29ubmVjdGVkIjsK IHN0YXRpYyBjb25zdCBjaGFyIGtJbnNwZWN0b3JTdGF0ZUZlYXR1cmVOYW1lW10gPSAiaW5zcGVj dG9yLXN0YXRlIjsKIApAQCAtMTc5LDcgKzE3OCw2IEBAIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpX ZWJEZXZUb29sc0FnZW50SW1wbCgKICAgICA6IG1faG9zdElkKGNsaWVudC0+aG9zdElkZW50aWZp ZXIoKSkKICAgICAsIG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1fd2ViVmlld0ltcGwod2ViVmll d0ltcGwpCi0gICAgLCBtX2FwdUFnZW50RW5hYmxlZChmYWxzZSkKICAgICAsIG1fYXR0YWNoZWQo ZmFsc2UpCiB7CiAgICAgRGVidWdnZXJBZ2VudE1hbmFnZXI6OnNldEV4cG9zZVY4RGVidWdnZXJQ cm90b2NvbCgKQEAgLTIxNywxMiArMjE1LDExIEBAIHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6 OmRldGFjaCgpCiAgICAgaWMtPmNsb3NlKCk7CiAgICAgbV9kZWJ1Z2dlckFnZW50SW1wbC5zZXQo MCk7CiAgICAgbV9hdHRhY2hlZCA9IGZhbHNlOwotICAgIG1fYXB1QWdlbnRFbmFibGVkID0gZmFs c2U7CiB9CiAKIHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6OmZyb250ZW5kTG9hZGVkKCkKIHsK LSAgICBjb25uZWN0RnJvbnRlbmQoZmFsc2UpOworICAgIGluc3BlY3RvckNvbnRyb2xsZXIoKS0+ Y29ubmVjdEZyb250ZW5kKCk7CiB9CiAKIHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6OmRpZE5h dmlnYXRlKCkKQEAgLTI1Niw0NSArMjUzLDEyIEBAIHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6 Omluc3BlY3ROb2RlKHY4OjpIYW5kbGU8djg6OlZhbHVlPiBub2RlKQogCiB2b2lkIFdlYkRldlRv b2xzQWdlbnRJbXBsOjpzZXRSdW50aW1lUHJvcGVydHkoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBj b25zdCBXZWJTdHJpbmcmIHZhbHVlKQogewotICAgIGlmIChuYW1lID09IGtBcHVBZ2VudEZlYXR1 cmVOYW1lKQotICAgICAgICBzZXRBcHVBZ2VudEVuYWJsZWQodmFsdWUgPT0gInRydWUiKTsKLSAg ICBlbHNlIGlmIChuYW1lID09IGtJbnNwZWN0b3JTdGF0ZUZlYXR1cmVOYW1lKSB7CisgICAgaWYg KG5hbWUgPT0ga0luc3BlY3RvclN0YXRlRmVhdHVyZU5hbWUpIHsKICAgICAgICAgSW5zcGVjdG9y Q29udHJvbGxlciogaWMgPSBpbnNwZWN0b3JDb250cm9sbGVyKCk7CiAgICAgICAgIGljLT5yZXN0 b3JlSW5zcGVjdG9yU3RhdGVGcm9tQ29va2llKHZhbHVlKTsKLSAgICB9IGVsc2UgaWYgKG5hbWUg PT0ga0Zyb250ZW5kQ29ubmVjdGVkRmVhdHVyZU5hbWUgJiYgIWluc3BlY3RvckNvbnRyb2xsZXIo KS0+aGFzRnJvbnRlbmQoKSkgewotICAgICAgICBpbnNwZWN0b3JDb250cm9sbGVyKCktPmluamVj dGVkU2NyaXB0SG9zdCgpLT5zZXRJbmplY3RlZFNjcmlwdFNvdXJjZSh2YWx1ZSk7Ci0gICAgICAg IGNvbm5lY3RGcm9udGVuZCh0cnVlKTsKICAgICB9CiB9CiAKLXZvaWQgV2ViRGV2VG9vbHNBZ2Vu dEltcGw6OnNldEFwdUFnZW50RW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAgbV9hcHVBZ2Vu dEVuYWJsZWQgPSBlbmFibGVkOwotICAgIEluc3BlY3RvckNvbnRyb2xsZXIqIGljID0gaW5zcGVj dG9yQ29udHJvbGxlcigpOwotICAgIGlmIChlbmFibGVkKSB7Ci0gICAgICAgIGlmICghaWMtPmhh c0Zyb250ZW5kKCkpCi0gICAgICAgICAgICBjb25uZWN0RnJvbnRlbmQodHJ1ZSk7Ci0KLSAgICAg ICAgaWMtPnN0YXJ0VGltZWxpbmVQcm9maWxlcigpOwotICAgICAgICBtX2RlYnVnZ2VyQWdlbnRJ bXBsLT5zZXRBdXRvQ29udGludWVPbkV4Y2VwdGlvbih0cnVlKTsKLSAgICB9IGVsc2UKLSAgICAg IGljLT5zdG9wVGltZWxpbmVQcm9maWxlcigpOwotCi0gICAgbV9jbGllbnQtPnJ1bnRpbWVQcm9w ZXJ0eUNoYW5nZWQoCi0gICAgICAgIGtBcHVBZ2VudEZlYXR1cmVOYW1lLAotICAgICAgICBlbmFi bGVkID8gU3RyaW5nKCJ0cnVlIikgOiBTdHJpbmcoImZhbHNlIikpOwotfQotCi12b2lkIFdlYkRl dlRvb2xzQWdlbnRJbXBsOjpjb25uZWN0RnJvbnRlbmQoYm9vbCBhZnRlck5hdmlnYXRpb24pCi17 Ci0gICAgaWYgKGFmdGVyTmF2aWdhdGlvbikKLSAgICAgICAgaW5zcGVjdG9yQ29udHJvbGxlcigp LT5yZXVzZUZyb250ZW5kKCk7Ci0gICAgZWxzZQotICAgICAgICBpbnNwZWN0b3JDb250cm9sbGVy KCktPmNvbm5lY3RGcm9udGVuZCgpOwotICAgIC8vIFdlIGtub3cgdGhhdCBieSB0aGlzIHRpbWUg aW5qZWN0ZWQgc2NyaXB0IGhhcyBhbHJlYWR5IGJlZW4gcHVzaGVkIHRvIHRoZSBiYWNrZW5kLgot ICAgIG1fY2xpZW50LT5ydW50aW1lUHJvcGVydHlDaGFuZ2VkKGtGcm9udGVuZENvbm5lY3RlZEZl YXR1cmVOYW1lLCBpbnNwZWN0b3JDb250cm9sbGVyKCktPmluamVjdGVkU2NyaXB0SG9zdCgpLT5p bmplY3RlZFNjcmlwdFNvdXJjZSgpKTsKLX0KLQogV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl ciogV2ViRGV2VG9vbHNBZ2VudEltcGw6Omluc3BlY3RvckNvbnRyb2xsZXIoKQogewogICAgIGlm IChQYWdlKiBwYWdlID0gbV93ZWJWaWV3SW1wbC0+cGFnZSgpKQpAQCAtMzk4LDExICszNjIsNiBA QCBib29sIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpzZW5kTWVzc2FnZVRvRnJvbnRlbmQoY29uc3Qg V1RGOjpTdHJpbmcmIG1lc3NhZ2UpCiAgICAgaWYgKCFkZXZUb29sc0FnZW50KQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoZGV2VG9vbHNBZ2VudC0+bV9hcHVBZ2VudEVuYWJsZWQp IHsKLSAgICAgICAgbV9jbGllbnQtPnNlbmREaXNwYXRjaFRvQVBVKG1lc3NhZ2UpOwotICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KICAgICBtX2NsaWVudC0+c2VuZE1lc3NhZ2VUb0luc3Bl Y3RvckZyb250ZW5kKG1lc3NhZ2UpOwogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5oIGIvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5oCmluZGV4IDQ4N2NmMGMuLjliM2MwNTMgMTAw NjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuaAorKysg Yi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmgKQEAgLTEwMCwxNiAr MTAwLDEyIEBAIHB1YmxpYzoKICAgICBpbnQgaG9zdElkKCkgeyByZXR1cm4gbV9ob3N0SWQ7IH0K IAogcHJpdmF0ZToKLSAgICB2b2lkIHNldEFwdUFnZW50RW5hYmxlZChib29sIGVuYWJsZWQpOwot ICAgIHZvaWQgY29ubmVjdEZyb250ZW5kKGJvb2wgYWZ0ZXJOYXZpZ2F0aW9uKTsKLQogICAgIFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXIqIGluc3BlY3RvckNvbnRyb2xsZXIoKTsKIAogICAg IGludCBtX2hvc3RJZDsKICAgICBXZWJEZXZUb29sc0FnZW50Q2xpZW50KiBtX2NsaWVudDsKICAg ICBXZWJWaWV3SW1wbCogbV93ZWJWaWV3SW1wbDsKICAgICBPd25QdHI8RGVidWdnZXJBZ2VudElt cGw+IG1fZGVidWdnZXJBZ2VudEltcGw7Ci0gICAgYm9vbCBtX2FwdUFnZW50RW5hYmxlZDsKICAg ICBib29sIG1fYXR0YWNoZWQ7CiB9OwogCg==