40600 2010-06-14 17:09:30 -0700 [GTK] Remove the abuse of GDK_CURRENT_TIME in the DRT 2010-06-16 15:27:01 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 39844 1 mrobinson webkit-unassigned oldest_to_newest 238150 0 mrobinson 2010-06-14 17:09:30 -0700 In a previous patch, I abused GDK_CURRENT_TIME by adding the current offset to it (from leapForward). GTK+ drag-and-drop internals respond poorly to this, so I need to remove it before adding dropping support the GTK+ DRT. 238162 1 58733 mrobinson 2010-06-14 17:31:27 -0700 Created attachment 58733 Patch for this issue 238164 2 mrobinson 2010-06-14 17:33:55 -0700 I've uploaded a patch for this issue. Unfortunately, the fix has uncovered failures in four tests that were passing incorrectly. I've opened bug #40601 for this issue. 239069 3 58733 gustavo 2010-06-16 13:59:00 -0700 Comment on attachment 58733 Patch for this issue Finding false positives is also a good thing, I guess =) 239114 4 mrobinson 2010-06-16 15:27:01 -0700 Committed r61288: <http://trac.webkit.org/changeset/61288> 58733 2010-06-14 17:31:27 -0700 2010-06-16 13:59:00 -0700 Patch for this issue bug-40600-20100614173128.patch text/plain 10861 mrobinson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwMjk5NmZmOGU0Zjc2ZDI0ZTZkMDVjOTdlY2U3YWI1NzUxNDI5NjRjLi41YTgwZGFk ZGYyYjcyODQ1MmI4MzU3NmY4ZTU4YjljNmNkYWM5ODE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTAtMDYtMTQgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFJlbW92 ZSB0aGUgYWJ1c2Ugb2YgR0RLX0NVUlJFTlRfVElNRSBpbiB0aGUgRFJUCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDYwMAorCisgICAgICAgICogcGxh dGZvcm0vZ3RrL1NraXBwZWQ6IFRoaXMgY2hhbmdlIGV4cG9zZWQgc29tZSBmYWlsdXJlcyB3aGlj aCB3ZXJlIHByZXZpb3VzbHkgbm90IHJlcG9ydGVkLiBTa2lwIHRoZW0uCisKIDIwMTAtMDYtMTQg IERtaXRyeSBUaXRvdiAgPGRpbWljaEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgbW9yZSBDaHJvbWl1bSBleHBlY3RhdGlvbnMgdXBkYXRlcy4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Nr aXBwZWQKaW5kZXggZmQ2ZTgyM2Y5NGY1NDQ5NzVmNDVkMDc3NmQzZjNjMDc3M2M0OWQwNi4uZDMx NmZiYTIyOGRmNDJjMGRmOTdjZTQwMGQyN2Q0YmVjOTkyYTUwMCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L1NraXBwZWQKQEAgLTU5MzQsMyArNTkzNCwxMCBAQCBmYXN0L2Zvcm1zL3NsaWRlci10cmFuc2Zv cm1lZC5odG1sCiAjIG9mIHRoZSBzbGlkZXIgdGh1bWIgaW4gR1RLKyB0aGVtZXMuCiBmYXN0L2Zv cm1zL3NsaWRlci1tb3VzZS1ldmVudHMuaHRtbAogZmFzdC9mb3Jtcy9zbGlkZXItem9vbWVkLmh0 bWwKKworIyBUZXN0cyBmYWlsaW5nIGJlY2F1c2UgdGhlIGNvbnRleHQgbWVudSBpcyBncmFiYmlu ZyBtb3VzZSBldmVudHMuCisjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MDYwMQorZmFzdC9ldmVudHMvbW91c2UtY2xpY2stZXZlbnRzLmh0bWwKK2Zhc3QvZXZlbnRz L3JpZ2h0LWNsaWNrLWZvY3VzLmh0bWwKK2VkaXRpbmcvc2VsZWN0aW9uLzUzNTQ0NTUtMS5odG1s CitlZGl0aW5nL3NlbGVjdGlvbi81MzU0NDU1LTIuaHRtbApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA5ODQxY2JhZDJlMThlYzM5 YzE1YTNlYWU0ZDgxMGNjMDY1ZWRlMTBmLi4yMmUwYjYxMGY3Y2EyOGRmZGVlODVhZDQ3OTZlNTYx ZDYyMzY1ZDdhIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQv Z3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEwLTA2LTE0ICBNYXJ0aW4gUm9iaW5z b24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbR1RLXSBSZW1vdmUgdGhlIGFidXNlIG9mIEdES19DVVJSRU5U X1RJTUUgaW4gdGhlIERSVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDA2MDAKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsu Y3BwOiAKKyAgICAgICAgKFdlYktpdDo6RHJhZ0NsaWVudDo6c3RhcnREcmFnKTogUmVzZXQgdGhl IGNsaWNrIGNvdW50IGFmdGVyIGEgZHJhZyBzdGFydHMuCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0Ojpwb3N0Q29tbWl0 RnJhbWVWaWV3U2V0dXApOiBSZXNldCB0aGUgY2xpY2sgY291bnQgYWZ0ZXIgYSBsb2FkIGlzIGNv bW1pdHRlZC4KKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5oOiBNb3ZlIHN0YXRpYyBj bGljayBjb3VudGluZyB2YXJpYWJsZXMgdG8gYmUgcGVyLXZpZXcuCisgICAgICAgICogd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwOiAKKyAgICAgICAgKGdldEV2ZW50VGltZSk6IEFkZGVkLgorICAg ICAgICAod2Via2l0X3dlYl92aWV3X2J1dHRvbl9wcmVzc19ldmVudCk6IElmIHRoZSBldmVudCB0 aW1lIGlzIHplcm8sIHVzZSB0aGUgY3VycmVudCB0aW1lLgorICAgICAgICAod2Via2l0X3dlYl92 aWV3X2ZpbmFsaXplKTogQ2xlYW4gdXAgY2xpY2sgY291bnRpbmcgbWVtYmVyLgorICAgICAgICAo d2Via2l0X3dlYl92aWV3X2luaXQpOiBJbml0aWFsaXplIGNsaWNrIGNvdW50aW5nIG1lbWJlci4K KwogMjAxMC0wNi0xNCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9EcmFnQ2xpZW50R3RrLmNwcAppbmRleCA2YzM5NWM3MjdlY2JlMjhiNTIwOGU2NmFkMDJkMWFi MGI5Mzk0MDJmLi40YmNjNGMyYmJkYTE0OGRhMDNlYTQxYTBmZmZmNmRmZTk4MjQyMjg2IDEwMDY0 NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuY3BwCisrKyBi L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHJhZ0NsaWVudEd0ay5jcHAKQEAgLTc5LDYgKzc5 LDEwIEBAIHZvaWQgRHJhZ0NsaWVudDo6c3RhcnREcmFnKERyYWdJbWFnZVJlZiBpbWFnZSwgY29u c3QgSW50UG9pbnQmIGRyYWdJbWFnZU9yaWdpbiwKICAgICBHZGtEcmFnQ29udGV4dCogY29udGV4 dCA9IGd0a19kcmFnX2JlZ2luKEdUS19XSURHRVQobV93ZWJWaWV3KSwgdGFyZ2V0TGlzdC5nZXQo KSwgZHJhZ09wZXJhdGlvblRvR2RrRHJhZ0FjdGlvbnMoY2xpcGJvYXJkLT5zb3VyY2VPcGVyYXRp b24oKSksIDEsIGN1cnJlbnRFdmVudC5nZXQoKSk7CiAgICAgd2ViVmlldy0+cHJpdi0+ZHJhZ2dp bmdEYXRhT2JqZWN0cy5zZXQoY29udGV4dCwgZGF0YU9iamVjdCk7CiAKKyAgICAvLyBBIGRyYWcg c3RhcnRpbmcgc2hvdWxkIHByZXZlbnQgYSBkb3VibGUtY2xpY2sgZnJvbSBoYXBwZW5pbmcuIFRo aXMgbWlnaHQKKyAgICAvLyBoYXBwZW4gaWYgYSBkcmFnIGlzIGZvbGxvd2VkIHZlcnkgcXVpY2ts eSBieSBhbm90aGVyIGNsaWNrIChsaWtlIGluIHRoZSBEUlQpLgorICAgIHdlYlZpZXctPnByaXYt PnByZXZpb3VzQ2xpY2tUaW1lID0gMDsKKwogICAgIGlmIChpbWFnZSkKICAgICAgICAgZ3RrX2Ry YWdfc2V0X2ljb25fcGl4YnVmKGNvbnRleHQsIGltYWdlLCBldmVudFBvcy54KCkgLSBkcmFnSW1h Z2VPcmlnaW4ueCgpLCBldmVudFBvcy55KCkgLSBkcmFnSW1hZ2VPcmlnaW4ueSgpKTsKICAgICBl bHNlCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRH dGsuY3BwCmluZGV4IDAyMTM3NGMwMzQ2ZDhkMjQ5NjU0Y2E4ZGQ4ZjhkOGI4ODYxYTE5ZTguLjE3 YTNjZDVmNGZjMjg4OGFjN2Q0OWQ5YWViYjViOWYwZTFiY2IyZGYgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC0xMTQ1LDYg KzExNDUsOSBAQCBzdGF0aWMgdm9pZCBwb3N0Q29tbWl0RnJhbWVWaWV3U2V0dXAoV2ViS2l0V2Vi RnJhbWUgKmZyYW1lLCBGcmFtZVZpZXcgKnZpZXcsIGJvbwogICAgICAgICBndGtfbWVudV9wb3Bk b3duKG1lbnUpOwogICAgICAgICBnX29iamVjdF91bnJlZihtZW51KTsKICAgICB9CisKKyAgICAv LyBEbyBub3QgYWxsb3cgY2xpY2sgY291bnRpbmcgYmV0d2VlbiBtYWluIGZyYW1lIGxvYWRzLgor ICAgIHByaXYtPnByZXZpb3VzQ2xpY2tUaW1lID0gMDsKIH0KIAogdm9pZCBGcmFtZUxvYWRlckNs aWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRnJvbUNhY2hlZEZyYW1lKENhY2hlZEZyYW1lKiBj YWNoZWRGcmFtZSkKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUu aCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAppbmRleCA0NGZmYzFlZGE2ZDVm OTgzZDMyMGZhNTYyZjU0YjUxYTY1NjViNzRkLi41NTY2NDhkOGZlYmYwNTgyOGY3ZGJhMzIxOTQ0 MWNlYjI4YmIxYjdkIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRl LmgKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCkBAIC01Niw2ICs1Niw3 IEBACiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiSW5z cGVjdG9yQ2xpZW50R3RrLmgiCisjaW5jbHVkZSAiSW50UG9pbnQuaCIKICNpbmNsdWRlICJGcmFt ZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlLmgiCiAjaW5jbHVkZSAi UmVzb3VyY2VSZXF1ZXN0LmgiCkBAIC0xNTIsNiArMTUzLDExIEBAIGV4dGVybiAiQyIgewogICAg ICAgICBHSGFzaFRhYmxlKiBzdWJSZXNvdXJjZXM7CiAgICAgICAgIGNoYXIqIHRvb2x0aXBUZXh0 OwogCisgICAgICAgIGludCBjdXJyZW50Q2xpY2tDb3VudDsKKyAgICAgICAgV2ViQ29yZTo6SW50 UG9pbnQqIHByZXZpb3VzQ2xpY2tQb2ludDsKKyAgICAgICAgZ3VpbnQgcHJldmlvdXNDbGlja0J1 dHRvbjsKKyAgICAgICAgZ3VpbnQzMiBwcmV2aW91c0NsaWNrVGltZTsKKwogICAgICAgICBIYXNo TWFwPEdka0RyYWdDb250ZXh0KiwgUmVmUHRyPFdlYkNvcmU6OkRhdGFPYmplY3RHdGs+ID4gZHJh Z2dpbmdEYXRhT2JqZWN0czsKICAgICB9OwogCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3Bw CmluZGV4IDY3NDQ3MzJkZTU3ZDNhMGM5NzIzZTdiZmI3YjExYTAzM2Y1YzAzZjYuLjg5ZGY2OTg4 ZTYzZjQ2YTcyOGNmMzM5M2ZhM2UzOWNmYzY4YzViYTAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsv d2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl YnZpZXcuY3BwCkBAIC01ODcsMTYgKzU4NywyNSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dl Yl92aWV3X2tleV9yZWxlYXNlX2V2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEtleQog ICAgIHJldHVybiBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19wYXJlbnRfY2xhc3Mp LT5rZXlfcmVsZWFzZV9ldmVudCh3aWRnZXQsIGV2ZW50KTsKIH0KIAotc3RhdGljIGdib29sZWFu IHdlYmtpdF93ZWJfdmlld19idXR0b25fcHJlc3NfZXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdk a0V2ZW50QnV0dG9uKiBldmVudCkKK3N0YXRpYyBndWludDMyIGdldEV2ZW50VGltZShHZGtFdmVu dCogZXZlbnQpCiB7Ci0gICAgLy8gRXZlbnR1YWxseSBpdCBtYXkgbWFrZSBzZW5zZSBmb3IgdGhl c2UgdG8gYmUgcGVyLXZpZXcgYW5kIHBlci1kZXZpY2UsCi0gICAgLy8gYnV0IGF0IHRoaXMgdGlt ZSB0aGUgaW1wbGVtZW50YXRpb24gbWF0Y2hlcyB0aGUgV2luZG93cyBwb3J0LgotICAgIHN0YXRp YyBpbnQgY3VycmVudENsaWNrQ291bnQgPSAxOwotICAgIHN0YXRpYyBJbnRQb2ludCBwcmV2aW91 c1BvaW50OwotICAgIHN0YXRpYyBndWludCBwcmV2aW91c0J1dHRvbjsKLSAgICBzdGF0aWMgZ3Vp bnQzMiBwcmV2aW91c1RpbWU7CisgICAgZ3VpbnQzMiB0aW1lID0gZ2RrX2V2ZW50X2dldF90aW1l KGV2ZW50KTsKKyAgICBpZiAodGltZSkKKyAgICAgICAgcmV0dXJuIHRpbWU7CisKKyAgICAvLyBS ZWFsIGV2ZW50cyBhbHdheXMgaGF2ZSBhIG5vbi16ZXJvIHRpbWUsIGJ1dCBldmVudHMgc3ludGhl c2l6ZWQKKyAgICAvLyBieSB0aGUgRFJUIGRvIG5vdCBhbmQgd2UgbXVzdCBjYWxjdWxhdGUgYSB0 aW1lIG1hbnVhbGx5LiBUaGlzIHRpbWUKKyAgICAvLyBpcyBub3QgY2FsY3VsYXRlZCBpbiB0aGUg RFJULCBiZWNhdXNlIEdUSysgZG9lcyBub3Qgd29yayB3ZWxsIHdpdGgKKyAgICAvLyBhbnl0aGlu ZyBvdGhlciB0aGFuIEdES19DVVJSRU5UX1RJTUUgb24gc3ludGhlc2l6ZWQgZXZlbnRzLgorICAg IEdUaW1lVmFsIHRpbWVWYWx1ZTsKKyAgICBnX2dldF9jdXJyZW50X3RpbWUoJnRpbWVWYWx1ZSk7 CisgICAgcmV0dXJuICh0aW1lVmFsdWUudHZfc2VjICogMTAwMCkgKyAodGltZVZhbHVlLnR2X3Vz ZWMgLyAxMDAwKTsKK30gCiAKK3N0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfYnV0dG9u X3ByZXNzX2V2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEJ1dHRvbiogZXZlbnQpCit7 CiAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3aWRnZXQpOwor ICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKIAogICAgIC8v IEZJWE1FOiBuZWVkIHRvIGtlZXAgdHJhY2sgb2Ygc3ViZnJhbWUgZm9jdXMgZm9yIGtleSBldmVu dHMKICAgICBndGtfd2lkZ2V0X2dyYWJfZm9jdXMod2lkZ2V0KTsKQEAgLTYyMCwyMCArNjI5LDIx IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfYnV0dG9uX3ByZXNzX2V2ZW50KEd0 a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEJ1CiAgICAgLy8gR1RLKyBvbmx5IGNvdW50cyB1cCB0 byB0cmlwbGUgY2xpY2tzLCBidXQgV2ViQ29yZSB3YW50cyB0byBrbm93IGFib3V0CiAgICAgLy8g cXVhZHJ1cGxlIGNsaWNrcywgcXVpbnR1cGxlIGNsaWNrcywgYWQgaW5maW5pdHVtLiBIZXJlLCB3 ZSByZXBsaWNhdGUgdGhlCiAgICAgLy8gR0RLIGxvZ2ljIGZvciBjb3VudGluZyBjbGlja3MuCisg ICAgZ3VpbnQzMiBldmVudFRpbWUgPSBnZXRFdmVudFRpbWUocmVpbnRlcnByZXRfY2FzdDxHZGtF dmVudCo+KGV2ZW50KSk7CiAgICAgaWYgKChldmVudC0+dHlwZSA9PSBHREtfMkJVVFRPTl9QUkVT UyB8fCBldmVudC0+dHlwZSA9PSBHREtfM0JVVFRPTl9QUkVTUykKLSAgICAgICAgfHwgKChhYnMo ZXZlbnQtPnggLSBwcmV2aW91c1BvaW50LngoKSkgPCBkb3VibGVDbGlja0Rpc3RhbmNlKQotICAg ICAgICAgICAgJiYgKGFicyhldmVudC0+eSAtIHByZXZpb3VzUG9pbnQueSgpKSA8IGRvdWJsZUNs aWNrRGlzdGFuY2UpCi0gICAgICAgICAgICAmJiAoZXZlbnQtPnRpbWUgLSBwcmV2aW91c1RpbWUg PCBzdGF0aWNfY2FzdDxndWludD4oZG91YmxlQ2xpY2tUaW1lKSkKLSAgICAgICAgICAgICYmIChl dmVudC0+YnV0dG9uID09IHByZXZpb3VzQnV0dG9uKSkpCi0gICAgICAgIGN1cnJlbnRDbGlja0Nv dW50Kys7CisgICAgICAgIHx8ICgoYWJzKGV2ZW50LT54IC0gcHJpdi0+cHJldmlvdXNDbGlja1Bv aW50LT54KCkpIDwgZG91YmxlQ2xpY2tEaXN0YW5jZSkKKyAgICAgICAgICAgICYmIChhYnMoZXZl bnQtPnkgLSBwcml2LT5wcmV2aW91c0NsaWNrUG9pbnQtPnkoKSkgPCBkb3VibGVDbGlja0Rpc3Rh bmNlKQorICAgICAgICAgICAgJiYgKGV2ZW50VGltZSAtIHByaXYtPnByZXZpb3VzQ2xpY2tUaW1l IDwgc3RhdGljX2Nhc3Q8Z3VpbnQ+KGRvdWJsZUNsaWNrVGltZSkpCisgICAgICAgICAgICAmJiAo ZXZlbnQtPmJ1dHRvbiA9PSBwcml2LT5wcmV2aW91c0NsaWNrQnV0dG9uKSkpCisgICAgICAgIHBy aXYtPmN1cnJlbnRDbGlja0NvdW50Kys7CiAgICAgZWxzZQotICAgICAgICBjdXJyZW50Q2xpY2tD b3VudCA9IDE7CisgICAgICAgIHByaXYtPmN1cnJlbnRDbGlja0NvdW50ID0gMTsKIAogICAgIFBs YXRmb3JtTW91c2VFdmVudCBwbGF0Zm9ybUV2ZW50KGV2ZW50KTsKLSAgICBwbGF0Zm9ybUV2ZW50 LnNldENsaWNrQ291bnQoY3VycmVudENsaWNrQ291bnQpOwotICAgIHByZXZpb3VzUG9pbnQgPSBw bGF0Zm9ybUV2ZW50LnBvcygpOwotICAgIHByZXZpb3VzQnV0dG9uID0gZXZlbnQtPmJ1dHRvbjsK LSAgICBwcmV2aW91c1RpbWUgPSBldmVudC0+dGltZTsKKyAgICBwbGF0Zm9ybUV2ZW50LnNldENs aWNrQ291bnQocHJpdi0+Y3VycmVudENsaWNrQ291bnQpOworICAgICpwcml2LT5wcmV2aW91c0Ns aWNrUG9pbnQgPSBwbGF0Zm9ybUV2ZW50LnBvcygpOworICAgIHByaXYtPnByZXZpb3VzQ2xpY2tC dXR0b24gPSBldmVudC0+YnV0dG9uOworICAgIHByaXYtPnByZXZpb3VzQ2xpY2tUaW1lID0gZXZl bnRUaW1lOwogCiAgICAgaWYgKGV2ZW50LT5idXR0b24gPT0gMykKICAgICAgICAgcmV0dXJuIHdl YmtpdF93ZWJfdmlld19mb3J3YXJkX2NvbnRleHRfbWVudV9ldmVudCh3ZWJWaWV3LCBQbGF0Zm9y bU1vdXNlRXZlbnQoZXZlbnQpKTsKQEAgLTExODQsNiArMTE5NCw4IEBAIHN0YXRpYyB2b2lkIHdl YmtpdF93ZWJfdmlld19maW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCiAgICAgZ19mcmVlKHByaXYt PmN1c3RvbUVuY29kaW5nKTsKICAgICBnX2ZyZWUocHJpdi0+aWNvblVSSSk7CiAKKyAgICBkZWxl dGUgcHJpdi0+cHJldmlvdXNDbGlja1BvaW50OworCiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0 X3dlYl92aWV3X3BhcmVudF9jbGFzcyktPmZpbmFsaXplKG9iamVjdCk7CiB9CiAKQEAgLTI5MDAs NiArMjkxMiwxMCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfaW5pdChXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3KQogICAgIHByaXYtPnN1YlJlc291cmNlcyA9IGdfaGFzaF90YWJsZV9uZXdf ZnVsbChnX3N0cl9oYXNoLCBnX3N0cl9lcXVhbCwgZ19mcmVlLCBnX29iamVjdF91bnJlZik7CiAK ICAgICBwcml2LT50b29sdGlwVGV4dCA9IDA7CisgICAgcHJpdi0+Y3VycmVudENsaWNrQ291bnQg PSAwOworICAgIHByaXYtPnByZXZpb3VzQ2xpY2tQb2ludCA9IG5ldyBJbnRQb2ludCgwLCAwKTsK KyAgICBwcml2LT5wcmV2aW91c0NsaWNrQnV0dG9uID0gMDsKKyAgICBwcml2LT5wcmV2aW91c0Ns aWNrVGltZSA9IDA7CiB9CiAKIEd0a1dpZGdldCogd2Via2l0X3dlYl92aWV3X25ldyh2b2lkKQpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9n CmluZGV4IDM1MjZlMmQ5ODM1NGRkMTllOTNiNDczZDU1YzI0N2YzZjAwZDE1N2UuLmQzNGQ2MDYx NDFmNzlmMDEwNmVlZjNiNjg2YzgyMTU5YTA5OTBkMDMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxMC0wNi0xNCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUmVtb3Zl IHRoZSBhYnVzZSBvZiBHREtfQ1VSUkVOVF9USU1FIGluIHRoZSBEUlQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNjAwCisKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwOgorICAgICAgICAocHJlcGFyZU1vdXNlQnV0 dG9uRXZlbnQpOiBSZW1vdmUgbG9naWMgYWRkaW5nIGFuIG9mZnNldCB0byBHREtfQ1VSUkVOVF9U SU1FLgorCiAyMDEwLTA2LTE0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgog CiAgICAgICAgIENocm9taXVtIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwCmluZGV4IGYzNzk5ZmI2ODJlMmUxYTlmZmVlZWUyZjcw ZWJiMmEzYjVmMjg1NDIuLmE3YWRlZTA3MDEyMTA1OWI0NDVjMGM4ZDE2ZmEyNmRhNmYwYjJhMTYg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5j cHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcApA QCAtMTQ4LDEyICsxNDgsNyBAQCBib29sIHByZXBhcmVNb3VzZUJ1dHRvbkV2ZW50KEdka0V2ZW50 KiBldmVudCwgaW50IGV2ZW50U2VuZGVyQnV0dG9uTnVtYmVyKQogICAgIGV2ZW50LT5idXR0b24u d2luZG93ID0gR1RLX1dJREdFVCh2aWV3KS0+d2luZG93OwogICAgIGV2ZW50LT5idXR0b24uZGV2 aWNlID0gZ2RrX2RldmljZV9nZXRfY29yZV9wb2ludGVyKCk7CiAgICAgZXZlbnQtPmJ1dHRvbi5z dGF0ZSA9IGdldFN0YXRlRmxhZ3MoKTsKLQotICAgIC8vIE1vdXNlIHVwICYgZG93biBldmVudHMg ZGlzcGF0Y2hlZCB2aWEgZ19zaWduYWxfZW1pdF9ieV9uYW1lIG11c3Qgb2Zmc2V0Ci0gICAgLy8g dGhlaXIgdGltZSB2YWx1ZSwgc28gdGhhdCBXZWJLaXQgY2FuIGRldGVjdCB3aGVyZSBzZXF1ZW5j ZXMgb2YgbW91c2UKLSAgICAvLyBjbGlja3MgYmVnaW4gYW5kIGVuZC4gVGhpcyBzaG91bGQgbm90 IGludGVyZmVyZSB3aXRoIEdESyBvciBHVEsrIGV2ZW50Ci0gICAgLy8gcHJvY2Vzc2luZywgYmVj YXVzZSB0aGUgZXZlbnQgaXMgb25seSBzZWVuIGJ5IHRoZSB3aWRnZXQuCi0gICAgZXZlbnQtPmJ1 dHRvbi50aW1lID0gR0RLX0NVUlJFTlRfVElNRSArIHRpbWVPZmZzZXQ7CisgICAgZXZlbnQtPmJ1 dHRvbi50aW1lID0gR0RLX0NVUlJFTlRfVElNRTsKIAogICAgIGludCB4Um9vdCwgeVJvb3Q7CiAj aWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTcsIDMpCg==