46039 2010-09-18 09:30:08 -0700 [Qt] QtTestBrowser: Make nodesFromRect testable. 2012-04-12 11:43:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED WONTFIX Qt P2 Normal --- 44088 44089 40477 1 tonikitoo tonikitoo diegohcg kenneth luiz webkit-ews oldest_to_newest 281148 0 tonikitoo 2010-09-18 09:30:08 -0700 Bug 44088 and bug 44089 are adding to QtWebKit and ability to make use of Document::nodesFromRect() to improve the touch experience on mobile devices. To make it easier to validate the implementation of both bugs, I added testing support for it to the QtTestBrowser. 281149 1 68012 tonikitoo 2010-09-18 09:34:45 -0700 Created attachment 68012 patch v1 (it will fail to build until 44088 and 44089 land) 281224 2 webkit-ews 2010-09-18 17:31:31 -0700 Attachment 68012 did not build on qt: Build output: http://queues.webkit.org/results/4027062 281225 3 tonikitoo 2010-09-18 17:39:57 -0700 (In reply to comment #2) > Attachment 68012 [details] did not build on qt: > Build output: http://queues.webkit.org/results/4027062 Expected 290783 4 68012 kling 2010-10-06 20:49:40 -0700 Comment on attachment 68012 patch v1 (it will fail to build until 44088 and 44089 land) View in context: https://bugs.webkit.org/attachment.cgi?id=68012&action=review > WebKitTools/QtTestBrowser/launcherwindow.cpp:88 > + // Inspector set up. setup > WebKitTools/QtTestBrowser/launcherwindow.cpp:98 > + // Zooming set up. setup > WebKitTools/QtTestBrowser/launcherwindow.cpp:358 > + paddingNone->setChecked((m_windowOptions.tapPaddingArea == gTapPaddingAreaNone) ? true : false); "? true : false" is redundant. > WebKitTools/QtTestBrowser/launcherwindow.cpp:362 > + padding10x10->setChecked((m_windowOptions.tapPaddingArea == gTapPaddingArea10x10) ? true : false); Ditto. > WebKitTools/QtTestBrowser/launcherwindow.cpp:366 > + padding10x15->setChecked((m_windowOptions.tapPaddingArea == gTapPaddingArea10x15) ? true : false); Ditto. > WebKitTools/QtTestBrowser/launcherwindow.cpp:829 > + QStringList size = padding.split("x"); I don't particularly like the name "size" for a string list. Also, nit: padding.split('x') rather than padding.split("x") > WebKitTools/QtTestBrowser/webview.cpp:249 > + case QEvent::GraphicsSceneHoverLeave: > + if (m_showTapPaddingArea) > + moveMouseCursorOffscreen(); > + default: Missing break statement. 68012 2010-09-18 09:34:45 -0700 2010-10-06 20:49:39 -0700 patch v1 (it will fail to build until 44088 and 44089 land) 0001-2010-09-02-Antonio-Gomes-tonikitoo-webkit.org.patch text/plain 12051 tonikitoo RnJvbSBhOTdiODAyM2U0YjA3MzE2ZDA4NTNlZGE1MGJkNGQzYzk4MDAyNjUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogU3VuLCAxNSBBdWcgMjAxMCAxNTozNDoyOSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIw MTAtMDktMDIgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KCiAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtRdF0gVmlzdWFsIHBhZGRpbmcg YXJlYSB0cmFja2VyIGZvciBRdFRlc3RCcm93c2VyLgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjAzOQoKICAgICAgICBQYXRjaCBtYWtlcyBpdCBwb3Nz aWJsZSB0byB0ZXN0IHRoZSByZWN0LWJhc2VkIGhpdCB0ZXN0IGV4dGVuc2lvbiBvbiBRdFRlc3RC cm93c2VyLgogICAgICAgIEEgbWVudSBpdGVtIHdpdGggcHJlLWRlZmluZWQgcGFkZGluZyBhcmVh cyBpcyBhZGRlZCB0byB0aGUgR3JhcGhpY3NWaWV3IG1lbnUuIEl0CiAgICAgICAgc2hvd3MgYSBy ZWN0YW5ndWxhciB2aXN1YWwgdHJhY2tlciBmb3IgdGhlIG1vdXNlIGN1cnNvciwgc2ltdWxhdGlu ZyB0aGUgcmVjdCBhcmVhCiAgICAgICAgdG8gYmUgcGFzc2VkIHRvIHRoZSBoaXQgdGVzdGluZyBz eXN0ZW0uCgogICAgICAgICogUXRUZXN0QnJvd3Nlci9tYWluLmNwcDoKICAgICAgICAoTGF1bmNo ZXJXaW5kb3c6OmNoYW5nZVRhcFBhZGRpbmdBcmVhKToKICAgICAgICAoTGF1bmNoZXJXaW5kb3c6 OmNyZWF0ZUNocm9tZSk6CiAgICAgICAgKiBRdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwOgogICAg ICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6V2ViVmlld0dyYXBoaWNzQmFzZWQpOgogICAgICAg IChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6ZXZlbnRGaWx0ZXIpOgogICAgICAgICogUXRUZXN0QnJv d3Nlci93ZWJ2aWV3Lmg6CiAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRTaG93VGFw UGFkZGluZ0FyZWFFbmFibGVkKToKICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnNob3dU YXBQYWRkaW5nQXJlYUVuYWJsZWQpOgogICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6bW92 ZU1vdXNlQ3Vyc29yT2Zmc2NyZWVuKTorCi0tLQogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAgICAg ICAgICAgICAgICAgICAgICAgfCAgIDIzICsrKysrKysrKysKIFdlYktpdFRvb2xzL1F0VGVzdEJy b3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwIHwgICA1OSArKysrKysrKysrKysrKysrKysrKysrKysr KwogV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oICAgfCAgICAzICsK IFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAgICAgICAgIHwgICA0MSArKysr KysrKysrKysrKysrKysKIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5oICAgICAg ICAgIHwgICAxNyArKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDE0MyBpbnNlcnRpb25zKCspLCAw IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktp dFRvb2xzL0NoYW5nZUxvZwppbmRleCBhNjYyNDViLi41YThmNTE1IDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjYgQEAKKzIwMTAtMDktMDIgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFZp c3VhbCBwYWRkaW5nIGFyZWEgdHJhY2tlciBmb3IgUXRUZXN0QnJvd3Nlci4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MDM5CisKKyAgICAgICAgUGF0 Y2ggbWFrZXMgaXQgcG9zc2libGUgdG8gdGVzdCB0aGUgcmVjdC1iYXNlZCBoaXQgdGVzdCBleHRl bnNpb24gb24gUXRUZXN0QnJvd3Nlci4KKyAgICAgICAgQSBtZW51IGl0ZW0gd2l0aCBwcmUtZGVm aW5lZCBwYWRkaW5nIGFyZWFzIGlzIGFkZGVkIHRvIHRoZSBHcmFwaGljc1ZpZXcgbWVudS4gSXQK KyAgICAgICAgc2hvd3MgYSByZWN0YW5ndWxhciB2aXN1YWwgdHJhY2tlciBmb3IgdGhlIG1vdXNl IGN1cnNvciwgc2ltdWxhdGluZyB0aGUgcmVjdCBhcmVhCisgICAgICAgIHRvIGJlIHBhc3NlZCB0 byB0aGUgaGl0IHRlc3Rpbmcgc3lzdGVtLgorCisgICAgICAgICogUXRUZXN0QnJvd3Nlci9tYWlu LmNwcDoKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjpjaGFuZ2VUYXBQYWRkaW5nQXJlYSk6Cisg ICAgICAgIChMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKToKKyAgICAgICAgKiBRdFRlc3RC cm93c2VyL3dlYnZpZXcuY3BwOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OldlYlZp ZXdHcmFwaGljc0Jhc2VkKToKKyAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpldmVudEZp bHRlcik6CisgICAgICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3Lmg6CisgICAgICAgIChXZWJW aWV3R3JhcGhpY3NCYXNlZDo6c2V0U2hvd1RhcFBhZGRpbmdBcmVhRW5hYmxlZCk6CisgICAgICAg IChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2hvd1RhcFBhZGRpbmdBcmVhRW5hYmxlZCk6CisgICAg ICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6bW92ZU1vdXNlQ3Vyc29yT2Zmc2NyZWVuKToKKwog MjAxMC0wOS0xNyAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgSm9uIEhvbmV5Y3V0dC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKaW5kZXggNjViY2VlNy4uMjU1MmIzMCAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKKysrIGIvV2Vi S2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKQEAgLTMzLDYgKzMzLDkg QEAKICNpbmNsdWRlICJsYXVuY2hlcndpbmRvdy5oIgogCiBjb25zdCBpbnQgZ0V4aXRDbGlja0Fy ZWEgPSA4MDsKK3N0YXRpYyBRU3RyaW5nIGdUYXBQYWRkaW5nQXJlYU5vbmUgPSAiTm9uZSI7Citz dGF0aWMgUVN0cmluZyBnVGFwUGFkZGluZ0FyZWExMHgxMCA9ICIxMHgxMCI7CitzdGF0aWMgUVN0 cmluZyBnVGFwUGFkZGluZ0FyZWExMHgxNSA9ICIxMHgxNSI7CiBRVmVjdG9yPGludD4gTGF1bmNo ZXJXaW5kb3c6Om1fem9vbUxldmVsczsKIAogTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93 KFdpbmRvd09wdGlvbnMqIGRhdGEsIFFHcmFwaGljc1NjZW5lKiBzaGFyZWRTY2VuZSkKQEAgLTgy LDYgKzg1LDcgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6aW5pdCgpCiAKICAgICBhcHBseVByZWZz KCk7CiAKKyAgICAvLyBJbnNwZWN0b3Igc2V0IHVwLgogICAgIG1faW5zcGVjdG9yID0gbmV3IFdl Ykluc3BlY3RvcihzcGxpdHRlcik7CiAjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKICAgICBpZiAo IW1fd2luZG93T3B0aW9ucy5pbnNwZWN0b3JVcmwuaXNFbXB0eSgpKQpAQCAtOTEsNiArOTUsNyBA QCB2b2lkIExhdW5jaGVyV2luZG93Ojppbml0KCkKICAgICBtX2luc3BlY3Rvci0+aGlkZSgpOwog ICAgIGNvbm5lY3QodGhpcywgU0lHTkFMKGRlc3Ryb3llZCgpKSwgbV9pbnNwZWN0b3IsIFNMT1Qo ZGVsZXRlTGF0ZXIoKSkpOwogCisgICAgLy8gWm9vbWluZyBzZXQgdXAuCiAgICAgLy8gdGhlIHpv b20gdmFsdWVzIGFyZSBjaG9zZW4gdG8gYmUgbGlrZSBpbiBNb3ppbGxhIEZpcmVmb3ggMwogICAg IGlmICghbV96b29tTGV2ZWxzLmNvdW50KCkpIHsKICAgICAgICAgbV96b29tTGV2ZWxzIDw8IDMw IDw8IDUwIDw8IDY3IDw8IDgwIDw8IDkwOwpAQCAtMTM3LDYgKzE0Miw4IEBAIHZvaWQgTGF1bmNo ZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KCkKICNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05f Q0hFQ0soNCwgNiwgMCkKICAgICBtX3RvdWNoTW9ja2luZyA9IGZhbHNlOwogI2VuZGlmCisKKyAg ICBjaGFuZ2VUYXBQYWRkaW5nQXJlYShtX3dpbmRvd09wdGlvbnMudGFwUGFkZGluZ0FyZWEpOwog fQogCiB2b2lkIExhdW5jaGVyV2luZG93OjphcHBseVByZWZzKCkKQEAgLTM0Miw2ICszNDksMzkg QEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKCkKIAogICAgIGdyYXBoaWNzVmll d01lbnUtPmFkZFNlcGFyYXRvcigpOwogCisgICAgUU1lbnUqIHRhcFBhZGRpbmdBcmVhID0gZ3Jh cGhpY3NWaWV3TWVudS0+YWRkTWVudSgiVGFwIFBhZGRpbmcgQXJlYSIpOworICAgIHRhcFBhZGRp bmdBcmVhLT5zZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNlZCgpKTsKKyAgICB0YXBQYWRkaW5nQXJl YS0+Y29ubmVjdCh0b2dnbGVHcmFwaGljc1ZpZXcsIFNJR05BTCh0b2dnbGVkKGJvb2wpKSwgU0xP VChzZXRFbmFibGVkKGJvb2wpKSk7CisKKyAgICBRQWN0aW9uKiBwYWRkaW5nTm9uZSA9IHRhcFBh ZGRpbmdBcmVhLT5hZGRBY3Rpb24oZ1RhcFBhZGRpbmdBcmVhTm9uZSk7CisgICAgcGFkZGluZ05v bmUtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICBwYWRkaW5nTm9uZS0+c2V0Q2hlY2tlZCgobV93 aW5kb3dPcHRpb25zLnRhcFBhZGRpbmdBcmVhID09IGdUYXBQYWRkaW5nQXJlYU5vbmUpID8gdHJ1 ZSA6IGZhbHNlKTsKKworICAgIFFBY3Rpb24qIHBhZGRpbmcxMHgxMCA9IHRhcFBhZGRpbmdBcmVh LT5hZGRBY3Rpb24oZ1RhcFBhZGRpbmdBcmVhMTB4MTApOworICAgIHBhZGRpbmcxMHgxMC0+c2V0 Q2hlY2thYmxlKHRydWUpOworICAgIHBhZGRpbmcxMHgxMC0+c2V0Q2hlY2tlZCgobV93aW5kb3dP cHRpb25zLnRhcFBhZGRpbmdBcmVhID09IGdUYXBQYWRkaW5nQXJlYTEweDEwKSA/IHRydWUgOiBm YWxzZSk7CisKKyAgICBRQWN0aW9uKiBwYWRkaW5nMTB4MTUgPSB0YXBQYWRkaW5nQXJlYS0+YWRk QWN0aW9uKGdUYXBQYWRkaW5nQXJlYTEweDE1KTsKKyAgICBwYWRkaW5nMTB4MTUtPnNldENoZWNr YWJsZSh0cnVlKTsKKyAgICBwYWRkaW5nMTB4MTUtPnNldENoZWNrZWQoKG1fd2luZG93T3B0aW9u cy50YXBQYWRkaW5nQXJlYSA9PSBnVGFwUGFkZGluZ0FyZWExMHgxNSkgPyB0cnVlIDogZmFsc2Up OworCisgICAgc2lnbmFsTWFwcGVyID0gbmV3IFFTaWduYWxNYXBwZXIodGFwUGFkZGluZ0FyZWEp OworICAgIHNpZ25hbE1hcHBlci0+c2V0TWFwcGluZyhwYWRkaW5nTm9uZSwgZ1RhcFBhZGRpbmdB cmVhTm9uZSk7CisgICAgc2lnbmFsTWFwcGVyLT5zZXRNYXBwaW5nKHBhZGRpbmcxMHgxMCwgZ1Rh cFBhZGRpbmdBcmVhMTB4MTApOworICAgIHNpZ25hbE1hcHBlci0+c2V0TWFwcGluZyhwYWRkaW5n MTB4MTUsIGdUYXBQYWRkaW5nQXJlYTEweDE1KTsKKworICAgIGNvbm5lY3QocGFkZGluZ05vbmUs IFNJR05BTCh0cmlnZ2VyZWQoKSksIHNpZ25hbE1hcHBlciwgU0xPVChtYXAoKSkpOworICAgIGNv bm5lY3QocGFkZGluZzEweDEwLCBTSUdOQUwodHJpZ2dlcmVkKCkpLCBzaWduYWxNYXBwZXIsIFNM T1QobWFwKCkpKTsKKyAgICBjb25uZWN0KHBhZGRpbmcxMHgxNSwgU0lHTkFMKHRyaWdnZXJlZCgp KSwgc2lnbmFsTWFwcGVyLCBTTE9UKG1hcCgpKSk7CisgICAgY29ubmVjdChzaWduYWxNYXBwZXIs IFNJR05BTChtYXBwZWQoY29uc3QgUVN0cmluZyYpKSwgdGhpcywgU0xPVChjaGFuZ2VUYXBQYWRk aW5nQXJlYShjb25zdCBRU3RyaW5nJikpKTsKKworICAgIFFBY3Rpb25Hcm91cCogc2hvd1RhcFBh ZGRpbmdBcmVhQWN0aW9ucyA9IG5ldyBRQWN0aW9uR3JvdXAodGFwUGFkZGluZ0FyZWEpOworICAg IHNob3dUYXBQYWRkaW5nQXJlYUFjdGlvbnMtPmFkZEFjdGlvbihwYWRkaW5nTm9uZSk7CisgICAg c2hvd1RhcFBhZGRpbmdBcmVhQWN0aW9ucy0+YWRkQWN0aW9uKHBhZGRpbmcxMHgxMCk7CisgICAg c2hvd1RhcFBhZGRpbmdBcmVhQWN0aW9ucy0+YWRkQWN0aW9uKHBhZGRpbmcxMHgxNSk7CisKKyAg ICBncmFwaGljc1ZpZXdNZW51LT5hZGRTZXBhcmF0b3IoKTsKKwogICAgIFFBY3Rpb24qIGZsaXBB bmltYXRlZCA9IGdyYXBoaWNzVmlld01lbnUtPmFkZEFjdGlvbigiQW5pbWF0ZWQgRmxpcCIpOwog ICAgIGZsaXBBbmltYXRlZC0+Y29ubmVjdCh0b2dnbGVHcmFwaGljc1ZpZXcsIFNJR05BTCh0b2dn bGVkKGJvb2wpKSwgU0xPVChzZXRFbmFibGVkKGJvb2wpKSk7CiAgICAgZmxpcEFuaW1hdGVkLT5z ZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNlZCgpKTsKQEAgLTc3NSw2ICs4MTUsMjUgQEAgdm9pZCBM YXVuY2hlcldpbmRvdzo6Y2hhbmdlVmlld3BvcnRVcGRhdGVNb2RlKGludCBtb2RlKQogICAgIHZp ZXctPnNldFZpZXdwb3J0VXBkYXRlTW9kZShtX3dpbmRvd09wdGlvbnMudmlld3BvcnRVcGRhdGVN b2RlKTsKIH0KIAordm9pZCBMYXVuY2hlcldpbmRvdzo6Y2hhbmdlVGFwUGFkZGluZ0FyZWEoY29u c3QgUVN0cmluZyYgcGFkZGluZykKK3sKKyAgICBpZiAoIWlzR3JhcGhpY3NCYXNlZCgpKQorICAg ICAgICByZXR1cm47CisKKyAgICBtX3dpbmRvd09wdGlvbnMudGFwUGFkZGluZ0FyZWEgPSBwYWRk aW5nOworCisgICAgaWYgKHBhZGRpbmcgPT0gZ1RhcFBhZGRpbmdBcmVhTm9uZSkgeworICAgICAg ICBwYWdlKCktPnNldHRpbmdzKCktPnNldEhpdFRlc3RQYWRkaW5nKFF0OjpWZXJ0aWNhbCwgMCk7 CisgICAgICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0SGl0VGVzdFBhZGRpbmcoUXQ6Okhvcml6 b250YWwsIDApOworICAgIH0gZWxzZSB7CisgICAgICAgIFFTdHJpbmdMaXN0IHNpemUgPSBwYWRk aW5nLnNwbGl0KCJ4Iik7CisgICAgICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0SGl0VGVzdFBh ZGRpbmcoUXQ6Okhvcml6b250YWwsIHNpemUuYXQoMCkudG9JbnQoKSk7CisgICAgICAgIHBhZ2Uo KS0+c2V0dGluZ3MoKS0+c2V0SGl0VGVzdFBhZGRpbmcoUXQ6OlZlcnRpY2FsLCBzaXplLmF0KDEp LnRvSW50KCkpOworICAgIH0KKworICAgIHN0YXRpY19jYXN0PFdlYlZpZXdHcmFwaGljc0Jhc2Vk Kj4obV92aWV3KS0+c2V0U2hvd1RhcFBhZGRpbmdBcmVhRW5hYmxlZChwYWRkaW5nICE9IGdUYXBQ YWRkaW5nQXJlYU5vbmUpOworfQorCiB2b2lkIExhdW5jaGVyV2luZG93OjpzaG93RlBTKGJvb2wg ZW5hYmxlKQogewogICAgIGlmICghaXNHcmFwaGljc0Jhc2VkKCkpCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmggYi9XZWJLaXRUb29scy9RdFRl c3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKaW5kZXggZDNiN2Y4ZS4uZTUzZmIzYiAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCisrKyBiL1dl YktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaApAQCAtOTMsNiArOTMsNyBA QCBwdWJsaWM6CiAgICAgICAgICwgdmlld3BvcnRVcGRhdGVNb2RlKFFHcmFwaGljc1ZpZXc6Ok1p bmltYWxWaWV3cG9ydFVwZGF0ZSkKICNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVO R0wpCiAgICAgICAgICwgdXNlUUdMV2lkZ2V0Vmlld3BvcnQoZmFsc2UpCisgICAgICAgICwgdGFw UGFkZGluZ0FyZWEoIk5vbmUiKQogI2VuZGlmCiAgICAgewogICAgIH0KQEAgLTEwOSw2ICsxMTAs NyBAQCBwdWJsaWM6CiAjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQogICAg IGJvb2wgdXNlUUdMV2lkZ2V0Vmlld3BvcnQ7CiAjZW5kaWYKKyAgICBRU3RyaW5nIHRhcFBhZGRp bmdBcmVhOwogICAgIFFVcmwgaW5zcGVjdG9yVXJsOwogfTsKIApAQCAtMTY0LDYgKzE2Niw3IEBA IHByb3RlY3RlZCBzbG90czoKICAgICB2b2lkIHRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0KGJvb2wg ZW5hYmxlKTsKICNlbmRpZgogCisgICAgdm9pZCBjaGFuZ2VUYXBQYWRkaW5nQXJlYShjb25zdCBR U3RyaW5nJiBwYWRkaW5nKTsKICAgICB2b2lkIGNoYW5nZVZpZXdwb3J0VXBkYXRlTW9kZShpbnQg bW9kZSk7CiAgICAgdm9pZCBhbmltYXRlZEZsaXAoKTsKICAgICB2b2lkIGFuaW1hdGVkWUZsaXAo KTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAgYi9X ZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwCmluZGV4IGQ4ZDg5YTkuLmU3ZDNm MjggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAKKysr IGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcApAQCAtNDMsNiArNDMsNyBA QCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6V2ViVmlld0dyYXBoaWNzQmFzZWQoUVdpZGdldCogcGFy ZW50KQogICAgICwgbV9tZWFzdXJlRnBzKGZhbHNlKQogICAgICwgbV9yZXNpemVzVG9Db250ZW50 cyhmYWxzZSkKICAgICAsIG1fbWFjaGluZSgwKQorICAgICwgbV9zaG93VGFwUGFkZGluZ0FyZWEo ZmFsc2UpCiB7CiAgICAgc2V0U2NlbmUobmV3IFFHcmFwaGljc1NjZW5lKHRoaXMpKTsKICAgICBz Y2VuZSgpLT5hZGRJdGVtKG1faXRlbSk7CkBAIC01NCw2ICs1NSwxMCBAQCBXZWJWaWV3R3JhcGhp Y3NCYXNlZDo6V2ViVmlld0dyYXBoaWNzQmFzZWQoUVdpZGdldCogcGFyZW50KQogICAgIG1fdXBk YXRlVGltZXIgPSBuZXcgUVRpbWVyKHRoaXMpOwogICAgIG1fdXBkYXRlVGltZXItPnNldEludGVy dmFsKDEwMDApOwogICAgIGNvbm5lY3QobV91cGRhdGVUaW1lciwgU0lHTkFMKHRpbWVvdXQoKSks IHRoaXMsIFNMT1QodXBkYXRlRnJhbWVSYXRlKCkpKTsKKworICAgIG1fcGFkZGluZ1RyYWNrZXIg PSBzY2VuZSgpLT5hZGRSZWN0KFFSZWN0RigtMTAwLCAtMTAwLCAwLCAwKSk7CisgICAgbV9wYWRk aW5nVHJhY2tlci0+c2V0QnJ1c2goUUJydXNoKFFDb2xvcigyNTUsIDAsIDAsIDEwMCkpKTsKKyAg ICBtX2l0ZW0tPmluc3RhbGxFdmVudEZpbHRlcih0aGlzKTsKIH0KIAogdm9pZCBXZWJWaWV3R3Jh cGhpY3NCYXNlZDo6c2V0UGFnZShRV2ViUGFnZSogcGFnZSkKQEAgLTEyNCw2ICsxMjksMTcgQEAg dm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6cmVzaXplRXZlbnQoUVJlc2l6ZUV2ZW50KiBldmVu dCkKICAgICBzY2VuZSgpLT5zZXRTY2VuZVJlY3QocmVjdCk7CiB9CiAKK3ZvaWQgV2ViVmlld0dy YXBoaWNzQmFzZWQ6OnNldFNob3dUYXBQYWRkaW5nQXJlYUVuYWJsZWQoYm9vbCBlbmFibGVkKQor eworICAgIGlmIChlbmFibGVkID09IG1fc2hvd1RhcFBhZGRpbmdBcmVhKQorICAgICAgICByZXR1 cm47CisKKyAgICBpZiAoIWVuYWJsZWQpCisgICAgICAgIG1vdmVNb3VzZUN1cnNvck9mZnNjcmVl bigpOworCisgICAgbV9zaG93VGFwUGFkZGluZ0FyZWEgPSBlbmFibGVkOworfQorCiB2b2lkIFdl YlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRGcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQoYm9vbCBl bmFibGVkKQogewogICAgIG1fbWVhc3VyZUZwcyA9IGVuYWJsZWQ7CkBAIC0yMTIsNiArMjI4LDMx IEBAIHZvaWQgV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnBhaW50RXZlbnQoUVBhaW50RXZlbnQqIGV2 ZW50KQogICAgICAgICByZXR1cm47CiB9CiAKK2Jvb2wgV2ViVmlld0dyYXBoaWNzQmFzZWQ6OmV2 ZW50RmlsdGVyKFFPYmplY3QqIG9iamVjdCwgUUV2ZW50KiBldmVudCkKK3sKKyAgICBzd2l0Y2gg KGV2ZW50LT50eXBlKCkpIHsKKyAgICBjYXNlIFFFdmVudDo6R3JhcGhpY3NTY2VuZUhvdmVyTW92 ZToKKyAgICAgICAgaWYgKG1fc2hvd1RhcFBhZGRpbmdBcmVhKSB7CisgICAgICAgICAgICBRR3Jh cGhpY3NTY2VuZUhvdmVyRXZlbnQqIGV2ID0gZHluYW1pY19jYXN0PFFHcmFwaGljc1NjZW5lSG92 ZXJFdmVudCo+KGV2ZW50KTsKKyAgICAgICAgICAgIGZsb2F0IHggPSBldi0+cG9zKCkueCgpOwor ICAgICAgICAgICAgZmxvYXQgeSA9IGV2LT5wb3MoKS55KCk7CisgICAgICAgICAgICBmbG9hdCB3 aWR0aCA9IGdyYXBoaWNzV2ViVmlldygpLT5wYWdlKCktPnNldHRpbmdzKCktPmhpdFRlc3RQYWRk aW5nKFF0OjpIb3Jpem9udGFsKTsKKyAgICAgICAgICAgIGZsb2F0IGhlaWdodCA9IGdyYXBoaWNz V2ViVmlldygpLT5wYWdlKCktPnNldHRpbmdzKCktPmhpdFRlc3RQYWRkaW5nKFF0OjpWZXJ0aWNh bCk7CisKKyAgICAgICAgICAgIFFSZWN0RiByZWN0KHggLSB3aWR0aCwgeSAtIGhlaWdodCwgMiAq IHdpZHRoICsgMSwgMiAqIGhlaWdodCArIDEpOworICAgICAgICAgICAgbV9wYWRkaW5nVHJhY2tl ci0+c2V0UmVjdChyZWN0KTsKKyAgICAgICAgfQorICAgICAgICBicmVhazsKKyAgICBjYXNlIFFF dmVudDo6R3JhcGhpY3NTY2VuZUhvdmVyTGVhdmU6CisgICAgICAgIGlmIChtX3Nob3dUYXBQYWRk aW5nQXJlYSkKKyAgICAgICAgICAgIG1vdmVNb3VzZUN1cnNvck9mZnNjcmVlbigpOworICAgIGRl ZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAgIHJldHVybiBRR3JhcGhpY3NWaWV3 OjpldmVudEZpbHRlcihvYmplY3QsIGV2ZW50KTsKK30KKwogc3RhdGljIFFNZW51KiBjcmVhdGVD b250ZXh0TWVudShRV2ViUGFnZSogcGFnZSwgUVBvaW50IHBvc2l0aW9uKQogewogICAgIFFNZW51 KiBtZW51ID0gcGFnZS0+Y3JlYXRlU3RhbmRhcmRDb250ZXh0TWVudSgpOwpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmggYi9XZWJLaXRUb29scy9RdFRlc3RC cm93c2VyL3dlYnZpZXcuaAppbmRleCBhYWRmODVjLi5kYTE0ZmY4IDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuaAorKysgYi9XZWJLaXRUb29scy9RdFRlc3RC cm93c2VyL3dlYnZpZXcuaApAQCAtODEsNiArODEsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRG cmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQoYm9vbCBlbmFibGVkKTsKICAgICBib29sIGZyYW1l UmF0ZU1lYXN1cmVtZW50RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbWVhc3VyZUZwczsgfQog CisgICAgdm9pZCBzZXRTaG93VGFwUGFkZGluZ0FyZWFFbmFibGVkKGJvb2wgZW5hYmxlZCk7Cisg ICAgYm9vbCBzaG93VGFwUGFkZGluZ0FyZWFFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9zaG93 VGFwUGFkZGluZ0FyZWE7IH0KKwogICAgIHZpcnR1YWwgdm9pZCByZXNpemVFdmVudChRUmVzaXpl RXZlbnQqKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRFdmVudChRUGFpbnRFdmVudCogZXZlbnQp OwogCkBAIC05OCw2ICsxMDEsMTIgQEAgcHVibGljIHNsb3RzOgogICAgIHZvaWQgYW5pbWF0ZWRZ RmxpcCgpOwogICAgIHZvaWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwogCitw cm90ZWN0ZWQ6CisgICAgYm9vbCBldmVudEZpbHRlcihRT2JqZWN0KiwgUUV2ZW50Kik7CisKK3By aXZhdGU6CisgICAgaW5saW5lIHZvaWQgbW92ZU1vdXNlQ3Vyc29yT2Zmc2NyZWVuKCkgY29uc3Q7 CisKIHNpZ25hbHM6CiAgICAgdm9pZCBjdXJyZW50RlBTVXBkYXRlZChpbnQgZnBzKTsKIApAQCAt MTEzLDYgKzEyMiw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3Jlc2l6ZXNUb0NvbnRlbnRzOwog ICAgIFFTdGF0ZU1hY2hpbmUqIG1fbWFjaGluZTsKICAgICBGcHNUaW1lciBtX2Zwc1RpbWVyOwor ICAgIGJvb2wgbV9zaG93VGFwUGFkZGluZ0FyZWE7CisgICAgUUdyYXBoaWNzUmVjdEl0ZW0qIG1f cGFkZGluZ1RyYWNrZXI7CiB9OwogCiBpbmxpbmUgdm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6 c2V0WVJvdGF0aW9uKHFyZWFsIGFuZ2xlKQpAQCAtMTI3LDQgKzEzOCwxMCBAQCBpbmxpbmUgdm9p ZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0WVJvdGF0aW9uKHFyZWFsIGFuZ2xlKQogICAgIG1f eVJvdGF0aW9uID0gYW5nbGU7CiB9CiAKK2lubGluZSB2b2lkIFdlYlZpZXdHcmFwaGljc0Jhc2Vk Ojptb3ZlTW91c2VDdXJzb3JPZmZzY3JlZW4oKSBjb25zdAoreworICAgIFFSZWN0RiByZWN0KC0x MDAsIC0xMDAsIDAsIDApOworICAgIG1fcGFkZGluZ1RyYWNrZXItPnNldFJlY3QocmVjdCk7Cit9 CisKICNlbmRpZgotLSAKMS42LjQuMgoK