93113 2012-08-03 07:11:53 -0700 Move DOM operations in the element stack to HTMLConstructionSite. 2012-08-08 02:23:16 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 90751 1 skyul skyul abarth eric oldest_to_newest 686684 0 skyul 2012-08-03 07:11:53 -0700 HTMLConstructionSite has DOM operations methods required for tree construction. But some DOM operations are still performed directly in the element stack. Extracted such DOM operations and moved them to HTMLConstructionSite for consistency. See also Bug 93070. 686696 1 156367 skyul 2012-08-03 07:14:48 -0700 Created attachment 156367 Patch 686702 2 skyul 2012-08-03 07:16:00 -0700 This patch is also a prerequisite for speculative parsing. 686891 3 skyul 2012-08-03 10:16:44 -0700 Now HTMLElementStack has a pointer to its owner HTMLConstructionSite. I couldn't come up with a better refactoring. Any idea? 689489 4 eric 2012-08-07 15:30:15 -0700 Perhaps HTMLConstructionSite and ElementStack shoudl share some sort of DOMOperations abstraction which they indirect through to make dom modifications. I assume this is done in preparation for making parsing possible on another thread? 689576 5 skyul 2012-08-07 16:22:06 -0700 (In reply to comment #4) > Perhaps HTMLConstructionSite and ElementStack shoudl share some sort of DOMOperations abstraction which they indirect through to make dom modifications. I assume this is done in preparation for making parsing possible on another thread? It's a good idea. But I chose to move DOM operations to HTMLConstructionSite and also call them construction site tasks in my current implementation of speculative parsing ( https://github.com/kseo/webkit/tree/speculativeparser ) because I need to put beginParsingChildren and finishParsingChildren in the task queue. While speculating, we can't immediately call beginParsingChildren or finishParsingChildren on element because element creation itself is deferred. I identified the list of DOM creations/mutations in the parser: HTMLTreeBuilder - addChildAndAttach - detachNode - moveAllChildrenToNewParent - setAttribute - removeAllChildren HTMLElementStack - beginParsingChildren - finishParsingChildren HTMLConstructionSite - dispatchDocumentElementAvailableIfNeeded - mergeAttributesFromTokenIntoElement - setCompatibilityMode - setCompatibilityModeFromDoctype - setDemoted - insertedByParser - insert - insertOnDocument - insertFosterParentedChild - insertComment - insertCommentOnDocument - insertDoctype - insertText - insertFosterParentedText - createElement - createHTMLElement - createHTMLHtmlElement - createHTMLScriptElement 689591 6 eric 2012-08-07 16:34:29 -0700 I think you really want to end up with something like GraphicsContext here. GraphicsContext exists as an (per-platform) abstraction around the drawing context. We pass it around. And it's normally a compile-time defined implementation, but some ports have (in the past) implemented it as a run-time defined implementation. Similarly, it seems like this off-thread parser wants an abstraction through which to talk to the DOM (and possibly a separate one for the reading... although it sounds like you already have the reading part done). I think this abstraction wants to be separate from HTMLConstructionSite, and used by HTMLConstructionSite. Having it be its own separate object, will allow us to separate the mechanics of cross-thread DOM mutation (or queuing of DOM operations) from the logic of what we want to do with the DOM. HTMLConstructionSite remains the HTML parser's "what we want to do with the DOM" logic, and some new class (perhaps DOMModifier or DOMOperations or whatever) is the way that we talk to the DOM. When we're on the main thread, we use a dumb DOMModifier implementation which just calls the DOM operations synchronously. When we're off the main thread, we use a smarter implementation which allocates some sort of objects (similar to how the undo stack, and Editor and EditingCommand work) which are queued up for later execution on the main thread. The code then becomes mostly ignorant of the question of if it's on the main thread or not, and this DOMModifications abstraction handles all the details. I'm not sure if complete ignorance of threaded-ness in HTMLConstructionSite, etc is possible, but were I implementing this, I might start with such as the goal. Hopefully my musings above are helpful. 689643 7 skyul 2012-08-07 17:15:02 -0700 (In reply to comment #6) > I think this abstraction wants to be separate from HTMLConstructionSite, and used by HTMLConstructionSite. > > Having it be its own separate object, will allow us to separate the mechanics of cross-thread DOM mutation (or queuing of DOM operations) from the logic of what we want to do with the DOM. Sounds reasonable! > HTMLConstructionSite remains the HTML parser's "what we want to do with the DOM" logic, and some new class (perhaps DOMModifier or DOMOperations or whatever) is the way that we talk to the DOM. > > When we're on the main thread, we use a dumb DOMModifier implementation which just calls the DOM operations synchronously. > > When we're off the main thread, we use a smarter implementation which allocates some sort of objects (similar to how the undo stack, and Editor and EditingCommand work) which are queued up for later execution on the main thread. > > The code then becomes mostly ignorant of the question of if it's on the main thread or not, and this DOMModifications abstraction handles all the details. Yes, it's a great idea. My current implementation has m_isSpeculating flag in HTMLConstructionSite. When this flag is true, HTMLConstructionSite just calls the DOM operations synchronously. Otherwise, it queues up for later execution. This certainly works, but makes the code very complicated. You suggestion sounds much better. > I'm not sure if complete ignorance of threaded-ness in HTMLConstructionSite, etc is possible, but were I implementing this, I might start with such as the goal. Okay. I will try! BTW, it's not just about threaded-ness because my first speculative parsing implementation is still on the main thread. But it still needs to queue up DOM operations because element creation and DOM mutations have visible side effects. > Hopefully my musings above are helpful. Thanks for your good advice. It is really helpful. 689645 8 skyul 2012-08-07 17:17:03 -0700 (In reply to comment #7) > Yes, it's a great idea. My current implementation has m_isSpeculating flag in HTMLConstructionSite. When this flag is true, HTMLConstructionSite just calls the DOM operations synchronously. Otherwise, it queues up for later execution. This certainly works, but makes the code very complicated. You suggestion sounds much better. Oops. "When this flag is true" -> "When this flag is false" 689660 9 skyul 2012-08-07 17:41:54 -0700 (In reply to comment #6) > Similarly, it seems like this off-thread parser wants an abstraction through which to talk to the DOM (and possibly a separate one for the reading... although it sounds like you already have the reading part done). For the reading part, I think Bug 92057 is the right solution because we can't queue up DOM read operations. So we need only DOMModifier or DOMModifcations abstraction. 690078 10 skyul 2012-08-08 02:22:29 -0700 Close this bug in favor of Bug 93455. 156367 2012-08-03 07:14:48 -0700 2012-08-08 02:23:16 -0700 Patch bug-93113-20120803231427.patch text/plain 7036 skyul U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjlhMjg3ZTdjNDMxZWRh ZTc5MThjZjQ0MTg2YjEwODFlYjczNzhlYS4uMzM4ZDc0YTBkYWNkZDQ2ZjQyOGZiMzQ2OTA3M2Y5 Y2I2YzhjMWQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA4LTAzICBLd2Fu ZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgTW92ZSBET00gb3Bl cmF0aW9ucyBpbiB0aGUgZWxlbWVudCBzdGFjayB0byBIVE1MQ29uc3RydWN0aW9uU2l0ZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMTEzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSFRNTENvbnN0cnVj dGlvblNpdGUgaGFzIERPTSBvcGVyYXRpb25zIG1ldGhvZHMgcmVxdWlyZWQgZm9yIHRyZWUgY29u c3RydWN0aW9uLgorICAgICAgICBCdXQgc29tZSBET00gb3BlcmF0aW9ucyBhcmUgc3RpbGwgcGVy Zm9ybWVkIGRpcmVjdGx5IGluIHRoZSBlbGVtZW50IHN0YWNrLiBFeHRyYWN0ZWQKKyAgICAgICAg c3VjaCBET00gb3BlcmF0aW9ucyBhbmQgbW92ZWQgdGhlbSB0byBIVE1MQ29uc3RydWN0aW9uU2l0 ZSBmb3IgY29uc2lzdGVuY3kuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMganVz dCBhIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTENvbnN0cnVjdGlv blNpdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6OkhUTUxD b25zdHJ1Y3Rpb25TaXRlKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MQ29uc3RydWN0aW9u U2l0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6OmJlZ2luUGFy c2luZ0NoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpm aW5pc2hQYXJzaW5nQ2hpbGRyZW4pOgorICAgICAgICAoSFRNTENvbnN0cnVjdGlvblNpdGUpOgor ICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxFbGVtZW50U3RhY2suY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTEVsZW1lbnRTdGFjazo6SFRNTEVsZW1lbnRTdGFjayk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MRWxlbWVudFN0YWNrOjpwb3BBbGwpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVs ZW1lbnRTdGFjazo6aW5zZXJ0QWJvdmUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnRT dGFjazo6cG9wQ29tbW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50U3RhY2s6OnJl bW92ZU5vblRvcENvbW1vbik6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTEVsZW1lbnRTdGFj ay5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChIVE1MRWxlbWVudFN0YWNrKToKKwog MjAxMi0wOC0wMyAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIEFkZCAqZXhwbGljaXQqIGtleXdvcmQgdG8gY29uc3RydWN0b3JzIGluIFdlYkNvcmUv YWNjZXNzaWJpbGl0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRN TENvbnN0cnVjdGlvblNpdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTENv bnN0cnVjdGlvblNpdGUuY3BwCmluZGV4IGZjOWQ3YzY2NDhhMmM0YTc1NTQ4ZmU5NmZmZTc5Zjc0 OWUyYjAyZTYuLmU3NGZkYTI5MDNhZjgzYjQ1NzQ0ZWRjNzA0YTY5YTA3YjcxM2EzMDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5j cHAKQEAgLTEzNCw2ICsxMzQsNyBAQCB2b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpleGVjdXRl UXVldWVkVGFza3MoKQogSFRNTENvbnN0cnVjdGlvblNpdGU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRl KERvY3VtZW50KiBkb2N1bWVudCwgdW5zaWduZWQgbWF4aW11bURPTVRyZWVEZXB0aCkKICAgICA6 IG1fZG9jdW1lbnQoZG9jdW1lbnQpCiAgICAgLCBtX2F0dGFjaG1lbnRSb290KGRvY3VtZW50KQor ICAgICwgbV9vcGVuRWxlbWVudHModGhpcykKICAgICAsIG1fZnJhZ21lbnRTY3JpcHRpbmdQZXJt aXNzaW9uKEFsbG93U2NyaXB0aW5nQ29udGVudCkKICAgICAsIG1faXNQYXJzaW5nRnJhZ21lbnQo ZmFsc2UpCiAgICAgLCBtX3JlZGlyZWN0QXR0YWNoVG9Gb3N0ZXJQYXJlbnQoZmFsc2UpCkBAIC0x NDQsNiArMTQ1LDcgQEAgSFRNTENvbnN0cnVjdGlvblNpdGU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRl KERvY3VtZW50KiBkb2N1bWVudCwgdW5zaWduZWQgbWF4aW11bUQKIEhUTUxDb25zdHJ1Y3Rpb25T aXRlOjpIVE1MQ29uc3RydWN0aW9uU2l0ZShEb2N1bWVudEZyYWdtZW50KiBmcmFnbWVudCwgRnJh Z21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1pc3Npb24sIHVuc2lnbmVkIG1h eGltdW1ET01UcmVlRGVwdGgpCiAgICAgOiBtX2RvY3VtZW50KGZyYWdtZW50LT5kb2N1bWVudCgp KQogICAgICwgbV9hdHRhY2htZW50Um9vdChmcmFnbWVudCkKKyAgICAsIG1fb3BlbkVsZW1lbnRz KHRoaXMpCiAgICAgLCBtX2ZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbihzY3JpcHRpbmdQZXJt aXNzaW9uKQogICAgICwgbV9pc1BhcnNpbmdGcmFnbWVudCh0cnVlKQogICAgICwgbV9yZWRpcmVj dEF0dGFjaFRvRm9zdGVyUGFyZW50KGZhbHNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTENvbnN0cnVjdGlvblNpdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmgKaW5kZXggNjA1NzJiZGQ4NTYyNzQ0NWNiZDg2 NWE5Njc5ZDJmZWJhNWY2YThkYy4uMjZjMzliNzQ3ODVlYTEyMDRiZjA5Y2VmM2E3OGY1MDdmMmFh MzBhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTENvbnN0cnVj dGlvblNpdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MQ29uc3RydWN0 aW9uU2l0ZS5oCkBAIC05Nyw2ICs5Nyw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGluc2VydEhUTUxI dG1sU3RhcnRUYWdJbkJvZHkoQXRvbWljSFRNTFRva2VuKik7CiAgICAgdm9pZCBpbnNlcnRIVE1M Qm9keVN0YXJ0VGFnSW5Cb2R5KEF0b21pY0hUTUxUb2tlbiopOwogCisgICAgdm9pZCBiZWdpblBh cnNpbmdDaGlsZHJlbihOb2RlKiBub2RlKSB7IG5vZGUtPmJlZ2luUGFyc2luZ0NoaWxkcmVuKCk7 IH0KKyAgICB2b2lkIGZpbmlzaFBhcnNpbmdDaGlsZHJlbihOb2RlKiBub2RlKSB7IG5vZGUtPmZp bmlzaFBhcnNpbmdDaGlsZHJlbigpOyB9CisKICAgICBQYXNzUmVmUHRyPEhUTUxTdGFja0l0ZW0+ IGNyZWF0ZUVsZW1lbnRGcm9tU2F2ZWRUb2tlbihIVE1MU3RhY2tJdGVtKik7CiAKICAgICBib29s IHNob3VsZEZvc3RlclBhcmVudCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTEVsZW1lbnRTdGFjay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MRWxlbWVudFN0YWNrLmNwcAppbmRleCA2MmVkNmY0ZTM5ZDIyOWRlOGI0Yjg2ODE5 MzQxMWIxNzgxOTQ5Yzc0Li41ZTllYmU3NzZmZTI1OTEyZjA2MmM1YzJkODA4ZjVkZTNkZGNkNTM2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRWxlbWVudFN0YWNr LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRWxlbWVudFN0YWNrLmNw cApAQCAtMjksNiArMjksNyBAQAogCiAjaW5jbHVkZSAiRG9jdW1lbnRGcmFnbWVudC5oIgogI2lu Y2x1ZGUgIkVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MQ29uc3RydWN0aW9uU2l0ZS5oIgogI2lu Y2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIk1hdGhNTE5hbWVzLmgiCiAjaW5jbHVkZSAi U1ZHTmFtZXMuaCIKQEAgLTE1MywxMSArMTU0LDEyIEBAIGJvb2wgSFRNTEVsZW1lbnRTdGFjazo6 RWxlbWVudFJlY29yZDo6aXNBYm92ZShFbGVtZW50UmVjb3JkKiBvdGhlcikgY29uc3QKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKLUhUTUxFbGVtZW50U3RhY2s6OkhUTUxFbGVtZW50U3RhY2soKQor SFRNTEVsZW1lbnRTdGFjazo6SFRNTEVsZW1lbnRTdGFjayhIVE1MQ29uc3RydWN0aW9uU2l0ZSog dHJlZSkKICAgICA6IG1fcm9vdE5vZGUoMCkKICAgICAsIG1faGVhZEVsZW1lbnQoMCkKICAgICAs IG1fYm9keUVsZW1lbnQoMCkKICAgICAsIG1fc3RhY2tEZXB0aCgwKQorICAgICwgbV90cmVlKHRy ZWUpCiB7CiB9CiAKQEAgLTIwMyw3ICsyMDUsNyBAQCB2b2lkIEhUTUxFbGVtZW50U3RhY2s6OnBv cEFsbCgpCiAgICAgbV9ib2R5RWxlbWVudCA9IDA7CiAgICAgbV9zdGFja0RlcHRoID0gMDsKICAg ICB3aGlsZSAobV90b3ApIHsKLSAgICAgICAgdG9wTm9kZSgpLT5maW5pc2hQYXJzaW5nQ2hpbGRy ZW4oKTsKKyAgICAgICAgbV90cmVlLT5maW5pc2hQYXJzaW5nQ2hpbGRyZW4odG9wTm9kZSgpKTsK ICAgICAgICAgbV90b3AgPSBtX3RvcC0+cmVsZWFzZU5leHQoKTsKICAgICB9CiB9CkBAIC0zNzEs NyArMzczLDcgQEAgdm9pZCBIVE1MRWxlbWVudFN0YWNrOjppbnNlcnRBYm92ZShQYXNzUmVmUHRy PEhUTUxTdGFja0l0ZW0+IGl0ZW0sIEVsZW1lbnRSZWNvcmQKIAogICAgICAgICBtX3N0YWNrRGVw dGgrKzsKICAgICAgICAgcmVjb3JkQWJvdmUtPnNldE5leHQoYWRvcHRQdHIobmV3IEVsZW1lbnRS ZWNvcmQoaXRlbSwgcmVjb3JkQWJvdmUtPnJlbGVhc2VOZXh0KCkpKSk7Ci0gICAgICAgIHJlY29y ZEFib3ZlLT5uZXh0KCktPmVsZW1lbnQoKS0+YmVnaW5QYXJzaW5nQ2hpbGRyZW4oKTsKKyAgICAg ICAgbV90cmVlLT5iZWdpblBhcnNpbmdDaGlsZHJlbihyZWNvcmRBYm92ZS0+bmV4dCgpLT5lbGVt ZW50KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwpAQCAtNTc0LDcgKzU3Niw3IEBAIHZvaWQgSFRNTEVsZW1lbnRTdGFjazo6cG9wQ29tbW9uKCkK ICAgICBBU1NFUlQoIXRvcFN0YWNrSXRlbSgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6aHRtbFRh ZykpOwogICAgIEFTU0VSVCghdG9wU3RhY2tJdGVtKCktPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpo ZWFkVGFnKSB8fCAhbV9oZWFkRWxlbWVudCk7CiAgICAgQVNTRVJUKCF0b3BTdGFja0l0ZW0oKS0+ aGFzVGFnTmFtZShIVE1MTmFtZXM6OmJvZHlUYWcpIHx8ICFtX2JvZHlFbGVtZW50KTsKLSAgICB0 b3AoKS0+ZmluaXNoUGFyc2luZ0NoaWxkcmVuKCk7CisgICAgbV90cmVlLT5maW5pc2hQYXJzaW5n Q2hpbGRyZW4odG9wKCkpOwogICAgIG1fdG9wID0gbV90b3AtPnJlbGVhc2VOZXh0KCk7CiAKICAg ICBtX3N0YWNrRGVwdGgtLTsKQEAgLTU4OSw3ICs1OTEsNyBAQCB2b2lkIEhUTUxFbGVtZW50U3Rh Y2s6OnJlbW92ZU5vblRvcENvbW1vbihFbGVtZW50KiBlbGVtZW50KQogICAgICAgICBpZiAocG9z LT5uZXh0KCktPmVsZW1lbnQoKSA9PSBlbGVtZW50KSB7CiAgICAgICAgICAgICAvLyBGSVhNRTog SXMgaXQgT0sgdG8gY2FsbCBmaW5pc2hQYXJzaW5nQ2hpbGRyZW4oKQogICAgICAgICAgICAgLy8g d2hlbiB0aGUgY2hpbGRyZW4gYXJlbid0IGFjdHVhbGx5IGZpbmlzaGVkPwotICAgICAgICAgICAg ZWxlbWVudC0+ZmluaXNoUGFyc2luZ0NoaWxkcmVuKCk7CisgICAgICAgICAgICBtX3RyZWUtPmZp bmlzaFBhcnNpbmdDaGlsZHJlbihlbGVtZW50KTsKICAgICAgICAgICAgIHBvcy0+c2V0TmV4dChw b3MtPm5leHQoKS0+cmVsZWFzZU5leHQoKSk7CiAgICAgICAgICAgICBtX3N0YWNrRGVwdGgtLTsK ICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxFbGVtZW50U3RhY2suaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxF bGVtZW50U3RhY2suaAppbmRleCA2MjBjNWExOTQzZWM3YzBiZWFiNTc0ODI0NDY2Y2M0MWYxNzY0 ZjA0Li4yNjEzMzQyNmVmNTAxOWFiZjUwYjk4NjVmMTczMzkyNzhiMTAyNDRmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRWxlbWVudFN0YWNrLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTEVsZW1lbnRTdGFjay5oCkBAIC00MSw2ICs0MSw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIENvbnRhaW5lck5vZGU7CiBjbGFzcyBEb2N1 bWVudEZyYWdtZW50OwogY2xhc3MgRWxlbWVudDsKK2NsYXNzIEhUTUxDb25zdHJ1Y3Rpb25TaXRl OwogY2xhc3MgUXVhbGlmaWVkTmFtZTsKIAogLy8gTk9URTogVGhlIEhUTUw1IHNwZWMgdXNlcyBh IGJhY2t3YXJkcyAoZ3Jvd3MgZG93bndhcmQpIHN0YWNrLiAgV2UncmUgdXNpbmcKQEAgLTQ4LDcg KzQ5LDcgQEAgY2xhc3MgUXVhbGlmaWVkTmFtZTsKIGNsYXNzIEhUTUxFbGVtZW50U3RhY2sgewog ICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEhUTUxFbGVtZW50U3RhY2spOyBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBIVE1MRWxlbWVudFN0YWNrKCk7CisgICAgSFRNTEVs ZW1lbnRTdGFjayhIVE1MQ29uc3RydWN0aW9uU2l0ZSopOwogICAgIH5IVE1MRWxlbWVudFN0YWNr KCk7CiAKICAgICBjbGFzcyBFbGVtZW50UmVjb3JkIHsKQEAgLTE3OCw2ICsxNzksOCBAQCBwcml2 YXRlOgogICAgIEVsZW1lbnQqIG1faGVhZEVsZW1lbnQ7CiAgICAgRWxlbWVudCogbV9ib2R5RWxl bWVudDsKICAgICB1bnNpZ25lZCBtX3N0YWNrRGVwdGg7CisKKyAgICBIVE1MQ29uc3RydWN0aW9u U2l0ZSogbV90cmVlOwogfTsKICAgICAKIGlubGluZSBib29sIGlzSW5IVE1MTmFtZXNwYWNlKGNv bnN0IEhUTUxTdGFja0l0ZW0qIGl0ZW0pCg==