55287 2011-02-25 19:06:09 -0800 <audio> and <video> should respect private browsing mode 2011-03-01 13:49:21 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson abarth eric webkit.review.bot oldest_to_newest 358349 0 eric.carlson 2011-02-25 19:06:09 -0800 Some media engines download files for <audio> and <video> directly, so they need enough information to manage media data appropriately. 358352 1 eric.carlson 2011-02-25 19:18:04 -0800 <rdar://problem/9057699> 358375 2 83924 eric.carlson 2011-02-25 21:22:48 -0800 Created attachment 83924 Proposed patch 359327 3 83924 cmarrin 2011-02-28 13:59:18 -0800 Comment on attachment 83924 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=83924&action=review r+ after dealing with naming issues and debug glop for scary weak pointer traversal. > Source/WebCore/dom/Document.cpp:6 > + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. Isn't it allowed to say 2004-2011 or something to make this a little less crazy? > Source/WebCore/dom/Document.cpp:3973 > + (*i)->privateBrowsingStateChanged(privateBrowsingEnabled); Most places use 'it' rather than 'i' to make the deref of what is usually an index less weird. Also, you're managing this list of weak pointers with the ctor/dtor. It might be good to put some debugging flags here to make sure you're not mutating this list while walking it (e.g., one of the callbacks destroys another element that is also in the list). > Source/WebCore/dom/Document.h:989 > + void privateBrowsingStateChanged(bool); A boolean here seems odd. It makes it seem like 'true' means the state changed and 'false' mean it hasn't. A better name might be setPrivateBrowsingEnabled. Or better yet, the Darin approved 'use an enum' approach might be the most clear. > Source/WebCore/dom/Element.h:6 > + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. Ditto > Source/WebCore/html/HTMLMediaElement.cpp:2 > + * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. Ditto > Source/WebCore/page/Page.cpp:3 > * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) Ditto > Source/WebCore/platform/graphics/MediaPlayer.cpp:2 > + * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. Ditto > Source/WebCore/platform/graphics/MediaPlayer.h:2 > + * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. Ditto 360144 4 eric.carlson 2011-03-01 12:55:19 -0800 http://trac.webkit.org/changeset/80030 360180 5 webkit.review.bot 2011-03-01 13:23:31 -0800 http://trac.webkit.org/changeset/80030 might have broken Qt Linux Release The following tests are not passing: editing/deleting/4916235-1.html editing/deleting/5390681.html editing/deleting/5546763.html editing/deleting/delete-3775172-fix.html editing/deleting/delete-at-paragraph-boundaries-007.html editing/deleting/delete-before-block-image-1.html 360198 6 83924 darin 2011-03-01 13:49:21 -0800 Comment on attachment 83924 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=83924&action=review >> Source/WebCore/dom/Document.cpp:6 >> + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. > > Isn't it allowed to say 2004-2011 or something to make this a little less crazy? No. Years of publication need to all be listed. A range does not make it clear which years this was published in. 83924 2011-02-25 21:22:48 -0800 2011-03-01 13:49:21 -0800 Proposed patch patch_1.txt text/plain 11720 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5NzU3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTEtMDItMjUgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgPGF1ZGlvPiBhbmQgPHZpZGVvPiBzaG91bGQgcmVzcGVj dCBwcml2YXRlIGJyb3dzaW5nIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU1Mjg3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MDU3Njk5Pgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBpcyBqdXN0IHRoZSBwbHVtYmluZy4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cHJp dmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkKTogTmV3LgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OnJlZ2lzdGVyRm9yUHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkQ2FsbGJhY2tzKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dW5yZWdpc3RlckZvclByaXZhdGVCcm93 c2luZ1N0YXRlQ2hhbmdlZENhbGxiYWNrcyk6IERpdHRvLgorICAgICAgICAqIGRvbS9Eb2N1bWVu dC5oOgorCisgICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1l bnQ6OnByaXZhdGVCcm93c2luZ1N0YXRlQ2hhbmdlZCk6IE5ldy4KKworICAgICAgICAqIGh0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50 OjpIVE1MTWVkaWFFbGVtZW50KTogUmVnaXN0ZXIgZm9yIHByaXZhY3kgbW9kZSBjaGFuZ2VzLgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1lbnQpOiBV bnJlZ2lzdGVyIGZvciBwcml2YWN5IG1vZGUgY2hhbmdlcy4KKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJjZSk6IFRlbGwgcGxheWVyIGN1cnJlbnQgcHJpdmFj eSBtb2RlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cHJpdmF0ZUJyb3dz aW5nU3RhdGVDaGFuZ2VkKTogIE5ldywgY2FsbCB0aHJvdWdoIHRvIE1lZGlhUGxheWVyLgorICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorCisgICAgICAgICogcGFnZS9QYWdlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnByaXZhdGVCcm93c2luZ1N0YXRlQ2hhbmdlZCk6 IENhbGwgZG9jdW1lbnQoKS0+cHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXI6OnNldFByaXZhdGVCcm93c2luZ01vZGUpOiBOZXcsIGNhbGwgdGhyb3VnaCB0 byBtZWRpYSBlbmdpbmUuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIu aDoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlOjpzZXRQcml2YXRl QnJvd3NpbmdNb2RlKTogIERlY2xhcmUgbmV3IGludGVyZmFjZS4KKwogMjAxMS0wMi0yNSAgQ2hy aXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24g NzkzMjgpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zLDcgKzMsNyBAQAogICogICAgICAgICAgIChDKSAxOTk5IEFudHRpIEtvaXZpc3RvIChr b2l2aXN0b0BrZGUub3JnKQogICogICAgICAgICAgIChDKSAyMDAxIERpcmsgTXVlbGxlciAobXVl bGxlckBrZGUub3JnKQogICogICAgICAgICAgIChDKSAyMDA2IEFsZXhleSBQcm9za3VyeWFrb3Yg KGFwQHdlYmtpdC5vcmcpCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIwMDYsIDIwMDcs IDIwMDgsIDIwMDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0 IChDKSAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5LCAyMDExIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAwOSBUb3JjaCBN b2JpbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAoaHR0cDovL3d3dy50b3JjaG1vYmlsZS5j b20vKQogICogQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAgTm9raWEgQ29ycG9yYXRpb24gYW5kL29y IGl0cyBzdWJzaWRpYXJ5KC1pZXMpCkBAIC0zOTY2LDYgKzM5NjYsMjMgQEAgdm9pZCBEb2N1bWVu dDo6dW5yZWdpc3RlckZvck1lZGlhVm9sdW1lQwogICAgIG1fbWVkaWFWb2x1bWVDYWxsYmFja0Vs ZW1lbnRzLnJlbW92ZShlKTsKIH0KIAordm9pZCBEb2N1bWVudDo6cHJpdmF0ZUJyb3dzaW5nU3Rh dGVDaGFuZ2VkKGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCkgCit7CisgICAgSGFzaFNldDxF bGVtZW50Kj46Oml0ZXJhdG9yIGVuZCA9IG1fcHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkRWxl bWVudHMuZW5kKCk7CisgICAgZm9yIChIYXNoU2V0PEVsZW1lbnQqPjo6aXRlcmF0b3IgaSA9IG1f cHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkRWxlbWVudHMuYmVnaW4oKTsgaSAhPSBlbmQ7ICsr aSkKKyAgICAgICAgKCppKS0+cHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkKHByaXZhdGVCcm93 c2luZ0VuYWJsZWQpOworfQorCit2b2lkIERvY3VtZW50OjpyZWdpc3RlckZvclByaXZhdGVCcm93 c2luZ1N0YXRlQ2hhbmdlZENhbGxiYWNrcyhFbGVtZW50KiBlKQoreworICAgIG1fcHJpdmF0ZUJy b3dzaW5nU3RhdGVDaGFuZ2VkRWxlbWVudHMuYWRkKGUpOworfQorCit2b2lkIERvY3VtZW50Ojp1 bnJlZ2lzdGVyRm9yUHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkQ2FsbGJhY2tzKEVsZW1lbnQq IGUpCit7CisgICAgbV9wcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWRFbGVtZW50cy5yZW1vdmUo ZSk7Cit9CisKIHZvaWQgRG9jdW1lbnQ6OnNldFNob3VsZENyZWF0ZVJlbmRlcmVycyhib29sIGYp CiB7CiAgICAgbV9jcmVhdGVSZW5kZXJlcnMgPSBmOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJ KHJldmlzaW9uIDc5MzI4KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTk4NCw2ICs5ODQsMTAgQEAgcHVibGljOgogICAgIHZvaWQgdW5yZWdpc3Rl ckZvck1lZGlhVm9sdW1lQ2FsbGJhY2tzKEVsZW1lbnQqKTsKICAgICB2b2lkIG1lZGlhVm9sdW1l RGlkQ2hhbmdlKCk7CiAKKyAgICB2b2lkIHJlZ2lzdGVyRm9yUHJpdmF0ZUJyb3dzaW5nU3RhdGVD aGFuZ2VkQ2FsbGJhY2tzKEVsZW1lbnQqKTsKKyAgICB2b2lkIHVucmVnaXN0ZXJGb3JQcml2YXRl QnJvd3NpbmdTdGF0ZUNoYW5nZWRDYWxsYmFja3MoRWxlbWVudCopOworICAgIHZvaWQgcHJpdmF0 ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkKGJvb2wpOworCiAgICAgdm9pZCBzZXRTaG91bGRDcmVhdGVS ZW5kZXJlcnMoYm9vbCk7CiAgICAgYm9vbCBzaG91bGRDcmVhdGVSZW5kZXJlcnMoKTsKIApAQCAt MTM2Myw2ICsxMzY3LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICBIYXNoU2V0PEVsZW1lbnQqPiBt X2RvY3VtZW50QWN0aXZhdGlvbkNhbGxiYWNrRWxlbWVudHM7CiAgICAgSGFzaFNldDxFbGVtZW50 Kj4gbV9tZWRpYVZvbHVtZUNhbGxiYWNrRWxlbWVudHM7CisgICAgSGFzaFNldDxFbGVtZW50Kj4g bV9wcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWRFbGVtZW50czsKIAogICAgIGJvb2wgbV91c2VT ZWN1cmVLZXlib2FyZEVudHJ5V2hlbkFjdGl2ZTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCShy ZXZpc2lvbiA3OTMyOCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTMsNyArMyw3IEBACiAgKiAgICAgICAgICAgKEMpIDE5OTkgQW50dGkgS29pdmlz dG8gKGtvaXZpc3RvQGtkZS5vcmcpCiAgKiAgICAgICAgICAgKEMpIDIwMDEgUGV0ZXIgS2VsbHkg KHBta0Bwb3N0LmNvbSkKICAqICAgICAgICAgICAoQykgMjAwMSBEaXJrIE11ZWxsZXIgKG11ZWxs ZXJAa2RlLm9yZykKLSAqIENvcHlyaWdodCAoQykgMjAwMywgMjAwNCwgMjAwNSwgMjAwNiwgMjAw NywgMjAwOCwgMjAwOSwgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDMsIDIwMDQsIDIwMDUsIDIwMDYsIDIwMDcsIDIwMDgsIDIwMDksIDIw MTAsIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGli cmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAq IG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVi bGljCkBAIC0yNzQsNiArMjc0LDkgQEAgcHVibGljOgogICAgIC8vIFVzZSBEb2N1bWVudDo6cmVn aXN0ZXJGb3JNZWRpYVZvbHVtZUNhbGxiYWNrcygpIHRvIHN1YnNjcmliZSB0byB0aGlzCiAgICAg dmlydHVhbCB2b2lkIG1lZGlhVm9sdW1lRGlkQ2hhbmdlKCkgeyB9CiAKKyAgICAvLyBVc2UgRG9j dW1lbnQ6OnJlZ2lzdGVyRm9yUHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkQ2FsbGJhY2tzKCkg dG8gc3Vic2NyaWJlIHRvIHRoaXMKKyAgICB2aXJ0dWFsIHZvaWQgcHJpdmF0ZUJyb3dzaW5nU3Rh dGVDaGFuZ2VkKGJvb2wpIHsgfQorCiAgICAgYm9vbCBpc0ZpbmlzaGVkUGFyc2luZ0NoaWxkcmVu KCkgY29uc3QgeyByZXR1cm4gaXNQYXJzaW5nQ2hpbGRyZW5GaW5pc2hlZCgpOyB9CiAgICAgdmly dHVhbCB2b2lkIGZpbmlzaFBhcnNpbmdDaGlsZHJlbigpOwogICAgIHZpcnR1YWwgdm9pZCBiZWdp blBhcnNpbmdDaGlsZHJlbigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCShyZXZpc2lvbiA3OTc0NCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l ZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29w eXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5LCAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTE3MSw2ICsxNzEsNyBAQCBIVE1MTWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVt ZW50KGNvbnN0CiAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6SFRNTE1lZGlhRWxl bWVudCIpOwogICAgIGRvY3VtZW50LT5yZWdpc3RlckZvckRvY3VtZW50QWN0aXZhdGlvbkNhbGxi YWNrcyh0aGlzKTsKICAgICBkb2N1bWVudC0+cmVnaXN0ZXJGb3JNZWRpYVZvbHVtZUNhbGxiYWNr cyh0aGlzKTsKKyAgICBkb2N1bWVudC0+cmVnaXN0ZXJGb3JQcml2YXRlQnJvd3NpbmdTdGF0ZUNo YW5nZWRDYWxsYmFja3ModGhpcyk7CiB9CiAKIEhUTUxNZWRpYUVsZW1lbnQ6On5IVE1MTWVkaWFF bGVtZW50KCkKQEAgLTE4MSw2ICsxODIsNyBAQCBIVE1MTWVkaWFFbGVtZW50Ojp+SFRNTE1lZGlh RWxlbWVudCgpCiAgICAgc2V0U2hvdWxkRGVsYXlMb2FkRXZlbnQoZmFsc2UpOwogICAgIGRvY3Vt ZW50KCktPnVucmVnaXN0ZXJGb3JEb2N1bWVudEFjdGl2YXRpb25DYWxsYmFja3ModGhpcyk7CiAg ICAgZG9jdW1lbnQoKS0+dW5yZWdpc3RlckZvck1lZGlhVm9sdW1lQ2FsbGJhY2tzKHRoaXMpOwor ICAgIGRvY3VtZW50KCktPnVucmVnaXN0ZXJGb3JQcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWRD YWxsYmFja3ModGhpcyk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6d2lsbE1vdmVUb05l d093bmVyRG9jdW1lbnQoKQpAQCAtNjk2LDYgKzY5OCwxMCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1l bnQ6OmxvYWRSZXNvdXJjZShjb25zCiAgICAgaWYgKG1fc2VuZFByb2dyZXNzRXZlbnRzKSAKICAg ICAgICAgc3RhcnRQcm9ncmVzc0V2ZW50VGltZXIoKTsKIAorICAgIFNldHRpbmdzKiBzZXR0aW5n cyA9IGRvY3VtZW50KCktPnNldHRpbmdzKCk7CisgICAgYm9vbCBwcml2YXRlTW9kZSA9ICFzZXR0 aW5ncyB8fCBzZXR0aW5ncy0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpOworICAgIG1fcGxheWVy LT5zZXRQcml2YXRlQnJvd3NpbmdNb2RlKHByaXZhdGVNb2RlKTsKKwogICAgIGlmICghYXV0b3Bs YXkoKSkKICAgICAgICAgbV9wbGF5ZXItPnNldFByZWxvYWQobV9wcmVsb2FkKTsKICAgICBtX3Bs YXllci0+c2V0UHJlc2VydmVzUGl0Y2gobV93ZWJraXRQcmVzZXJ2ZXNQaXRjaCk7CkBAIC0yNTUy LDYgKzI1NTgsMTIgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlhQ2FjaGVGbwog ICAgICAgICBtX3BsYXllci0+Y2xlYXJNZWRpYUNhY2hlRm9yU2l0ZShzaXRlKTsKIH0KIAordm9p ZCBIVE1MTWVkaWFFbGVtZW50Ojpwcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWQoYm9vbCBwcml2 YXRlQnJvd3NpbmdNb2RlKQoreworICAgIGlmIChtX3BsYXllcikKKyAgICAgICAgbV9wbGF5ZXIt PnNldFByaXZhdGVCcm93c2luZ01vZGUocHJpdmF0ZUJyb3dzaW5nTW9kZSk7Cit9CisKIH0KIAog I2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNp b24gNzk3NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtMTgwLDcgKzE4MCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGdldFNpdGVz SW5NZWRpYUNhY2hlKFZlY3RvcjxTdHJpbmc+Jik7CiAgICAgdm9pZCBjbGVhck1lZGlhQ2FjaGUo KTsKICAgICB2b2lkIGNsZWFyTWVkaWFDYWNoZUZvclNpdGUoY29uc3QgU3RyaW5nJik7Ci0gICAg CisKKyAgICB2b2lkIHByaXZhdGVCcm93c2luZ1N0YXRlQ2hhbmdlZChib29sKTsKKwogcHJvdGVj dGVkOgogICAgIEhUTUxNZWRpYUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50 Kik7CiAgICAgdmlydHVhbCB+SFRNTE1lZGlhRWxlbWVudCgpOwpJbmRleDogU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCShyZXZpc2lvbiA3OTMyOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LCAy MDA3LCAyMDA4LCAyMDA5LCAyMDEwIEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSBJ bmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggVG9yY2ggTW9i aWxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gKGh0dHA6Ly93d3cudG9yY2htb2JpbGUuY29t LykKICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3Ry aWJ1dGUgaXQgYW5kL29yCkBAIC04NTMsNiArODUzLDkgQEAgdm9pZCBQYWdlOjpwcml2YXRlQnJv d3NpbmdTdGF0ZUNoYW5nZWQoKQogewogICAgIGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCA9 IG1fc2V0dGluZ3MtPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKTsKIAorICAgIGZvciAoRnJhbWUq IGZyYW1lID0gbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRyYXZl cnNlTmV4dCgpKQorICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+cHJpdmF0ZUJyb3dzaW5nU3Rh dGVDaGFuZ2VkKHByaXZhdGVCcm93c2luZ0VuYWJsZWQpOworCiAgICAgLy8gQ29sbGVjdCB0aGUg UGx1Z2luVmlld3MgaW4gdG8gYSB2ZWN0b3IgdG8gZW5zdXJlIHRoYXQgYWN0aW9uIHRoZSBwbHVn LWluIHRha2VzCiAgICAgLy8gZnJvbSBiZWxvdyBwcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWQg ZG9lcyBub3QgYWZmZWN0IHRoZWlyIGxpZmV0aW1lLgogICAgIFZlY3RvcjxSZWZQdHI8UGx1Z2lu Vmlld0Jhc2U+LCAzMj4gcGx1Z2luVmlld0Jhc2VzOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAkocmV2aXNpb24gNzk3NDQpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4 LCAyMDA5LCAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTczMyw2ICs3MzMs MTEgQEAgdm9pZCBNZWRpYVBsYXllcjo6Y2xlYXJNZWRpYUNhY2hlRm9yU2l0ZQogICAgIG1fcHJp dmF0ZS0+Y2xlYXJNZWRpYUNhY2hlRm9yU2l0ZShzaXRlKTsKIH0KIAordm9pZCBNZWRpYVBsYXll cjo6c2V0UHJpdmF0ZUJyb3dzaW5nTW9kZShib29sIHByaXZhdGVCcm93c2luZ01vZGUpCit7Cisg ICAgbV9wcml2YXRlLT5zZXRQcml2YXRlQnJvd3NpbmdNb2RlKHByaXZhdGVCcm93c2luZ01vZGUp OworfQorCiAvLyBDbGllbnQgY2FsbGJhY2tzLgogdm9pZCBNZWRpYVBsYXllcjo6bmV0d29ya1N0 YXRlQ2hhbmdlZCgpCiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmgJKHJldmlzaW9uIDc5NzQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUg QEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgsIDIwMDksIDIwMTAgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5 LCAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjkxLDcgKzI5MSw5IEBAIHB1YmxpYzoKICAgICB2b2lk IGdldFNpdGVzSW5NZWRpYUNhY2hlKFZlY3RvcjxTdHJpbmc+Jik7CiAgICAgdm9pZCBjbGVhck1l ZGlhQ2FjaGUoKTsKICAgICB2b2lkIGNsZWFyTWVkaWFDYWNoZUZvclNpdGUoY29uc3QgU3RyaW5n Jik7Ci0gICAgCisKKyAgICB2b2lkIHNldFByaXZhdGVCcm93c2luZ01vZGUoYm9vbCk7CisKIHBy aXZhdGU6CiAgICAgTWVkaWFQbGF5ZXIoTWVkaWFQbGF5ZXJDbGllbnQqKTsKICAgICB2b2lkIGxv YWRXaXRoTmV4dE1lZGlhRW5naW5lKE1lZGlhUGxheWVyRmFjdG9yeSopOwpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRl LmgJKHJldmlzaW9uIDc5NzQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXJQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgot ICogQ29weXJpZ2h0IChDKSAyMDA5LCAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE0NCw2ICsx NDQsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBnZXRTaXRlc0luTWVkaWFDYWNoZShWZWN0b3I8U3Ry aW5nPiYpIHsgfQogICAgIHZvaWQgY2xlYXJNZWRpYUNhY2hlKCkgeyB9CiAgICAgdm9pZCBjbGVh ck1lZGlhQ2FjaGVGb3JTaXRlKGNvbnN0IFN0cmluZyYpIHsgfQorCisgICAgdm9pZCBzZXRQcml2 YXRlQnJvd3NpbmdNb2RlKGJvb2wpIHsgfQogfTsKIAogfQo=