44535 2010-08-24 10:38:03 -0700 Paste event fires twice for mac WebKit 2010-08-24 11:01:02 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED data:text/html,<textarea onpaste="alert('onPaste');"></textarea> InRadar, Regression P2 Normal --- 1 sam webkit-unassigned simon.fraser oldest_to_newest 268633 0 sam 2010-08-24 10:38:03 -0700 The paste event fires twice for Mac webkit. In the attached url, paste something into the textarea. 268636 1 sam 2010-08-24 10:40:50 -0700 <rdar://problem/8094611> 268642 2 65295 sam 2010-08-24 10:45:57 -0700 Created attachment 65295 Patch 268649 3 65295 oliver 2010-08-24 10:57:13 -0700 Comment on attachment 65295 Patch r=me 268651 4 sam 2010-08-24 10:59:36 -0700 Landed in r65912. 268652 5 simon.fraser 2010-08-24 10:59:47 -0700 > Index: WebCore/ChangeLog > =================================================================== > + The mac implementation of paste in WebKit was accidentally calling > + Editor::tryDHTMLPaste twice, once in -[WebHTMLView paste:] and once > + in Editor::pasteAsPlainText (which is called -[WebHTMLView paste:]). called _by_ ? > Index: WebCore/WebCore.exp.in > =================================================================== > --- WebCore/WebCore.exp.in (revision 65898) > +++ WebCore/WebCore.exp.in (working copy) > @@ -361,6 +361,7 @@ __ZN7WebCore15VisiblePositionC1ERKNS_8Po > __ZN7WebCore15reportExceptionEPN3JSC9ExecStateENS0_7JSValueE > __ZN7WebCore15visitedLinkHashEPKtj > __ZN7WebCore16AbstractDatabase14setIsAvailableEb > +__ZN7WebCore16DeviceMotionData6createEbdbdbdbdbdbdbd > __ZN7WebCore16FontFallbackList15releaseFontDataEv > __ZN7WebCore16FontPlatformDataC1EP6NSFontbb > __ZN7WebCore16FontPlatformDataD1Ev > @@ -401,7 +402,6 @@ __ZN7WebCore16isEndOfParagraphERKNS_15Vi > __ZN7WebCore16jsStringSlowCaseEPN3JSC9ExecStateERNS0_9WeakGCMapIPN3WTF10StringImplEPNS0_8JSStringEEES6_ > __ZN7WebCore17CredentialStorage3getERKNS_15ProtectionSpaceE > __ZN7WebCore17DOMImplementation14isTextMIMETypeERKN3WTF6StringE > -__ZN7WebCore16DeviceMotionData6createEbdbdbdbdbdbdbd > __ZN7WebCore17DeviceOrientation6createEbdbdbd > __ZN7WebCore17GlyphPageTreeNode18treeGlyphPageCountEv > __ZN7WebCore17HistoryController26saveDocumentAndScrollStateEv > @@ -461,12 +461,12 @@ __ZN7WebCore22externalRepresentationEPNS > __ZN7WebCore23ReplaceSelectionCommandC1EPNS_8DocumentEN3WTF10PassRefPtrINS_16DocumentFragmentEEEbbbbbNS_10EditActionE > __ZN7WebCore23createFragmentFromNodesEPNS_8DocumentERKN3WTF6VectorIPNS_4NodeELm0EEE > __ZN7WebCore24BinaryPropertyListWriter17writePropertyListEv > +__ZN7WebCore24DocumentMarkerController13removeMarkersENS_14DocumentMarker10MarkerTypeE > +__ZN7WebCore24DocumentMarkerController23renderedRectsForMarkersENS_14DocumentMarker10MarkerTypeE > __ZN7WebCore24contextMenuItemTagItalicEv > __ZN7WebCore24contextMenuItemTagStylesEv > __ZN7WebCore24createFragmentFromMarkupEPNS_8DocumentERKN3WTF6StringES5_NS_27FragmentScriptingPermissionE > __ZN7WebCore24decodeURLEscapeSequencesERKN3WTF6StringE > -__ZN7WebCore24DocumentMarkerController13removeMarkersENS_14DocumentMarker10MarkerTypeE > -__ZN7WebCore24DocumentMarkerController23renderedRectsForMarkersENS_14DocumentMarker10MarkerTypeE > __ZN7WebCore24notifyHistoryItemChangedE > __ZN7WebCore24rangeCompliantEquivalentERKNS_8PositionE > __ZN7WebCore25HistoryPropertyListWriter11releaseDataEv > @@ -627,6 +627,7 @@ __ZN7WebCore6Editor29canDecreaseSelectio > __ZN7WebCore6Editor29canIncreaseSelectionListLevelEv > __ZN7WebCore6Editor30applyParagraphStyleToSelectionEPNS_19CSSStyleDeclarationENS_10EditActionE > __ZN7WebCore6Editor30deleteSelectionWithSmartDeleteEb > +__ZN7WebCore6Editor30pasteAsPlainTextBypassingDHTMLEv > __ZN7WebCore6Editor32guessesForUngrammaticalSelectionEv > __ZN7WebCore6Editor33increaseSelectionListLevelOrderedEv > __ZN7WebCore6Editor35increaseSelectionListLevelUnorderedEv Why all the unrelated changes? > Index: WebCore/editing/Editor.h > =================================================================== > --- WebCore/editing/Editor.h (revision 65898) > +++ WebCore/editing/Editor.h (working copy) > @@ -299,6 +299,9 @@ public: > void pasteAsFragment(PassRefPtr<DocumentFragment>, bool smartReplace, bool matchStyle); > void pasteAsPlainText(const String&, bool smartReplace); > > + // This is only necessary while paste is primarily implemented in WebKit for the mac platform. > + void pasteAsPlainTextBypassingDHTML(); I don't really understand the comment. It might be better as "This is only used on Mac, where ....." Rest looks fine, but I am not an expert. 268653 6 65295 darin 2010-08-24 11:01:02 -0700 Comment on attachment 65295 Patch > + // This is only necessary while paste is primarily implemented in WebKit for the mac platform. > + void pasteAsPlainTextBypassingDHTML(); Should say Mac, not mac. Comment is a bit confusing. I think you mean this function is only used by Mac WebKit, and can probably be eliminated once we refactor the Mac pasting code. 65295 2010-08-24 10:45:57 -0700 2010-08-24 11:01:02 -0700 Patch paste.diff text/plain 8682 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTkxMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDgtMjQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXN0ZSBl dmVudCBmaXJlcyB0d2ljZSBmb3IgbWFjIFdlYktpdAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v ODA5NDYxMT4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ0NTM1CisKKyAgICAgICAgVGhlIG1hYyBpbXBsZW1lbnRhdGlvbiBvZiBwYXN0ZSBpbiBXZWJL aXQgd2FzIGFjY2lkZW50YWxseSBjYWxsaW5nIAorICAgICAgICBFZGl0b3I6OnRyeURIVE1MUGFz dGUgdHdpY2UsIG9uY2UgaW4gLVtXZWJIVE1MVmlldyBwYXN0ZTpdIGFuZCBvbmNlCisgICAgICAg IGluIEVkaXRvcjo6cGFzdGVBc1BsYWluVGV4dCAod2hpY2ggaXMgY2FsbGVkIC1bV2ViSFRNTFZp ZXcgcGFzdGU6XSkuCisgICAgICAgIFVzZSB0aGUgbmV3IHBhc3RlQXNQbGFpblRleHRCeXBhc3Np bmdESFRNTCBmdW5jdGlvbiB0byBieXBhc3MgdGhlCisgICAgICAgIHNlY29uZCBjYWxsLgorCisg ICAgICAgIFRlc3Q6IGVkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ldmVudC1vbmx5LW9uY2UuaHRt bAorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogZWRpdGluZy9FZGl0b3Iu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpwYXN0ZUFzUGxhaW5UZXh0QnlwYXNzaW5n REhUTUwpOiAKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5oOgorICAgICAgICBFeHBvc2UgYSBm dW5jdGlvbiB3aGljaCBqdXN0IHBhc3RlcyB1c2luZyBmcm9tIHRoZSBnZW5lcmFsIHBhc3RlYm9h cmQsCisgICAgICAgIGJ5cGFzc2luZyBhbGwgdGhlIGNoZWNraW5nIGFuZCBESFRNTCBwYXN0aW5n LgorCiAyMDEwLTA4LTI0ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUuZXhw LmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDY1ODk4 KQorKysgV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMzYxLDYgKzM2 MSw3IEBAIF9fWk43V2ViQ29yZTE1VmlzaWJsZVBvc2l0aW9uQzFFUktOU184UG8KIF9fWk43V2Vi Q29yZTE1cmVwb3J0RXhjZXB0aW9uRVBOM0pTQzlFeGVjU3RhdGVFTlMwXzdKU1ZhbHVlRQogX19a TjdXZWJDb3JlMTV2aXNpdGVkTGlua0hhc2hFUEt0agogX19aTjdXZWJDb3JlMTZBYnN0cmFjdERh dGFiYXNlMTRzZXRJc0F2YWlsYWJsZUViCitfX1pON1dlYkNvcmUxNkRldmljZU1vdGlvbkRhdGE2 Y3JlYXRlRWJkYmRiZGJkYmRiZGJkCiBfX1pON1dlYkNvcmUxNkZvbnRGYWxsYmFja0xpc3QxNXJl bGVhc2VGb250RGF0YUV2CiBfX1pON1dlYkNvcmUxNkZvbnRQbGF0Zm9ybURhdGFDMUVQNk5TRm9u dGJiCiBfX1pON1dlYkNvcmUxNkZvbnRQbGF0Zm9ybURhdGFEMUV2CkBAIC00MDEsNyArNDAyLDYg QEAgX19aTjdXZWJDb3JlMTZpc0VuZE9mUGFyYWdyYXBoRVJLTlNfMTVWaQogX19aTjdXZWJDb3Jl MTZqc1N0cmluZ1Nsb3dDYXNlRVBOM0pTQzlFeGVjU3RhdGVFUk5TMF85V2Vha0dDTWFwSVBOM1dU RjEwU3RyaW5nSW1wbEVQTlMwXzhKU1N0cmluZ0VFRVM2XwogX19aTjdXZWJDb3JlMTdDcmVkZW50 aWFsU3RvcmFnZTNnZXRFUktOU18xNVByb3RlY3Rpb25TcGFjZUUKIF9fWk43V2ViQ29yZTE3RE9N SW1wbGVtZW50YXRpb24xNGlzVGV4dE1JTUVUeXBlRVJLTjNXVEY2U3RyaW5nRQotX19aTjdXZWJD b3JlMTZEZXZpY2VNb3Rpb25EYXRhNmNyZWF0ZUViZGJkYmRiZGJkYmRiZAogX19aTjdXZWJDb3Jl MTdEZXZpY2VPcmllbnRhdGlvbjZjcmVhdGVFYmRiZGJkCiBfX1pON1dlYkNvcmUxN0dseXBoUGFn ZVRyZWVOb2RlMTh0cmVlR2x5cGhQYWdlQ291bnRFdgogX19aTjdXZWJDb3JlMTdIaXN0b3J5Q29u dHJvbGxlcjI2c2F2ZURvY3VtZW50QW5kU2Nyb2xsU3RhdGVFdgpAQCAtNDYxLDEyICs0NjEsMTIg QEAgX19aTjdXZWJDb3JlMjJleHRlcm5hbFJlcHJlc2VudGF0aW9uRVBOUwogX19aTjdXZWJDb3Jl MjNSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZEMxRVBOU184RG9jdW1lbnRFTjNXVEYxMFBhc3NSZWZQ dHJJTlNfMTZEb2N1bWVudEZyYWdtZW50RUVFYmJiYmJOU18xMEVkaXRBY3Rpb25FCiBfX1pON1dl YkNvcmUyM2NyZWF0ZUZyYWdtZW50RnJvbU5vZGVzRVBOU184RG9jdW1lbnRFUktOM1dURjZWZWN0 b3JJUE5TXzROb2RlRUxtMEVFRQogX19aTjdXZWJDb3JlMjRCaW5hcnlQcm9wZXJ0eUxpc3RXcml0 ZXIxN3dyaXRlUHJvcGVydHlMaXN0RXYKK19fWk43V2ViQ29yZTI0RG9jdW1lbnRNYXJrZXJDb250 cm9sbGVyMTNyZW1vdmVNYXJrZXJzRU5TXzE0RG9jdW1lbnRNYXJrZXIxME1hcmtlclR5cGVFCitf X1pON1dlYkNvcmUyNERvY3VtZW50TWFya2VyQ29udHJvbGxlcjIzcmVuZGVyZWRSZWN0c0Zvck1h cmtlcnNFTlNfMTREb2N1bWVudE1hcmtlcjEwTWFya2VyVHlwZUUKIF9fWk43V2ViQ29yZTI0Y29u dGV4dE1lbnVJdGVtVGFnSXRhbGljRXYKIF9fWk43V2ViQ29yZTI0Y29udGV4dE1lbnVJdGVtVGFn U3R5bGVzRXYKIF9fWk43V2ViQ29yZTI0Y3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwRVBOU184RG9j dW1lbnRFUktOM1dURjZTdHJpbmdFUzVfTlNfMjdGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb25F CiBfX1pON1dlYkNvcmUyNGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlc0VSS04zV1RGNlN0cmluZ0UK LV9fWk43V2ViQ29yZTI0RG9jdW1lbnRNYXJrZXJDb250cm9sbGVyMTNyZW1vdmVNYXJrZXJzRU5T XzE0RG9jdW1lbnRNYXJrZXIxME1hcmtlclR5cGVFCi1fX1pON1dlYkNvcmUyNERvY3VtZW50TWFy a2VyQ29udHJvbGxlcjIzcmVuZGVyZWRSZWN0c0Zvck1hcmtlcnNFTlNfMTREb2N1bWVudE1hcmtl cjEwTWFya2VyVHlwZUUKIF9fWk43V2ViQ29yZTI0bm90aWZ5SGlzdG9yeUl0ZW1DaGFuZ2VkRQog X19aTjdXZWJDb3JlMjRyYW5nZUNvbXBsaWFudEVxdWl2YWxlbnRFUktOU184UG9zaXRpb25FCiBf X1pON1dlYkNvcmUyNUhpc3RvcnlQcm9wZXJ0eUxpc3RXcml0ZXIxMXJlbGVhc2VEYXRhRXYKQEAg LTYyNyw2ICs2MjcsNyBAQCBfX1pON1dlYkNvcmU2RWRpdG9yMjljYW5EZWNyZWFzZVNlbGVjdGlv CiBfX1pON1dlYkNvcmU2RWRpdG9yMjljYW5JbmNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbEV2CiBf X1pON1dlYkNvcmU2RWRpdG9yMzBhcHBseVBhcmFncmFwaFN0eWxlVG9TZWxlY3Rpb25FUE5TXzE5 Q1NTU3R5bGVEZWNsYXJhdGlvbkVOU18xMEVkaXRBY3Rpb25FCiBfX1pON1dlYkNvcmU2RWRpdG9y MzBkZWxldGVTZWxlY3Rpb25XaXRoU21hcnREZWxldGVFYgorX19aTjdXZWJDb3JlNkVkaXRvcjMw cGFzdGVBc1BsYWluVGV4dEJ5cGFzc2luZ0RIVE1MRXYKIF9fWk43V2ViQ29yZTZFZGl0b3IzMmd1 ZXNzZXNGb3JVbmdyYW1tYXRpY2FsU2VsZWN0aW9uRXYKIF9fWk43V2ViQ29yZTZFZGl0b3IzM2lu Y3JlYXNlU2VsZWN0aW9uTGlzdExldmVsT3JkZXJlZEV2CiBfX1pON1dlYkNvcmU2RWRpdG9yMzVp bmNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbFVub3JkZXJlZEV2CkluZGV4OiBXZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAko cmV2aXNpb24gNjU4OTgpCisrKyBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzI2LDYgKzMyNiwxMSBAQCB2b2lkIEVkaXRvcjo6cGFzdGVBc0ZyYWdtZW50KFBh c3NSZWZQdHI8CiAgICAgdGFyZ2V0LT5kaXNwYXRjaEV2ZW50KFRleHRFdmVudDo6Y3JlYXRlRm9y RnJhZ21lbnRQYXN0ZShtX2ZyYW1lLT5kb21XaW5kb3coKSwgcGFzdGluZ0ZyYWdtZW50LCBzbWFy dFJlcGxhY2UsIG1hdGNoU3R5bGUpLCBlYyk7CiB9CiAKK3ZvaWQgRWRpdG9yOjpwYXN0ZUFzUGxh aW5UZXh0QnlwYXNzaW5nREhUTUwoKQoreworICAgIHBhc3RlQXNQbGFpblRleHRXaXRoUGFzdGVi b2FyZChQYXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpKTsKK30KKwogdm9pZCBFZGl0b3I6 OnBhc3RlQXNQbGFpblRleHRXaXRoUGFzdGVib2FyZChQYXN0ZWJvYXJkKiBwYXN0ZWJvYXJkKQog ewogICAgIFN0cmluZyB0ZXh0ID0gcGFzdGVib2FyZC0+cGxhaW5UZXh0KG1fZnJhbWUpOwpJbmRl eDogV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGlu Zy9FZGl0b3IuaAkocmV2aXNpb24gNjU4OTgpCisrKyBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJ KHdvcmtpbmcgY29weSkKQEAgLTI5OSw2ICsyOTksOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYXN0 ZUFzRnJhZ21lbnQoUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiwgYm9vbCBzbWFydFJlcGxh Y2UsIGJvb2wgbWF0Y2hTdHlsZSk7CiAgICAgdm9pZCBwYXN0ZUFzUGxhaW5UZXh0KGNvbnN0IFN0 cmluZyYsIGJvb2wgc21hcnRSZXBsYWNlKTsKIAorICAgIC8vIFRoaXMgaXMgb25seSBuZWNlc3Nh cnkgd2hpbGUgcGFzdGUgaXMgcHJpbWFyaWx5IGltcGxlbWVudGVkIGluIFdlYktpdCBmb3IgdGhl IG1hYyBwbGF0Zm9ybS4KKyAgICB2b2lkIHBhc3RlQXNQbGFpblRleHRCeXBhc3NpbmdESFRNTCgp OworCiAgICAgTm9kZSogZmluZEV2ZW50VGFyZ2V0RnJvbShjb25zdCBWaXNpYmxlU2VsZWN0aW9u JiBzZWxlY3Rpb24pIGNvbnN0OwogcHJpdmF0ZToKICAgICBGcmFtZSogbV9mcmFtZTsKSW5kZXg6 IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTkxMCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDgtMjQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXN0 ZSBldmVudCBmaXJlcyB0d2ljZSBmb3IgbWFjIFdlYktpdAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODA5NDYxMT4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ0NTM1CisKKyAgICAgICAgVGhlIG1hYyBpbXBsZW1lbnRhdGlvbiBvZiBwYXN0ZSBpbiBX ZWJLaXQgd2FzIGFjY2lkZW50YWxseSBjYWxsaW5nIAorICAgICAgICBFZGl0b3I6OnRyeURIVE1M UGFzdGUgdHdpY2UsIG9uY2UgaW4gLVtXZWJIVE1MVmlldyBwYXN0ZTpdIGFuZCBvbmNlCisgICAg ICAgIGluIEVkaXRvcjo6cGFzdGVBc1BsYWluVGV4dCAod2hpY2ggaXMgY2FsbGVkIC1bV2ViSFRN TFZpZXcgcGFzdGU6XSkuCisgICAgICAgIFVzZSB0aGUgbmV3IHBhc3RlQXNQbGFpblRleHRCeXBh c3NpbmdESFRNTCBmdW5jdGlvbiB0byBieXBhc3MgdGhlCisgICAgICAgIHNlY29uZCBjYWxsLgor CisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2ViSFRNTFZp ZXcgcGFzdGU6XSk6CisKIDIwMTAtMDgtMjQgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJLaXQv bWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJW aWV3L1dlYkhUTUxWaWV3Lm1tCShyZXZpc2lvbiA2NTg5OCkKKysrIFdlYktpdC9tYWMvV2ViVmll dy9XZWJIVE1MVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTE3Niw3ICs1MTc2LDcgQEAgLSAo dm9pZClwYXN0ZTooaWQpc2VuZGVyCiAgICAgaWYgKGNvcmVGcmFtZS0+c2VsZWN0aW9uKCktPmlz Q29udGVudFJpY2hseUVkaXRhYmxlKCkpCiAgICAgICAgIFtzZWxmIF9wYXN0ZVdpdGhQYXN0ZWJv YXJkOltOU1Bhc3RlYm9hcmQgZ2VuZXJhbFBhc3RlYm9hcmRdIGFsbG93UGxhaW5UZXh0OllFU107 CiAgICAgZWxzZQotICAgICAgICBjb3JlRnJhbWUtPmVkaXRvcigpLT5wYXN0ZUFzUGxhaW5UZXh0 KCk7CisgICAgICAgIGNvcmVGcmFtZS0+ZWRpdG9yKCktPnBhc3RlQXNQbGFpblRleHRCeXBhc3Np bmdESFRNTCgpOwogfQogCiAtICh2b2lkKWNsb3NlSWZOb3RDdXJyZW50VmlldwpJbmRleDogTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwko cmV2aXNpb24gNjU5MTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNCBAQAorMjAxMC0wOC0yNCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhc3Rl IGV2ZW50IGZpcmVzIHR3aWNlIGZvciBtYWMgV2ViS2l0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS84MDk0NjExPgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDQ1MzUKKworICAgICAgICAqIGVkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ldmVudC1vbmx5 LW9uY2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL3Bhc3RlYm9hcmQv cGFzdGUtZXZlbnQtb25seS1vbmNlLmh0bWw6IEFkZGVkLgorCiAyMDEwLTA4LTI0ICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQg TGV2aW4uCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUtZXZlbnQt b25seS1vbmNlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5n L3Bhc3RlYm9hcmQvcGFzdGUtZXZlbnQtb25seS1vbmNlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ldmVudC1vbmx5LW9u Y2UtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYgQEAKK1Bhc3RpbmcgaW4g dGhlIHRleHQgYXJlYSBzaG91bGQgb25seSBmaXJlIG9uZSBwYXN0ZSBldmVudC4KKworCitQQVNT RUQKKworCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUtZXZlbnQt b25seS1vbmNlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9wYXN0ZWJv YXJkL3Bhc3RlLWV2ZW50LW9ubHktb25jZS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLWV2ZW50LW9ubHktb25jZS5odG1sCShyZXZpc2lv biAwKQpAQCAtMCwwICsxLDI3IEBACis8Ym9keT4KKzxwPlBhc3RpbmcgaW4gdGhlIHRleHQgYXJl YSBzaG91bGQgb25seSBmaXJlIG9uZSBwYXN0ZSBldmVudC48L3A+Cis8dGV4dGFyZWEgaWQ9InRl c3QiPkNvbnRlbnQ8L3RleHRhcmVhPgorPHAgaWQ9InJlc3VsdHMiPkZBSUxFRDwvcD4KKzwvYm9k eT4KKzxzY3JpcHQgc3JjPSIuLi9lZGl0aW5nLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5j dGlvbiBlZGl0aW5nVGVzdCgpCit7CisgICAgdmFyIGZpcmVkQ291bnQgPSAwOworICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0IikuYWRkRXZlbnRMaXN0ZW5lcigicGFzdGUiLCBmdW5j dGlvbigpeworICAgICAgICBmaXJlZENvdW50KysKKyAgICB9LCBmYWxzZSk7CisKKyAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdCIpLmZvY3VzKCk7CisgICAgZXhlY1NlbGVjdEFsbENv bW1hbmQoKTsKKyAgICBleGVjQ29weUNvbW1hbmQoKTsKKyAgICBleGVjUGFzdGVDb21tYW5kKCk7 CisKKyAgICBpZiAoZmlyZWRDb3VudCA9PSAxKQorICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgicmVzdWx0cyIpLmlubmVyVGV4dCA9ICJQQVNTRUQiOworICAgIGVsc2UKKyAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdHMiKS5pbm5lclRleHQgPSAiRkFJTEVEIGZp cmVkQ291bnQ6IiArIGZpcmVkQ291bnQ7Cit9CisKK3J1bkR1bXBBc1RleHRFZGl0aW5nVGVzdChm YWxzZSk7Cis8L3NjcmlwdD4K