17980 2008-03-20 23:38:34 -0700 REGRESSION (r31177): Inspector highlighting of webpage not cleared when going to new URL 2008-03-21 09:39:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED Regression P1 Normal --- 1 gsherloc timothy aroben timothy oldest_to_newest 74605 0 gsherloc 2008-03-20 23:38:34 -0700 Steps to reproduce: 1. Go to any webpage, right click and Inspect Element. 2. Arrange windows to make Inspector and web page both visible. 3. Select DOM node, so corresponding part of web page is highlighted 4. Switch to web page, and go to new url (e.g. clicking on link). Expected results: Highlighting on page will clear Actual Results: Highlighting on page persists Regression: Not present in Safari 3.1, present in r31201. Tested on 10.5.2 on dual G5 74606 1 gsherloc 2008-03-20 23:41:16 -0700 I should also note that you can resize the webpage, and the highlighting will stay where it is, even to the point that it can no longer overlap the page that it was originally highlighting. 74626 2 aroben 2008-03-21 07:41:04 -0700 I can't reproduce this in ToT on Windows. Maybe it's a Mac-only issue? I think Tim was seeing something similar. 74631 3 timothy 2008-03-21 07:59:16 -0700 I know what caused this. When the drawing code was moved to WebCore the fade value is ignored in WebNodeHighlightView. We should just remove the fade. 74634 4 19927 timothy 2008-03-21 08:48:19 -0700 Created attachment 19927 Patch WebKit/mac/ChangeLog | 28 ++++++++ WebKit/mac/WebCoreSupport/WebInspectorClient.mm | 25 +++----- WebKit/mac/WebInspector/WebNodeHighlight.h | 14 +--- WebKit/mac/WebInspector/WebNodeHighlight.m | 77 +++-------------------- WebKit/mac/WebInspector/WebNodeHighlightView.h | 8 --- WebKit/mac/WebInspector/WebNodeHighlightView.m | 28 ++------- 6 files changed, 53 insertions(+), 127 deletions(-) 74635 5 19927 aroben 2008-03-21 08:50:39 -0700 Comment on attachment 19927 Patch 11 how just detaches when it is hidden. Typo: how -> now r=me 74644 6 timothy 2008-03-21 09:39:23 -0700 Landed in r31209. 19927 2008-03-21 08:48:19 -0700 2008-03-21 08:50:39 -0700 Patch 0001-Bug-17980-Regression-Inspector-highlightin.patch text/plain 13778 timothy RnJvbSAzNTA3OGRjOTBmM2I1ZTM1NmYzYzU2MjI1YWJiYmUzMGY0NTBmNTBmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBGcmksIDIxIE1hciAyMDA4IDA4OjQ2OjA2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gICAg ICAgICBCdWcgMTc5ODA6IFJlZ3Jlc3Npb246IEluc3BlY3RvciBoaWdobGlnaHRpbmcgb2Ygd2Vi cGFnZSBub3QgY2xlYXJlZCB3aGVuIGdvaW5nIHRvIG5ldyBVUkwKICAgICAgICAgaHR0cDovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5ODAKCiAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgogICAgICAgIFRoZSBuZXcgaGlnaGxpZ2h0IGRyYXdpbmcgd2FzIG5v dCBob25vcmluZyB0aGUgZmFkZSB2YWx1ZSwgc28gaXQgd2FzCiAgICAgICAgYWx3YXlzIGRyYXdp bmcgYXQgZnVsbCBvcGFjaXR5LiBUaGUgYW5pbWF0aW9uIGNvZGUgZGlkbid0IG1hdGNoIFdpbmRv d3MKICAgICAgICBhbmQgdGhlIG5ldyBoaWdobGlnaHQgYW55d2F5LCBzbyBpdCBoYXMgYmVlbiBy ZW1vdmVkLiBUaGUgaGlnaGxpZ2h0CiAgICAgICAgaG93IGp1c3QgZGV0YWNoZXMgd2hlbiBpdCBp cyBoaWRkZW4uCgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1t OgogICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgd2luZG93U2hvdWxkQ2xv c2U6XSk6IENhbGwgaGlkZUhpZ2hsaWdodC4KICAgICAgICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dD b250cm9sbGVyIGNsb3NlXSk6IERpdHRvLgogICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0Nv bnRyb2xsZXIgaGlnaGxpZ2h0Tm9kZTpdKTogQ2FsbCBhdHRhY2guCiAgICAgICAgKC1bV2ViSW5z cGVjdG9yV2luZG93Q29udHJvbGxlciBoaWRlSGlnaGxpZ2h0XSk6IENhbGwgZGV0YWNoIGFuZCBy ZWxlYXNlIF9jdXJyZW50SGlnaGxpZ2h0LgogICAgICAgICogV2ViSW5zcGVjdG9yL1dlYk5vZGVI aWdobGlnaHQuaDoKICAgICAgICAqIFdlYkluc3BlY3Rvci9XZWJOb2RlSGlnaGxpZ2h0Lm06CiAg ICAgICAgKC1bV2ViTm9kZUhpZ2hsaWdodCBpbml0V2l0aFRhcmdldFZpZXc6aW5zcGVjdG9yQ29u dHJvbGxlcjpdKToKICAgICAgICAoLVtXZWJOb2RlSGlnaGxpZ2h0IGRlYWxsb2NdKTogQXNzZXJ0 IHdlIGhhdmUgbm8gX2hpZ2hsaWdodFZpZXcuCiAgICAgICAgKC1bV2ViTm9kZUhpZ2hsaWdodCBh dHRhY2hdKTogUmVuYW1lZCBmcm9tIGF0dGFjaEhpZ2hsaWdodC4KICAgICAgICAoLVtXZWJOb2Rl SGlnaGxpZ2h0IGRldGFjaF0pOiBSZW5hbWVkIGZyb20gZGV0YWNoSGlnaGxpZ2h0LgogICAgICAg ICgtW1dlYk5vZGVIaWdobGlnaHQgc2V0TmVlZHNVcGRhdGVJblRhcmdldFZpZXdSZWN0Ol0pOiBS ZW5hbWVkIGZyb20gc2V0SG9sZXNOZWVkVXBkYXRlSW5UYXJnZXRWaWV3UmVjdDouCiAgICAgICAg KiBXZWJJbnNwZWN0b3IvV2ViTm9kZUhpZ2hsaWdodFZpZXcuaDoKICAgICAgICAqIFdlYkluc3Bl Y3Rvci9XZWJOb2RlSGlnaGxpZ2h0Vmlldy5tOgogICAgICAgICgtW1dlYk5vZGVIaWdobGlnaHRW aWV3IHNldE5lZWRzRGlzcGxheUluUmVjdDpdKTogUmVuYW1lZCBmcm9tIHNldEhvbGVzTmVlZFVw ZGF0ZUluUmVjdDouCi0tLQogV2ViS2l0L21hYy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDI4ICsrKysrKysrCiBXZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5tbSB8ICAgMjUgKysrLS0tLS0KIFdlYktpdC9tYWMvV2ViSW5zcGVjdG9y L1dlYk5vZGVIaWdobGlnaHQuaCAgICAgIHwgICAxNCArLS0tCiBXZWJLaXQvbWFjL1dlYkluc3Bl Y3Rvci9XZWJOb2RlSGlnaGxpZ2h0Lm0gICAgICB8ICAgNzcgKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0KIFdlYktpdC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3LmggIHwgICAg OCAtLS0KIFdlYktpdC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3Lm0gIHwg ICAyOCArKy0tLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgMTI3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKaW5kZXggYTgzNmU3Yi4uZDM3ZWYwNiAxMDA2NDQKLS0tIGEvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAor MjAwOC0wMy0yMSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKKyAgICAg ICAgQnVnIDE3OTgwOiBSZWdyZXNzaW9uOiBJbnNwZWN0b3IgaGlnaGxpZ2h0aW5nIG9mIHdlYnBh Z2Ugbm90IGNsZWFyZWQgd2hlbiBnb2luZyB0byBuZXcgVVJMCisgICAgICAgIGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG5ldyBoaWdobGlnaHQgZHJhd2luZyB3YXMg bm90IGhvbm9yaW5nIHRoZSBmYWRlIHZhbHVlLCBzbyBpdCB3YXMKKyAgICAgICAgYWx3YXlzIGRy YXdpbmcgYXQgZnVsbCBvcGFjaXR5LiBUaGUgYW5pbWF0aW9uIGNvZGUgZGlkbid0IG1hdGNoIFdp bmRvd3MKKyAgICAgICAgYW5kIHRoZSBuZXcgaGlnaGxpZ2h0IGFueXdheSwgc28gaXQgaGFzIGJl ZW4gcmVtb3ZlZC4gVGhlIGhpZ2hsaWdodAorICAgICAgICBob3cganVzdCBkZXRhY2hlcyB3aGVu IGl0IGlzIGhpZGRlbi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNs aWVudC5tbToKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciB3aW5kb3dT aG91bGRDbG9zZTpdKTogQ2FsbCBoaWRlSGlnaGxpZ2h0LgorICAgICAgICAoLVtXZWJJbnNwZWN0 b3JXaW5kb3dDb250cm9sbGVyIGNsb3NlXSk6IERpdHRvLgorICAgICAgICAoLVtXZWJJbnNwZWN0 b3JXaW5kb3dDb250cm9sbGVyIGhpZ2hsaWdodE5vZGU6XSk6IENhbGwgYXR0YWNoLgorICAgICAg ICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyIGhpZGVIaWdobGlnaHRdKTogQ2FsbCBk ZXRhY2ggYW5kIHJlbGVhc2UgX2N1cnJlbnRIaWdobGlnaHQuCisgICAgICAgICogV2ViSW5zcGVj dG9yL1dlYk5vZGVIaWdobGlnaHQuaDoKKyAgICAgICAgKiBXZWJJbnNwZWN0b3IvV2ViTm9kZUhp Z2hsaWdodC5tOgorICAgICAgICAoLVtXZWJOb2RlSGlnaGxpZ2h0IGluaXRXaXRoVGFyZ2V0Vmll dzppbnNwZWN0b3JDb250cm9sbGVyOl0pOgorICAgICAgICAoLVtXZWJOb2RlSGlnaGxpZ2h0IGRl YWxsb2NdKTogQXNzZXJ0IHdlIGhhdmUgbm8gX2hpZ2hsaWdodFZpZXcuCisgICAgICAgICgtW1dl Yk5vZGVIaWdobGlnaHQgYXR0YWNoXSk6IFJlbmFtZWQgZnJvbSBhdHRhY2hIaWdobGlnaHQuCisg ICAgICAgICgtW1dlYk5vZGVIaWdobGlnaHQgZGV0YWNoXSk6IFJlbmFtZWQgZnJvbSBkZXRhY2hI aWdobGlnaHQuCisgICAgICAgICgtW1dlYk5vZGVIaWdobGlnaHQgc2V0TmVlZHNVcGRhdGVJblRh cmdldFZpZXdSZWN0Ol0pOiBSZW5hbWVkIGZyb20gc2V0SG9sZXNOZWVkVXBkYXRlSW5UYXJnZXRW aWV3UmVjdDouCisgICAgICAgICogV2ViSW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3Lmg6 CisgICAgICAgICogV2ViSW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3Lm06CisgICAgICAg ICgtW1dlYk5vZGVIaWdobGlnaHRWaWV3IHNldE5lZWRzRGlzcGxheUluUmVjdDpdKTogUmVuYW1l ZCBmcm9tIHNldEhvbGVzTmVlZFVwZGF0ZUluUmVjdDouCisKIDIwMDgtMDMtMjAgIEFkYW0gUm9i ZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgV2ViTm9kZUhpZ2hsaWdodFZp ZXcgdXNlIEluc3BlY3RvckNvbnRyb2xsZXIgdG8gZG8gaXRzIHBhaW50aW5nCmRpZmYgLS1naXQg YS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbSBiL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCmluZGV4IDZmYzNjNzYu LjFjNjU4NGIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVj dG9yQ2xpZW50Lm1tCisrKyBiL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9y Q2xpZW50Lm1tCkBAIC0yMDAsNiArMjAwLDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OnVw ZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3QKIAogLSAodm9pZClkZWFsbG9jCiB7CisgICAgQVNTRVJU KCFfY3VycmVudEhpZ2hsaWdodCk7CiAgICAgW19zaGFkb3dWaWV3IHJlbGVhc2VdOwogICAgIFtf d2ViVmlldyByZWxlYXNlXTsKICAgICBbc3VwZXIgZGVhbGxvY107CkBAIC0yNTQsMTAgKzI1NSw3 IEBAIHZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiAK ICAgICBbX2luc3BlY3RlZFdlYlZpZXcgcGFnZV0tPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c2V0 V2luZG93VmlzaWJsZShmYWxzZSk7CiAKLSAgICBbX2N1cnJlbnRIaWdobGlnaHQgZGV0YWNoSGln aGxpZ2h0XTsKLSAgICBbX2N1cnJlbnRIaWdobGlnaHQgc2V0RGVsZWdhdGU6bmlsXTsKLSAgICBb X2N1cnJlbnRIaWdobGlnaHQgcmVsZWFzZV07Ci0gICAgX2N1cnJlbnRIaWdobGlnaHQgPSBuaWw7 CisgICAgW3NlbGYgaGlkZUhpZ2hsaWdodF07CiAKICAgICByZXR1cm4gWUVTOwogfQpAQCAtMjcx LDEyICsyNjksOCBAQCB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6dXBkYXRlV2luZG93VGl0bGUo KSBjb25zdAogCiAgICAgW19pbnNwZWN0ZWRXZWJWaWV3IHBhZ2VdLT5pbnNwZWN0b3JDb250cm9s bGVyKCktPnNldFdpbmRvd1Zpc2libGUoZmFsc2UpOwogCi0gICAgaWYgKCFfbW92aW5nV2luZG93 cykgewotICAgICAgICBbX2N1cnJlbnRIaWdobGlnaHQgZGV0YWNoSGlnaGxpZ2h0XTsKLSAgICAg ICAgW19jdXJyZW50SGlnaGxpZ2h0IHNldERlbGVnYXRlOm5pbF07Ci0gICAgICAgIFtfY3VycmVu dEhpZ2hsaWdodCByZWxlYXNlXTsKLSAgICAgICAgX2N1cnJlbnRIaWdobGlnaHQgPSBuaWw7Ci0g ICAgfQorICAgIGlmICghX21vdmluZ1dpbmRvd3MpCisgICAgICAgIFtzZWxmIGhpZGVIaWdobGln aHRdOwogCiAgICAgaWYgKF9hdHRhY2hlZFRvSW5zcGVjdGVkV2ViVmlldykgewogICAgICAgICBp ZiAoW19pbnNwZWN0ZWRXZWJWaWV3IF9pc0Nsb3NlZF0pCkBAIC00NzAsMjAgKzQ2NCwxOSBAQCB2 b2lkIFdlYkluc3BlY3RvckNsaWVudDo6dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdAogICAgIGlm ICghX2N1cnJlbnRIaWdobGlnaHQpIHsKICAgICAgICAgX2N1cnJlbnRIaWdobGlnaHQgPSBbW1dl Yk5vZGVIaWdobGlnaHQgYWxsb2NdIGluaXRXaXRoVGFyZ2V0Vmlldzp2aWV3IGluc3BlY3RvckNv bnRyb2xsZXI6W19pbnNwZWN0ZWRXZWJWaWV3IHBhZ2VdLT5pbnNwZWN0b3JDb250cm9sbGVyKCld OwogICAgICAgICBbX2N1cnJlbnRIaWdobGlnaHQgc2V0RGVsZWdhdGU6c2VsZl07Ci0gICAgICAg IFtfY3VycmVudEhpZ2hsaWdodCBhdHRhY2hIaWdobGlnaHRdOworICAgICAgICBbX2N1cnJlbnRI aWdobGlnaHQgYXR0YWNoXTsKICAgICB9CiAKLSAgICBbX2N1cnJlbnRIaWdobGlnaHQgc2hvd107 Ci0KICAgICAvLyBGSVhNRTogdGhpcyBpcyBhIGhhY2sgdW50aWwgd2UgaG9vayB1cCBhIGRpZERy YXcgYW5kIGRpZFNjcm9sbCBjYWxsIGluIFdlYkhUTUxWaWV3CiAgICAgW1tfY3VycmVudEhpZ2hs aWdodCBoaWdobGlnaHRWaWV3XSBzZXROZWVkc0Rpc3BsYXk6WUVTXTsKIH0KIAogLSAodm9pZClo aWRlSGlnaGxpZ2h0CiB7Ci0gICAgaWYgKCFfY3VycmVudEhpZ2hsaWdodCkKLSAgICAgICAgcmV0 dXJuOwotICAgIFtfY3VycmVudEhpZ2hsaWdodCBoaWRlXTsKKyAgICBbX2N1cnJlbnRIaWdobGln aHQgZGV0YWNoXTsKKyAgICBbX2N1cnJlbnRIaWdobGlnaHQgc2V0RGVsZWdhdGU6bmlsXTsKKyAg ICBbX2N1cnJlbnRIaWdobGlnaHQgcmVsZWFzZV07CisgICAgX2N1cnJlbnRIaWdobGlnaHQgPSBu aWw7CiB9CiAKICNwcmFnbWEgbWFyayAtCmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL1dlYkluc3Bl Y3Rvci9XZWJOb2RlSGlnaGxpZ2h0LmggYi9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9XZWJOb2Rl SGlnaGxpZ2h0LmgKaW5kZXggYThlODc0OC4uMWViMjc3YSAxMDA2NDQKLS0tIGEvV2ViS2l0L21h Yy9XZWJJbnNwZWN0b3IvV2ViTm9kZUhpZ2hsaWdodC5oCisrKyBiL1dlYktpdC9tYWMvV2ViSW5z cGVjdG9yL1dlYk5vZGVIaWdobGlnaHQuaApAQCAtMzYsNyArMzYsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgTlNWaWV3ICpfdGFyZ2V0VmlldzsKICAgICBOU1dpbmRvdyAqX2hpZ2hsaWdo dFdpbmRvdzsKICAgICBXZWJOb2RlSGlnaGxpZ2h0VmlldyAqX2hpZ2hsaWdodFZpZXc7Ci0gICAg TlNBbmltYXRpb24gKl9mYWRlSW5BbmltYXRpb247CiAgICAgV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlciogX2luc3BlY3RvckNvbnRyb2xsZXI7CiAgICAgaWQgX2RlbGVnYXRlOwogfQpAQCAt NDUsMjIgKzQ0LDE1IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIC0gKHZvaWQpc2V0RGVsZWdhdGU6 KGlkKWRlbGVnYXRlOwogLSAoaWQpZGVsZWdhdGU7CiAKLS0gKHZvaWQpYXR0YWNoSGlnaGxpZ2h0 OwotLSAodm9pZClkZXRhY2hIaWdobGlnaHQ7Ci0KLS0gKHZvaWQpc2hvdzsKLS0gKHZvaWQpaGlk ZTsKKy0gKHZvaWQpYXR0YWNoOworLSAodm9pZClkZXRhY2g7CiAKIC0gKE5TVmlldyAqKXRhcmdl dFZpZXc7CiAtIChXZWJOb2RlSGlnaGxpZ2h0VmlldyAqKWhpZ2hsaWdodFZpZXc7CiAKIC0gKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXIqKWluc3BlY3RvckNvbnRyb2xsZXI7CiAKLS8vIENv bnRyb2xzIHdoZXRoZXIgbW91c2UgZXZlbnRzIGFyZSBpZ25vcmVkIChwYXNzZWQgdG8gdW5kZXJs eWluZyB2aWV3KS4gQnkgZGVmYXVsdCBtb3VzZSBldmVudHMgYXJlIGlnbm9yZWQuCi0tIChCT09M KWlnbm9yZXNNb3VzZUV2ZW50czsKLS0gKHZvaWQpc2V0SWdub3Jlc01vdXNlRXZlbnRzOihCT09M KW5ld1ZhbHVlOwotCi0tICh2b2lkKXNldEhvbGVzTmVlZFVwZGF0ZUluVGFyZ2V0Vmlld1JlY3Q6 KE5TUmVjdClyZWN0OworLSAodm9pZClzZXROZWVkc1VwZGF0ZUluVGFyZ2V0Vmlld1JlY3Q6KE5T UmVjdClyZWN0OwogQGVuZAogCiBAaW50ZXJmYWNlIE5TT2JqZWN0IChXZWJOb2RlSGlnaGxpZ2h0 RGVsZWdhdGUpCmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9XZWJOb2RlSGln aGxpZ2h0Lm0gYi9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9XZWJOb2RlSGlnaGxpZ2h0Lm0KaW5k ZXggNjNiYTM1ZC4uODJlMDlmMSAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9XZWJJbnNwZWN0b3Iv V2ViTm9kZUhpZ2hsaWdodC5tCisrKyBiL1dlYktpdC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5vZGVI aWdobGlnaHQubQpAQCAtMzUsMjUgKzM1LDkgQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7 CiAKLSNkZWZpbmUgRkFERV9BTklNQVRJT05fRFVSQVRJT04gMC4yCi0KLUBpbnRlcmZhY2UgV2Vi Tm9kZUhpZ2hsaWdodEZhZGVJbkFuaW1hdGlvbiA6IE5TQW5pbWF0aW9uCi1AZW5kCi0KIEBpbnRl cmZhY2UgV2ViTm9kZUhpZ2hsaWdodCAoRmlsZUludGVybmFsKQogLSAoTlNSZWN0KV9jb21wdXRl SGlnaGxpZ2h0V2luZG93RnJhbWU7CiAtICh2b2lkKV9yZXBvc2l0aW9uSGlnaGxpZ2h0V2luZG93 OwotLSAodm9pZClfYW5pbWF0ZUZhZGVJbjooV2ViTm9kZUhpZ2hsaWdodEZhZGVJbkFuaW1hdGlv biAqKWFuaW1hdGlvbjsKLUBlbmQKLQotQGltcGxlbWVudGF0aW9uIFdlYk5vZGVIaWdobGlnaHRG YWRlSW5BbmltYXRpb24KLQotLSAodm9pZClzZXRDdXJyZW50UHJvZ3Jlc3M6KE5TQW5pbWF0aW9u UHJvZ3Jlc3MpcHJvZ3Jlc3MKLXsKLSAgICBbc3VwZXIgc2V0Q3VycmVudFByb2dyZXNzOnByb2dy ZXNzXTsKLSAgICBbKFdlYk5vZGVIaWdobGlnaHQgKilbc2VsZiBkZWxlZ2F0ZV0gX2FuaW1hdGVG YWRlSW46c2VsZl07Ci19Ci0KIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdlYk5vZGVIaWdobGln aHQKQEAgLTc2LDcgKzYwLDYgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgW19oaWdo bGlnaHRXaW5kb3cgc2V0UmVsZWFzZWRXaGVuQ2xvc2VkOk5PXTsKIAogICAgIF9oaWdobGlnaHRW aWV3ID0gW1tXZWJOb2RlSGlnaGxpZ2h0VmlldyBhbGxvY10gaW5pdFdpdGhXZWJOb2RlSGlnaGxp Z2h0OnNlbGZdOwotICAgIFtfaGlnaGxpZ2h0VmlldyBzZXRGcmFjdGlvbkZhZGVkSW46MC4wXTsK ICAgICBbX2hpZ2hsaWdodFdpbmRvdyBzZXRDb250ZW50VmlldzpfaGlnaGxpZ2h0Vmlld107CiAg ICAgW19oaWdobGlnaHRWaWV3IHJlbGVhc2VdOwogCkBAIC04NSwyNiArNjgsMjIgQEAgdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKIC0gKHZvaWQpZGVhbGxvYwogewotICAgIC8vIEZJWE1FOiBC YWQgdG8gZG8gYWxsIHRoaXMgd29yayBpbiBkZWFsbG9jLiBXaGF0IGFib3V0IHVuZGVyIEdDPwot Ci0gICAgW3NlbGYgZGV0YWNoSGlnaGxpZ2h0XTsKLQogICAgIEFTU0VSVCghX2hpZ2hsaWdodFdp bmRvdyk7CiAgICAgQVNTRVJUKCFfdGFyZ2V0Vmlldyk7Ci0KLSAgICBbX2ZhZGVJbkFuaW1hdGlv biBzZXREZWxlZ2F0ZTpuaWxdOwotICAgIFtfZmFkZUluQW5pbWF0aW9uIHN0b3BBbmltYXRpb25d OwotICAgIFtfZmFkZUluQW5pbWF0aW9uIHJlbGVhc2VdOworICAgIEFTU0VSVCghX2hpZ2hsaWdo dFZpZXcpOwogCiAgICAgW3N1cGVyIGRlYWxsb2NdOwogfQogCi0tICh2b2lkKWF0dGFjaEhpZ2hs aWdodAorLSAodm9pZClhdHRhY2gKIHsKICAgICBBU1NFUlQoX3RhcmdldFZpZXcpOwogICAgIEFT U0VSVChbX3RhcmdldFZpZXcgd2luZG93XSk7CiAgICAgQVNTRVJUKF9oaWdobGlnaHRXaW5kb3cp OwogCisgICAgaWYgKCFfaGlnaGxpZ2h0V2luZG93IHx8ICFfdGFyZ2V0VmlldyB8fCAhW190YXJn ZXRWaWV3IHdpbmRvd10pCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIERpc2FibGUgc2NyZWVu IHVwZGF0ZXMgc28gdGhlIGhpZ2hsaWdodCBtb3ZlcyBpbiBzeW5jIHdpdGggdGhlIHZpZXcuCiAg ICAgW1tfdGFyZ2V0VmlldyB3aW5kb3ddIGRpc2FibGVTY3JlZW5VcGRhdGVzVW50aWxGbHVzaF07 CiAgICAgW1tfdGFyZ2V0VmlldyB3aW5kb3ddIGFkZENoaWxkV2luZG93Ol9oaWdobGlnaHRXaW5k b3cgb3JkZXJlZDpOU1dpbmRvd0Fib3ZlXTsKQEAgLTEyOCw3ICsxMDcsNyBAQCB1c2luZyBuYW1l c3BhY2UgV2ViQ29yZTsKICAgICByZXR1cm4gX2RlbGVnYXRlOwogfQogCi0tICh2b2lkKWRldGFj aEhpZ2hsaWdodAorLSAodm9pZClkZXRhY2gKIHsKICAgICBpZiAoIV9oaWdobGlnaHRXaW5kb3cp IHsKICAgICAgICAgQVNTRVJUKCFfdGFyZ2V0Vmlldyk7CkBAIC0xNTksMzUgKzEzOCw2IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAgIF9oaWdobGlnaHRWaWV3ID0gbmlsOwogfQogCi0t ICh2b2lkKXNob3cKLXsKLSAgICBpZiAoX2ZhZGVJbkFuaW1hdGlvbiB8fCBbX2hpZ2hsaWdodFZp ZXcgZnJhY3Rpb25GYWRlZEluXSA9PSAxLjApCi0gICAgICAgIHJldHVybjsKLQotICAgIF9mYWRl SW5BbmltYXRpb24gPSBbW1dlYk5vZGVIaWdobGlnaHRGYWRlSW5BbmltYXRpb24gYWxsb2NdIGlu aXRXaXRoRHVyYXRpb246RkFERV9BTklNQVRJT05fRFVSQVRJT04gYW5pbWF0aW9uQ3VydmU6TlNB bmltYXRpb25FYXNlSW5PdXRdOwotICAgIFtfZmFkZUluQW5pbWF0aW9uIHNldEFuaW1hdGlvbkJs b2NraW5nTW9kZTpOU0FuaW1hdGlvbk5vbmJsb2NraW5nXTsKLSAgICBbX2ZhZGVJbkFuaW1hdGlv biBzZXREZWxlZ2F0ZTpzZWxmXTsKLSAgICBbX2ZhZGVJbkFuaW1hdGlvbiBzdGFydEFuaW1hdGlv bl07Ci19Ci0KLS0gKHZvaWQpaGlkZQotewotICAgIFtfaGlnaGxpZ2h0VmlldyBzZXRGcmFjdGlv bkZhZGVkSW46MC4wXTsKLX0KLQotLSAodm9pZClhbmltYXRpb25EaWRFbmQ6KE5TQW5pbWF0aW9u ICopYW5pbWF0aW9uCi17Ci0gICAgQVNTRVJUKGFuaW1hdGlvbiA9PSBfZmFkZUluQW5pbWF0aW9u KTsKLSAgICBbX2ZhZGVJbkFuaW1hdGlvbiByZWxlYXNlXTsKLSAgICBfZmFkZUluQW5pbWF0aW9u ID0gbmlsOwotfQotCi0tIChCT09MKWlnbm9yZXNNb3VzZUV2ZW50cwotewotICAgIEFTU0VSVChf aGlnaGxpZ2h0V2luZG93KTsKLSAgICByZXR1cm4gW19oaWdobGlnaHRXaW5kb3cgaWdub3Jlc01v dXNlRXZlbnRzXTsKLX0KLQogLSAoV2ViTm9kZUhpZ2hsaWdodFZpZXcgKiloaWdobGlnaHRWaWV3 CiB7CiAgICAgcmV0dXJuIF9oaWdobGlnaHRWaWV3OwpAQCAtMTk5LDExICsxNDksMTEgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgX2RlbGVnYXRlID0gZGVsZWdhdGU7CiB9CiAKLS0g KHZvaWQpc2V0SG9sZXNOZWVkVXBkYXRlSW5UYXJnZXRWaWV3UmVjdDooTlNSZWN0KXJlY3QKKy0g KHZvaWQpc2V0TmVlZHNVcGRhdGVJblRhcmdldFZpZXdSZWN0OihOU1JlY3QpcmVjdAogewogICAg IEFTU0VSVChfdGFyZ2V0Vmlldyk7CiAKLSAgICBbX2hpZ2hsaWdodFZpZXcgc2V0SG9sZXNOZWVk VXBkYXRlSW5SZWN0OltfdGFyZ2V0VmlldyBfd2ViX2NvbnZlcnRSZWN0OnJlY3QgdG9WaWV3Ol9o aWdobGlnaHRWaWV3XV07CisgICAgW19oaWdobGlnaHRWaWV3IHNldE5lZWRzRGlzcGxheUluUmVj dDpbX3RhcmdldFZpZXcgX3dlYl9jb252ZXJ0UmVjdDpyZWN0IHRvVmlldzpfaGlnaGxpZ2h0Vmll d11dOwogCiAgICAgLy8gUmVkcmF3IGhpZ2hsaWdodCB2aWV3IGltbWVkaWF0ZWx5IHNvIGl0IHVw ZGF0ZXMgaW4gc3luYyB3aXRoIHRoZSB0YXJnZXQgdmlldwogICAgIC8vIGlmIHdlIGNhbGxlZCBk aXNhYmxlU2NyZWVuVXBkYXRlc1VudGlsRmx1c2ggb24gdGhlIHRhcmdldCB2aWV3IGVhcmxpZXIu IFRoaXMKQEAgLTIxMSwxMiArMTYxLDYgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAg W19oaWdobGlnaHRWaWV3IGRpc3BsYXlJZk5lZWRlZF07CiB9CiAKLS0gKHZvaWQpc2V0SWdub3Jl c01vdXNlRXZlbnRzOihCT09MKW5ld1ZhbHVlCi17Ci0gICAgQVNTRVJUKF9oaWdobGlnaHRXaW5k b3cpOwotICAgIFtfaGlnaGxpZ2h0V2luZG93IHNldElnbm9yZXNNb3VzZUV2ZW50czpuZXdWYWx1 ZV07Ci19Ci0KIC0gKE5TVmlldyAqKXRhcmdldFZpZXcKIHsKICAgICByZXR1cm4gX3RhcmdldFZp ZXc7CkBAIC0yNTIsOSArMTk2LDQgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgW19o aWdobGlnaHRXaW5kb3cgc2V0RnJhbWU6W3NlbGYgX2NvbXB1dGVIaWdobGlnaHRXaW5kb3dGcmFt ZV0gZGlzcGxheTpZRVNdOwogfQogCi0tICh2b2lkKV9hbmltYXRlRmFkZUluOihXZWJOb2RlSGln aGxpZ2h0RmFkZUluQW5pbWF0aW9uICopYW5pbWF0aW9uCi17Ci0gICAgW19oaWdobGlnaHRWaWV3 IHNldEZyYWN0aW9uRmFkZWRJbjpbYW5pbWF0aW9uIGN1cnJlbnRWYWx1ZV1dOwotfQotCiBAZW5k CmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9XZWJOb2RlSGlnaGxpZ2h0Vmll dy5oIGIvV2ViS2l0L21hYy9XZWJJbnNwZWN0b3IvV2ViTm9kZUhpZ2hsaWdodFZpZXcuaAppbmRl eCA3MGQxYTVhLi5jYjMxN2I4IDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9X ZWJOb2RlSGlnaGxpZ2h0Vmlldy5oCisrKyBiL1dlYktpdC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5v ZGVIaWdobGlnaHRWaWV3LmgKQEAgLTMwLDE3ICszMCw5IEBACiAKIEBpbnRlcmZhY2UgV2ViTm9k ZUhpZ2hsaWdodFZpZXcgOiBOU1ZpZXcgewogICAgIFdlYk5vZGVIaWdobGlnaHQgKl93ZWJOb2Rl SGlnaGxpZ2h0OwotICAgIGZsb2F0IF9mcmFjdGlvbkZhZGVkSW47CiB9CiAtIChpZClpbml0V2l0 aFdlYk5vZGVIaWdobGlnaHQ6KFdlYk5vZGVIaWdobGlnaHQgKil3ZWJOb2RlSGlnaGxpZ2h0Owog CiAtIChXZWJOb2RlSGlnaGxpZ2h0ICopd2ViTm9kZUhpZ2hsaWdodDsKIC0gKHZvaWQpZGV0YWNo RnJvbVdlYk5vZGVIaWdobGlnaHQ7Ci0KLS8vIFZhbHVlIGJldHdlZW4gMC4wIChjb21wbGV0ZWx5 IGZhZGVkIG91dCBvZiB2aWV3KSBhbmQgMS4wIChjb21wbGV0ZWx5IGZhZGVkIGludG8gdmlldykg dGhhdCByZXByZXNlbnRzCi0vLyB0aGUgcHJvZ3Jlc3Mgb2YgdGhlIGZhZGluZyBhbmltYXRpb24u Ci0tIChmbG9hdClmcmFjdGlvbkZhZGVkSW47Ci0tICh2b2lkKXNldEZyYWN0aW9uRmFkZWRJbjoo ZmxvYXQpYWxwaGE7Ci0KLS0gKHZvaWQpc2V0SG9sZXNOZWVkVXBkYXRlSW5SZWN0OihOU1JlY3Qp cmVjdDsKIEBlbmQKZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvV2ViSW5zcGVjdG9yL1dlYk5vZGVI aWdobGlnaHRWaWV3Lm0gYi9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9XZWJOb2RlSGlnaGxpZ2h0 Vmlldy5tCmluZGV4IDlmNDAwMDkuLmZiOGNjNzcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2Vi SW5zcGVjdG9yL1dlYk5vZGVIaWdobGlnaHRWaWV3Lm0KKysrIGIvV2ViS2l0L21hYy9XZWJJbnNw ZWN0b3IvV2ViTm9kZUhpZ2hsaWdodFZpZXcubQpAQCAtNDIsNyArNDIsNyBAQCB1c2luZyBuYW1l c3BhY2UgV2ViQ29yZTsKICNkZWZpbmUgT1ZFUkxBWV9NQVhfQUxQSEEgMC43CiAjZGVmaW5lIE9W RVJMQVlfV0hJVEVfVkFMVUUgMC4xCiAKLSNkZWZpbmUgV0hJVEVfRlJBTUVfVEhJQ0tORVNTIDEu MAorI2RlZmluZSBCT1JERVJfVEhJQ0tORVNTIDEuMAogCiBAaW1wbGVtZW50YXRpb24gV2ViTm9k ZUhpZ2hsaWdodFZpZXcKIApAQCAtOTEsMjkgKzkxLDExIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogICAgIHJldHVybiBfd2ViTm9kZUhpZ2hsaWdodDsKIH0KIAotLSAoZmxvYXQpZnJhY3Rp b25GYWRlZEluCistICh2b2lkKXNldE5lZWRzRGlzcGxheUluUmVjdDooTlNSZWN0KXJlY3QKIHsK LSAgICByZXR1cm4gX2ZyYWN0aW9uRmFkZWRJbjsKLX0KLQotLSAodm9pZClzZXRGcmFjdGlvbkZh ZGVkSW46KGZsb2F0KWZyYWN0aW9uCi17Ci0gICAgQVNTRVJUX0FSRyhmcmFjdGlvbiwgZnJhY3Rp b24gPj0gMC4wICYmIGZyYWN0aW9uIDw9IDEuMCk7Ci0KLSAgICBpZiAoX2ZyYWN0aW9uRmFkZWRJ biA9PSBmcmFjdGlvbikKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIF9mcmFjdGlvbkZhZGVk SW4gPSBmcmFjdGlvbjsKLSAgICBbc2VsZiBzZXROZWVkc0Rpc3BsYXk6WUVTXTsKLX0KLQotLSAo dm9pZClzZXRIb2xlc05lZWRVcGRhdGVJblJlY3Q6KE5TUmVjdClyZWN0Ci17Ci0gICAgLy8gUmVk aXNwbGF5IGEgc2xpZ2h0bHkgbGFyZ2VyIHJlY3QgdG8gYWNjb3VudCBmb3Igd2hpdGUgYm9yZGVy IGFyb3VuZCBob2xlcwotICAgIHJlY3QgPSBOU0luc2V0UmVjdChyZWN0LCAtMSAqIFdISVRFX0ZS QU1FX1RISUNLTkVTUywgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0xICogV0hJVEVf RlJBTUVfVEhJQ0tORVNTKTsKLQotICAgIFtzZWxmIHNldE5lZWRzRGlzcGxheUluUmVjdDpyZWN0 XTsKKyAgICAvLyBSZWRpc3BsYXkgYSBzbGlnaHRseSBsYXJnZXIgcmVjdCB0byBhY2NvdW50IGZv ciB0aGUgYm9yZGVyCisgICAgcmVjdCA9IE5TSW5zZXRSZWN0KHJlY3QsIC0xICogQk9SREVSX1RI SUNLTkVTUywgLTEgKiBCT1JERVJfVEhJQ0tORVNTKTsKKyAgICBbc3VwZXIgc2V0TmVlZHNEaXNw bGF5SW5SZWN0OnJlY3RdOwogfQogCiBAZW5kCi0tIAoxLjUuNC40Cgo=