94274 2012-08-16 17:36:59 -0700 Move Shadow DOM inspection feature out from experiments 2012-09-28 01:41:11 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 62220 94082 1 morrita morrita caseq dglazkov hayato pfeldman webcomponents-bugzilla webkit.review.bot oldest_to_newest 697729 0 morrita 2012-08-16 17:36:59 -0700 To ship Shadow DOM by default, it would be great if we can get the inspector support without enabling experimental feature. Since Shadow DOM is only enabled by a few ports, probably it needs to be hidden when the Shadow DOM flag is turned off. 698235 1 pfeldman 2012-08-17 05:19:10 -0700 If shadow dom is not supported on the backend, it won't populate corresponding payloads. As a result, shadow dom will be missing in the UI. When you have actions such as "create shadow dom" that need to know whether shadow dom is supported, you can add a protocol method "DOM.supportsShadowDOM" and query it prior to that action. 698418 2 dglazkov 2012-08-17 09:36:30 -0700 Cool, "Create Shadow Root" action! I haven't even thought about that. And I like the DOM.supportsShadowDOM flag idea. Technically, since the only thing that the Shadow DOM API flag is just flipping on the public-facing API (the plumbing still works), the Inspector could still support Shadow DOM, even if it is disabled. It could even be limited to inspection of the built-in elements, but still useful in that regard. Oh, two things I just remembered: 1) the inspector user shouldn't _ever_ be able to edit user agent shadow roots 2) consider exposing the pseudos for built-in elements in inspector. They aren't interesting for Shadow DOM API itself, but they are very useful for web devs who hack on built-in controls. 699123 3 morrita 2012-08-19 17:53:30 -0700 I'm not sure if it's worth exposing built-in Shadow DOMs if the are no programmable Shadow DOM API - it might feel just a noise. But I understand that it's harmless to show it. My feeling is - Having DOM.supportsShadowDOM is nice especially for more powerful tool support in the future. - even though it isn't mandated for shipping Shadow DOM. 699126 4 hayato 2012-08-19 18:01:44 -0700 I am wondering why we need DOM.supportsShadowDOM. I guess DOM.supportsXXX is a established convention, but the following is enough, isn't it? var supportsShadowDOM = window.WebKitShadowRoot || window.ShadowRoot 699129 5 morrita 2012-08-19 18:10:49 -0700 > I am wondering why we need DOM.supportsShadowDOM. > I guess DOM.supportsXXX is a established convention, but the following is enough, isn't it? > > var supportsShadowDOM = window.WebKitShadowRoot || window.ShadowRoot It's safer to tell it from C++ side since ShadowDOM availability can be switched per-frame (domain) and Inspector has its own page/frame which is different from the page under debug. But in reality, no browser will use such per-frame flag control and it will be OK just to check WebKitShadowRoot :-) 699144 6 hayato 2012-08-19 18:37:05 -0700 Got it. Thank you. I still think a capability test in JS is a most reliable way to judge it. :) (In reply to comment #5) > > I am wondering why we need DOM.supportsShadowDOM. > > I guess DOM.supportsXXX is a established convention, but the following is enough, isn't it? > > > > var supportsShadowDOM = window.WebKitShadowRoot || window.ShadowRoot > It's safer to tell it from C++ side since ShadowDOM availability can be > switched per-frame (domain) and Inspector has its own page/frame > which is different from the page under debug. > > But in reality, no browser will use such per-frame flag control and > it will be OK just to check WebKitShadowRoot :-) 711922 7 162212 morrita 2012-09-05 04:00:33 -0700 Created attachment 162212 Patch 711946 8 162218 morrita 2012-09-05 04:42:22 -0700 Created attachment 162218 Patch 712094 9 162218 dglazkov 2012-09-05 08:46:34 -0700 Comment on attachment 162218 Patch Should we move the supportsShadowDOM somewhere to a global place? 712806 10 162218 webkit.review.bot 2012-09-05 20:07:39 -0700 Comment on attachment 162218 Patch Attachment 162218 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13769193 New failing tests: inspector/elements/edit-dom-actions.html 712906 11 162423 morrita 2012-09-05 22:56:55 -0700 Created attachment 162423 Patch 712907 12 morrita 2012-09-05 22:57:57 -0700 > Should we move the supportsShadowDOM somewhere to a global place? Good point. done. 712929 13 pfeldman 2012-09-05 23:41:05 -0700 You should never trust JS and always do native checks. 1) User can override JS, 2) front-end will run in a separate browser in case of remote debugging / mobile. In your case we don't yet expose shadow Dom specific actions, so we don't need such a check at all. Payload for shadow implies there is shadow content, just use it. 712950 14 morrita 2012-09-06 00:21:07 -0700 Hi Pavel, thanks for taking a look! > You should never trust JS and always do native checks. 1) User can override JS, 2) front-end will run in a separate browser in case of remote debugging / mobile. > Right. I'll add an native check API. > In your case we don't yet expose shadow Dom specific actions, so we don't need such a check at all. Payload for shadow implies there is shadow content, just use it. Some elements like <input> can have shadow tree even if Shadow DOM JavaScript API is disabled. I'm not sure whether it is good idea to expose shadow dom existence even when the developer cannot use it through JavaScript API. Probably we can send the shadow root payload only if the Shadow DOM API is enabled. Then we can have the check on backend and can get rid of check code on frontend side. 713006 15 162446 morrita 2012-09-06 01:13:09 -0700 Created attachment 162446 Patch 713047 16 pfeldman 2012-09-06 02:06:29 -0700 Dmitry, do you want to show input/media shadow when shadow Dom option is checked in the inspector? 713370 17 dglazkov 2012-09-06 09:35:17 -0700 (In reply to comment #16) > Dmitry, do you want to show input/media shadow when shadow Dom option is checked in the inspector? Yes, I think that makes sense. How hard would it be to make them read-only? 713412 18 pfeldman 2012-09-06 10:16:09 -0700 Making it r/o in elements panel should not be hard - mark DOMNodes as read only in DOMagent.js and mute actions associated with them. Should be < 100LOC. Making shadow (read only) not appear in $0 also can be handled from the frontend. Overall, it should not be hard. I wonder if there are more ways to interact with it that need blocking. 713417 19 162446 pfeldman 2012-09-06 10:20:00 -0700 Comment on attachment 162446 Patch As per discussion: this check does not give us much. We should filter shadom Dom out on front-end side when it is not enabled (we should convert experiment into a setting that toggles it instead). And we need to address the r/o roots (thanks to Dimitri for reminding). 713418 20 162446 pfeldman 2012-09-06 10:20:04 -0700 Comment on attachment 162446 Patch As per discussion: this check does not give us much. We should filter shadom Dom out on front-end side when it is not enabled (we should convert experiment into a setting that toggles it instead). And we need to address the r/o roots (thanks to Dimitri for reminding). 713930 21 morrita 2012-09-06 17:53:13 -0700 (In reply to comment #20) > (From update of attachment 162446 [details]) > As per discussion: this check does not give us much. We should filter shadom Dom out on front-end side when it is not enabled (we should convert experiment into a setting that toggles it instead). And we need to address the r/o roots (thanks to Dimitri for reminding). OK, I'll go back to frontend side and see how settings work in inspector JS land. (I'm not familiar with it.) Thanks for the suggestion. On readonly-ness, currently Shadow DOM in general is readonly regardless if it comes from built-in element or not. 714179 22 162683 morrita 2012-09-06 23:41:36 -0700 Created attachment 162683 Patch 714182 23 morrita 2012-09-06 23:43:11 -0700 Updated the patch. It just moves showShadowDOM feature out from experiment. 714359 24 pfeldman 2012-09-07 03:38:16 -0700 But now that we know that it crashes on editing input / media shadow, shouldn't we introduce read only mode prior to moving out of experimental? 716637 25 morrita 2012-09-10 16:12:20 -0700 (In reply to comment #24) > But now that we know that it crashes on editing input / media shadow, shouldn't we introduce read only mode prior to moving out of experimental? I'm sorry but I lost the point. In my understanding, Inspector has implemented read-only mode for Shadow DOM through InspectorDOMAgent::assertEditableElement() and assertEditableNode(). The mechanism looks working as far as I tried on a canary build. Is there any known crash for shadow editing? If any, it shouldn't be shipped and I'm eager to investigate and fix them. 723485 26 pfeldman 2012-09-19 06:01:49 -0700 > I'm sorry but I lost the point. > > In my understanding, Inspector has implemented read-only mode for Shadow DOM through > InspectorDOMAgent::assertEditableElement() and assertEditableNode(). Heh, ok, sorry, I forgot that I did it :) > The mechanism looks working as far as I tried on a canary build. > Is there any known crash for shadow editing? > If any, it shouldn't be shipped and I'm eager to investigate and fix them. I would experiment with $0 in the console - you can remove elements from shadow DOM using %0.parentNode.removeChild($0). The solution would be to either not call ConsoleAgent.addInspectedNode for read-only nodes, or to add 0 node id there. 723486 27 162683 pfeldman 2012-09-19 06:03:10 -0700 Comment on attachment 162683 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162683&action=review > Source/WebCore/inspector/front-end/SettingsScreen.js:271 > + p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Show Shadow DOM"), WebInspector.settings.showShadowDOM)); This string should be added to the English.lproj/localizedStrings.js. Otherwise looks good. 727142 28 morrita 2012-09-24 18:03:08 -0700 (In reply to comment #27) > (From update of attachment 162683 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=162683&action=review > > > Source/WebCore/inspector/front-end/SettingsScreen.js:271 > > + p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Show Shadow DOM"), WebInspector.settings.showShadowDOM)); > > This string should be added to the English.lproj/localizedStrings.js. Otherwise looks good. Thanks for another review, Feldman! I'll update this and land the patch. 730336 29 166166 morrita 2012-09-28 01:04:41 -0700 Created attachment 166166 Patch for landing 730358 30 166166 webkit.review.bot 2012-09-28 01:41:07 -0700 Comment on attachment 166166 Patch for landing Clearing flags on attachment: 166166 Committed r129861: <http://trac.webkit.org/changeset/129861> 730359 31 webkit.review.bot 2012-09-28 01:41:11 -0700 All reviewed patches have been landed. Closing bug. 162212 2012-09-05 04:00:33 -0700 2012-09-05 04:42:18 -0700 Patch bug-94274-20120905200014.patch text/plain 2126 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9ET01BZ2VudC5qcwppbmRleCAyZjQ1MWY1NjU5NjQyOTRlMDI1ODVmNDc1MDVi NmFjOGM4YjQ1MjJjLi44NmFiODgyMTRhZjFhNmU2MWU1MGU2YWExZWU3NWRhNzBhMjQ0ZTIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAg LTc2LDExICs3NiwxNCBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZSA9IGZ1bmN0aW9uKGRvbUFnZW50 LCBkb2MsIGlzSW5TaGFkb3dUcmVlLCBwYXlsb2FkKSB7CiAgICAgICAgIHRoaXMuX3JlbnVtYmVy KCk7CiAgICAgfQogCi0gICAgaWYgKHBheWxvYWQuc2hhZG93Um9vdHMgJiYgV2ViSW5zcGVjdG9y LmV4cGVyaW1lbnRzU2V0dGluZ3Muc2hvd1NoYWRvd0RPTS5pc0VuYWJsZWQoKSkgewotICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHBheWxvYWQuc2hhZG93Um9vdHMubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgICAgIHZhciByb290ID0gcGF5bG9hZC5zaGFkb3dSb290c1tpXTsKLSAgICAgICAg ICAgIHZhciBub2RlID0gbmV3IFdlYkluc3BlY3Rvci5ET01Ob2RlKHRoaXMuX2RvbUFnZW50LCB0 aGlzLm93bmVyRG9jdW1lbnQsIHRydWUsIHJvb3QpOwotICAgICAgICAgICAgdGhpcy5fc2hhZG93 Um9vdHMucHVzaChub2RlKTsKKyAgICBpZiAocGF5bG9hZC5zaGFkb3dSb290cykgeworICAgICAg ICB2YXIgc3VwcG9ydHNTaGFkb3dET00gPSB3aW5kb3cuV2ViS2l0U2hhZG93Um9vdCB8fCB3aW5k b3cuU2hhZG93Um9vdDsKKyAgICAgICAgaWYgKHN1cHBvcnRzU2hhZG93RE9NKSB7CisgICAgICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBheWxvYWQuc2hhZG93Um9vdHMubGVuZ3RoOyArK2kp IHsKKyAgICAgICAgICAgICAgICB2YXIgcm9vdCA9IHBheWxvYWQuc2hhZG93Um9vdHNbaV07Cisg ICAgICAgICAgICAgICAgdmFyIG5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRPTU5vZGUodGhpcy5f ZG9tQWdlbnQsIHRoaXMub3duZXJEb2N1bWVudCwgdHJ1ZSwgcm9vdCk7CisgICAgICAgICAgICAg ICAgdGhpcy5fc2hhZG93Um9vdHMucHVzaChub2RlKTsKKyAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGlu Z3MuanMKaW5kZXggNjc2NWRjNTQyMWU2NmJjNGFkNjdlNTJjMzYxZmYyNGRlMTUyZmU2Yi4uZjQw YzNjMWNmZTFkYTk4MzIxOTIyOWFjZDEwYTI1NDllOWE2MzQyMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC0xODYsNyArMTg2LDYgQEAg V2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f ZW5hYmxlZEZvclRlc3QgPSB7fTsKICAgICAKICAgICAvLyBBZGQgY3VycmVudGx5IHJ1bm5pbmcg ZXhwZXJpbWVudHMgaGVyZS4KLSAgICB0aGlzLnNob3dTaGFkb3dET00gPSB0aGlzLl9jcmVhdGVF eHBlcmltZW50KCJzaG93U2hhZG93RE9NIiwgIlNob3cgc2hhZG93IERPTSIpOwogICAgIHRoaXMu c25pcHBldHNTdXBwb3J0ID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic25pcHBldHNTdXBwb3J0 IiwgIlNuaXBwZXRzIHN1cHBvcnQiKTsKICAgICB0aGlzLm5hdGl2ZU1lbW9yeVNuYXBzaG90cyA9 IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoIm5hdGl2ZU1lbW9yeVNuYXBzaG90cyIsICJOYXRpdmUg bWVtb3J5IHByb2ZpbGluZyIpOwogICAgIHRoaXMubGl2ZU5hdGl2ZU1lbW9yeUNoYXJ0ID0gdGhp cy5fY3JlYXRlRXhwZXJpbWVudCgibGl2ZU5hdGl2ZU1lbW9yeUNoYXJ0IiwgIkxpdmUgbmF0aXZl IG1lbW9yeSBjaGFydCIpOwo= 162218 2012-09-05 04:42:22 -0700 2012-09-05 22:56:51 -0700 Patch bug-94274-20120905204204.patch text/plain 2976 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWNmNTQ4N2FjNTYyMmY3 ZTAzY2RmNjAzNDdiYjI4NDJkNTYwZjgxZi4uOTUxNWUzNjBkODQ1NjUzODAzMTZkZjM0ZTNkMmUx YzAxOWI2ZGEzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA5LTA1ICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIE1vdmUgU2hhZG93IERP TSBpbnNwZWN0aW9uIGZlYXR1cmUgb3V0IGZyb20gZXhwZXJpbWVudHMgaWYgU2hhZG93IERPTSBm bGFnIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk0Mjc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBjaGFuZ2UgcmVwbGFjZXMgdGhlIHNob3dTaGFkb3dET00gZXhwZXJpbWVudCBm bGFnIHdpdGggYW4gQVBJIGF2YWlsYWJpbGl0eSBkZXRlY3Rpb24uCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5v ZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5ncyk6CisKIDIwMTItMDktMDUgIFBhdHJp Y2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4IGZv ciBXaW5DRSBhZnRlciByMTI3NTI1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRE9NQWdlbnQuanMKaW5kZXggMmY0NTFmNTY1OTY0Mjk0ZTAyNTg1ZjQ3NTA1YjZhYzhj OGI0NTIyYy4uODZhYjg4MjE0YWYxYTZlNjFlNTBlNmFhMWVlNzVkYTcwYTI0NGUyMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBAIC03Niwx MSArNzYsMTQgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUgPSBmdW5jdGlvbihkb21BZ2VudCwgZG9j LCBpc0luU2hhZG93VHJlZSwgcGF5bG9hZCkgewogICAgICAgICB0aGlzLl9yZW51bWJlcigpOwog ICAgIH0KIAotICAgIGlmIChwYXlsb2FkLnNoYWRvd1Jvb3RzICYmIFdlYkluc3BlY3Rvci5leHBl cmltZW50c1NldHRpbmdzLnNob3dTaGFkb3dET00uaXNFbmFibGVkKCkpIHsKLSAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBwYXlsb2FkLnNoYWRvd1Jvb3RzLmxlbmd0aDsgKytpKSB7Ci0gICAg ICAgICAgICB2YXIgcm9vdCA9IHBheWxvYWQuc2hhZG93Um9vdHNbaV07Ci0gICAgICAgICAgICB2 YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuRE9NTm9kZSh0aGlzLl9kb21BZ2VudCwgdGhpcy5v d25lckRvY3VtZW50LCB0cnVlLCByb290KTsKLSAgICAgICAgICAgIHRoaXMuX3NoYWRvd1Jvb3Rz LnB1c2gobm9kZSk7CisgICAgaWYgKHBheWxvYWQuc2hhZG93Um9vdHMpIHsKKyAgICAgICAgdmFy IHN1cHBvcnRzU2hhZG93RE9NID0gd2luZG93LldlYktpdFNoYWRvd1Jvb3QgfHwgd2luZG93LlNo YWRvd1Jvb3Q7CisgICAgICAgIGlmIChzdXBwb3J0c1NoYWRvd0RPTSkgeworICAgICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBwYXlsb2FkLnNoYWRvd1Jvb3RzLmxlbmd0aDsgKytpKSB7Cisg ICAgICAgICAgICAgICAgdmFyIHJvb3QgPSBwYXlsb2FkLnNoYWRvd1Jvb3RzW2ldOworICAgICAg ICAgICAgICAgIHZhciBub2RlID0gbmV3IFdlYkluc3BlY3Rvci5ET01Ob2RlKHRoaXMuX2RvbUFn ZW50LCB0aGlzLm93bmVyRG9jdW1lbnQsIHRydWUsIHJvb3QpOworICAgICAgICAgICAgICAgIHRo aXMuX3NoYWRvd1Jvb3RzLnB1c2gobm9kZSk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0 dGluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpz CmluZGV4IDY3NjVkYzU0MjFlNjZiYzRhZDY3ZTUyYzM2MWZmMjRkZTE1MmZlNmIuLmY0MGMzYzFj ZmUxZGE5ODMyMTkyMjlhY2QxMGEyNTQ5ZTlhNjM0MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtMTg2LDcgKzE4Niw2IEBAIFdlYklu c3BlY3Rvci5FeHBlcmltZW50c1NldHRpbmdzID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2VuYWJs ZWRGb3JUZXN0ID0ge307CiAgICAgCiAgICAgLy8gQWRkIGN1cnJlbnRseSBydW5uaW5nIGV4cGVy aW1lbnRzIGhlcmUuCi0gICAgdGhpcy5zaG93U2hhZG93RE9NID0gdGhpcy5fY3JlYXRlRXhwZXJp bWVudCgic2hvd1NoYWRvd0RPTSIsICJTaG93IHNoYWRvdyBET00iKTsKICAgICB0aGlzLnNuaXBw ZXRzU3VwcG9ydCA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNuaXBwZXRzU3VwcG9ydCIsICJT bmlwcGV0cyBzdXBwb3J0Iik7CiAgICAgdGhpcy5uYXRpdmVNZW1vcnlTbmFwc2hvdHMgPSB0aGlz Ll9jcmVhdGVFeHBlcmltZW50KCJuYXRpdmVNZW1vcnlTbmFwc2hvdHMiLCAiTmF0aXZlIG1lbW9y eSBwcm9maWxpbmciKTsKICAgICB0aGlzLmxpdmVOYXRpdmVNZW1vcnlDaGFydCA9IHRoaXMuX2Ny ZWF0ZUV4cGVyaW1lbnQoImxpdmVOYXRpdmVNZW1vcnlDaGFydCIsICJMaXZlIG5hdGl2ZSBtZW1v cnkgY2hhcnQiKTsK 162423 2012-09-05 22:56:55 -0700 2012-09-06 01:13:05 -0700 Patch bug-94274-20120906145636.patch text/plain 4123 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NjY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRmMDViY2FkYTY3NGFh YmJkMzA1NTYzMmMwOGQwNjZiNmIyYWNmOC4uMjE2ZWYyYzgxZmViNmRlN2IwNGE3MmM4MmIwOTY3 NDUzYTQ3ZGQ0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA5LTA1ICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIE1vdmUgU2hhZG93IERP TSBpbnNwZWN0aW9uIGZlYXR1cmUgb3V0IGZyb20gZXhwZXJpbWVudHMgaWYgU2hhZG93IERPTSBm bGFnIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk0Mjc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBjaGFuZ2UgcmVwbGFjZXMgdGhlIHNob3dTaGFkb3dET00gZXhwZXJpbWVudCBm bGFnIHdpdGggYW4gQVBJIGF2YWlsYWJpbGl0eSBkZXRlY3Rpb24uCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5v ZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5ncyk6CisKIDIwMTItMDktMDUgIEtlbmlj aGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0g VW5yZXZpZXdlZCwgYnVpbGQgZml4IGF0dGVtcHQgYWZ0ZXIgcjEyNzY2MApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggMmY0NTFmNTY1OTY0 Mjk0ZTAyNTg1ZjQ3NTA1YjZhYzhjOGI0NTIyYy4uNzk1NTE4NDMzNWNmN2FiZTYzMWE5NjNhZGQ2 ODgxOWZlNjQ5Nzk4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9ET01BZ2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RPTUFnZW50LmpzCkBAIC03Niw3ICs3Niw3IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0gZnVu Y3Rpb24oZG9tQWdlbnQsIGRvYywgaXNJblNoYWRvd1RyZWUsIHBheWxvYWQpIHsKICAgICAgICAg dGhpcy5fcmVudW1iZXIoKTsKICAgICB9CiAKLSAgICBpZiAocGF5bG9hZC5zaGFkb3dSb290cyAm JiBXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zaG93U2hhZG93RE9NLmlzRW5hYmxl ZCgpKSB7CisgICAgaWYgKHBheWxvYWQuc2hhZG93Um9vdHMgJiYgV2ViSW5zcGVjdG9yLkRPTU5v ZGUuc3VwcG9ydHNTaGFkb3dET00pIHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwYXls b2FkLnNoYWRvd1Jvb3RzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgcm9vdCA9IHBh eWxvYWQuc2hhZG93Um9vdHNbaV07CiAgICAgICAgICAgICB2YXIgbm9kZSA9IG5ldyBXZWJJbnNw ZWN0b3IuRE9NTm9kZSh0aGlzLl9kb21BZ2VudCwgdGhpcy5vd25lckRvY3VtZW50LCB0cnVlLCBy b290KTsKQEAgLTEwMCw2ICsxMDAsOCBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZSA9IGZ1bmN0aW9u KGRvbUFnZW50LCBkb2MsIGlzSW5TaGFkb3dUcmVlLCBwYXlsb2FkKSB7CiAgICAgfQogfQogCitX ZWJJbnNwZWN0b3IuRE9NTm9kZS5zdXBwb3J0c1NoYWRvd0RPTSA9IHdpbmRvdy5XZWJLaXRTaGFk b3dSb290IHx8IHdpbmRvdy5TaGFkb3dSb290OworCiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICog QHBhcmFtIHtzdHJpbmd9IHZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TZXR0aW5ncy5qcwppbmRleCA2NzY1ZGM1NDIxZTY2YmM0YWQ2N2U1MmMzNjFmZjI0ZGUx NTJmZTZiLi5mNDBjM2MxY2ZlMWRhOTgzMjE5MjI5YWNkMTBhMjU0OWU5YTYzNDIwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKQEAgLTE4Niw3 ICsxODYsNiBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5ncyA9IGZ1bmN0aW9uKCkK ICAgICB0aGlzLl9lbmFibGVkRm9yVGVzdCA9IHt9OwogICAgIAogICAgIC8vIEFkZCBjdXJyZW50 bHkgcnVubmluZyBleHBlcmltZW50cyBoZXJlLgotICAgIHRoaXMuc2hvd1NoYWRvd0RPTSA9IHRo aXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNob3dTaGFkb3dET00iLCAiU2hvdyBzaGFkb3cgRE9NIik7 CiAgICAgdGhpcy5zbmlwcGV0c1N1cHBvcnQgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJzbmlw cGV0c1N1cHBvcnQiLCAiU25pcHBldHMgc3VwcG9ydCIpOwogICAgIHRoaXMubmF0aXZlTWVtb3J5 U25hcHNob3RzID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgibmF0aXZlTWVtb3J5U25hcHNob3Rz IiwgIk5hdGl2ZSBtZW1vcnkgcHJvZmlsaW5nIik7CiAgICAgdGhpcy5saXZlTmF0aXZlTWVtb3J5 Q2hhcnQgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJsaXZlTmF0aXZlTWVtb3J5Q2hhcnQiLCAi TGl2ZSBuYXRpdmUgbWVtb3J5IGNoYXJ0Iik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTc4ODdhZWIxOTJjMDVhNzI2ZTAy YzMzNDRhZTdhMGUzYzljNGViZi4uM2I2M2ZlZTAzZDdmOWYzYjA2ODIwZDZjMTc4YTU4NjFhYmVm YmU2OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA5LTA1ICBNT1JJVEEgSGFqaW1lICA8 bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIE1vdmUgU2hhZG93IERPTSBpbnNwZWN0aW9u IGZlYXR1cmUgb3V0IGZyb20gZXhwZXJpbWVudHMgaWYgU2hhZG93IERPTSBmbGFnIGlzIGVuYWJs ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mjc0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRl ZCB0aGUgZXhwZWN0ZWQgd2hpY2ggcmVmbGVjdHMgc2hhZG93IHN1YnRyZWUgZXhpc3RlbmNlLgor CisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL2VkaXQtZG9tLWFjdGlvbnMtZXhwZWN0ZWQu dHh0OgorCiAyMDEyLTA5LTA1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVuYW1lZCBhIG1pc25hbWVkIGV4cGVjdGVkIHJlc3VsdC4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lZGl0LWRvbS1hY3Rpb25zLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lZGl0LWRvbS1hY3Rpb25zLWV4cGVj dGVkLnR4dAppbmRleCAwYTViODkxMGZiOGYxMjJkNmVlOTU2Yjg1MDBkZjNkMzRkMmU1OTk4Li5m MzNhOWM0NjVjNDk4ZDU4NzgzNDY2N2EyYzc5Yzk3NTlhOGVhMjM1IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvZWRpdC1kb20tYWN0aW9ucy1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VkaXQtZG9tLWFjdGlvbnMtZXhw ZWN0ZWQudHh0CkBAIC0zMyw3ICszMyw3IEBAIFJ1bm5pbmc6IHRlc3RTZXROb2RlTmFtZUlucHV0 CiAgIDwvZGl2PgogPT09PSBhZnRlciA9PT09CiAtIDxkaXYgaWQ9InRlc3RTZXROb2RlTmFtZUlu cHV0Ij4KLSAgICAgIDxpbnB1dCBpZD0ibm9kZS10by1zZXQtbmFtZS1pbnB1dCIgPgorICAgICsg PGlucHV0IGlkPSJub2RlLXRvLXNldC1uYW1lLWlucHV0IiA+CiAgIDwvZGl2PgogCiBSdW5uaW5n OiB0ZXN0U2V0Tm9kZVZhbHVlCg== 162446 2012-09-06 01:13:09 -0700 2012-09-06 23:41:32 -0700 Patch bug-94274-20120906171249.patch text/plain 6906 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NjY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRmMDViY2FkYTY3NGFh YmJkMzA1NTYzMmMwOGQwNjZiNmIyYWNmOC4uNDJlYTA4ZDRmMDEwOWZkZTJiMjljYjUwZmZmNDM0 ZDlmNjFjYTBiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA5LTA2ICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIE1vdmUgU2hhZG93IERP TSBpbnNwZWN0aW9uIGZlYXR1cmUgb3V0IGZyb20gZXhwZXJpbWVudHMgaWYgU2hhZG93IERPTSBm bGFnIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk0Mjc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBjaGFuZ2UgcmVtb3ZlcyB0aGUgInNob3dTaGFkb3dET00iIGV4cGVyaW1lbnQg c2V0dGluZy4gQWx0ZXJuYXRpdmVseSwKKyAgICAgICAgSW5zcGVjdG9yRE9NQWdlbnQgbm93IHN0 b3BzIGluY2x1ZGluZyBTaGFkb3dSb290cyB0byBpdHMgIHBheWxvYWQgd2hlbgorICAgICAgICB0 aGUgU2hhZG93IERPTSBpcyBkaXNhYmxlZC4gQnkgZG9pbmcgdGhpcywgU2hhZG93Um9vdHMgYXJl IHNob3duIG9ubHkgaWYKKyAgICAgICAgU2hhZG93IERPTSBmZWF0dXJlIGlzIGVuYWJsZWQgcmVn YXJkbGVzcyB3aGV0aGVyIHRoZSBzaGFkb3cgdHJlZSBpcyBVQSBzaGFkb3cgb3Igbm90LgorCisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZvck5vZGUpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmRpZFB1c2hTaGFkb3dSb290KToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojp3aWxsUG9wU2hhZG93Um9vdCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E T01Ob2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MpOgorCiAyMDEyLTA5LTA1ICBL ZW5pY2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21p dW1dIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeCBhdHRlbXB0IGFmdGVyIHIxMjc2NjAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IGVkNDdiNWQw YTE3MzkwMjU1OTYzNDNhMDI3M2RiZGExZjBlMjQzNjcuLjk0MDkwNWY5MGUxYzM4YTA5MDE3ZmM1 YTQ1MzdmN2RjYzU4YzRjM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmNwcApAQCAtNDQsNiArNDQsNyBAQAogI2luY2x1ZGUgIkNTU1N0eWxlU2hl ZXQuaCIKICNpbmNsdWRlICJDaGFyYWN0ZXJEYXRhLmgiCiAjaW5jbHVkZSAiQ29udGFpbmVyTm9k ZS5oIgorI2luY2x1ZGUgIkNvbnRleHRGZWF0dXJlcy5oIgogI2luY2x1ZGUgIkNvb2tpZS5oIgog I2luY2x1ZGUgIkNvb2tpZUphci5oIgogI2luY2x1ZGUgIkRPTUVkaXRvci5oIgpAQCAtMTIyOSwx MiArMTIzMCwxNCBAQCBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpET006Ok5vZGU+IEluc3BlY3Rv ckRPTUFnZW50OjpidWlsZE9iamVjdEZvck5vZGUoTm9kZSogbgogICAgICAgICAgICAgICAgIHZh bHVlLT5zZXRDb250ZW50RG9jdW1lbnQoYnVpbGRPYmplY3RGb3JOb2RlKGRvYywgMCwgbm9kZXNN YXApKTsKICAgICAgICAgfQogCi0gICAgICAgIEVsZW1lbnRTaGFkb3cqIHNoYWRvdyA9IGVsZW1l bnQtPnNoYWRvdygpOwotICAgICAgICBpZiAoc2hhZG93KSB7Ci0gICAgICAgICAgICBSZWZQdHI8 VHlwZUJ1aWxkZXI6OkFycmF5PFR5cGVCdWlsZGVyOjpET006Ok5vZGU+ID4gc2hhZG93Um9vdHMg PSBUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkRPTTo6Tm9kZT46OmNyZWF0ZSgpOwot ICAgICAgICAgICAgZm9yIChTaGFkb3dSb290KiByb290ID0gc2hhZG93LT55b3VuZ2VzdFNoYWRv d1Jvb3QoKTsgcm9vdDsgcm9vdCA9IHJvb3QtPm9sZGVyU2hhZG93Um9vdCgpKQotICAgICAgICAg ICAgICAgIHNoYWRvd1Jvb3RzLT5hZGRJdGVtKGJ1aWxkT2JqZWN0Rm9yTm9kZShyb290LCAwLCBu b2Rlc01hcCkpOwotICAgICAgICAgICAgdmFsdWUtPnNldFNoYWRvd1Jvb3RzKHNoYWRvd1Jvb3Rz KTsKKyAgICAgICAgaWYgKENvbnRleHRGZWF0dXJlczo6c2hhZG93RE9NRW5hYmxlZChtX2RvY3Vt ZW50LmdldCgpKSkgeworICAgICAgICAgICAgRWxlbWVudFNoYWRvdyogc2hhZG93ID0gZWxlbWVu dC0+c2hhZG93KCk7CisgICAgICAgICAgICBpZiAoc2hhZG93KSB7CisgICAgICAgICAgICAgICAg UmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxUeXBlQnVpbGRlcjo6RE9NOjpOb2RlPiA+IHNoYWRv d1Jvb3RzID0gVHlwZUJ1aWxkZXI6OkFycmF5PFR5cGVCdWlsZGVyOjpET006Ok5vZGU+OjpjcmVh dGUoKTsKKyAgICAgICAgICAgICAgICBmb3IgKFNoYWRvd1Jvb3QqIHJvb3QgPSBzaGFkb3ctPnlv dW5nZXN0U2hhZG93Um9vdCgpOyByb290OyByb290ID0gcm9vdC0+b2xkZXJTaGFkb3dSb290KCkp CisgICAgICAgICAgICAgICAgICAgIHNoYWRvd1Jvb3RzLT5hZGRJdGVtKGJ1aWxkT2JqZWN0Rm9y Tm9kZShyb290LCAwLCBub2Rlc01hcCkpOworICAgICAgICAgICAgICAgIHZhbHVlLT5zZXRTaGFk b3dSb290cyhzaGFkb3dSb290cyk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVs c2UgaWYgKG5vZGUtPmlzRG9jdW1lbnROb2RlKCkpIHsKICAgICAgICAgRG9jdW1lbnQqIGRvY3Vt ZW50ID0gc3RhdGljX2Nhc3Q8RG9jdW1lbnQqPihub2RlKTsKQEAgLTE1MjEsNiArMTUyNCw4IEBA IHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmRpZEludmFsaWRhdGVTdHlsZUF0dHIoTm9kZSogbm9k ZSkKIAogdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6ZGlkUHVzaFNoYWRvd1Jvb3QoRWxlbWVudCog aG9zdCwgU2hhZG93Um9vdCogcm9vdCkKIHsKKyAgICBpZiAoIUNvbnRleHRGZWF0dXJlczo6c2hh ZG93RE9NRW5hYmxlZChtX2RvY3VtZW50LmdldCgpKSkKKyAgICAgICAgcmV0dXJuOwogICAgIGlu dCBob3N0SWQgPSBtX2RvY3VtZW50Tm9kZVRvSWRNYXAuZ2V0KGhvc3QpOwogICAgIGlmIChob3N0 SWQpCiAgICAgICAgIG1fZnJvbnRlbmQtPnNoYWRvd1Jvb3RQdXNoZWQoaG9zdElkLCBidWlsZE9i amVjdEZvck5vZGUocm9vdCwgMCwgJm1fZG9jdW1lbnROb2RlVG9JZE1hcCkpOwpAQCAtMTUyOCw2 ICsxNTMzLDggQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6ZGlkUHVzaFNoYWRvd1Jvb3QoRWxl bWVudCogaG9zdCwgU2hhZG93Um9vdCogcm9vdCkKIAogdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6 d2lsbFBvcFNoYWRvd1Jvb3QoRWxlbWVudCogaG9zdCwgU2hhZG93Um9vdCogcm9vdCkKIHsKKyAg ICBpZiAoIUNvbnRleHRGZWF0dXJlczo6c2hhZG93RE9NRW5hYmxlZChtX2RvY3VtZW50LmdldCgp KSkKKyAgICAgICAgcmV0dXJuOwogICAgIGludCBob3N0SWQgPSBtX2RvY3VtZW50Tm9kZVRvSWRN YXAuZ2V0KGhvc3QpOwogICAgIGludCByb290SWQgPSBtX2RvY3VtZW50Tm9kZVRvSWRNYXAuZ2V0 KHJvb3QpOwogICAgIGlmIChob3N0SWQgJiYgcm9vdElkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggMmY0NTFmNTY1OTY0Mjk0ZTAyNTg1 ZjQ3NTA1YjZhYzhjOGI0NTIyYy4uN2YyNGMxNmI2YzdjNTY2MDJkNTc3MDA1Y2U0ZmY5NDE4YTE3 Y2E0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01B Z2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50 LmpzCkBAIC03Niw3ICs3Niw3IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0gZnVuY3Rpb24oZG9t QWdlbnQsIGRvYywgaXNJblNoYWRvd1RyZWUsIHBheWxvYWQpIHsKICAgICAgICAgdGhpcy5fcmVu dW1iZXIoKTsKICAgICB9CiAKLSAgICBpZiAocGF5bG9hZC5zaGFkb3dSb290cyAmJiBXZWJJbnNw ZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zaG93U2hhZG93RE9NLmlzRW5hYmxlZCgpKSB7Cisg ICAgaWYgKHBheWxvYWQuc2hhZG93Um9vdHMpIHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBwYXlsb2FkLnNoYWRvd1Jvb3RzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgcm9v dCA9IHBheWxvYWQuc2hhZG93Um9vdHNbaV07CiAgICAgICAgICAgICB2YXIgbm9kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuRE9NTm9kZSh0aGlzLl9kb21BZ2VudCwgdGhpcy5vd25lckRvY3VtZW50LCB0 cnVlLCByb290KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRp bmdzLmpzCmluZGV4IDY3NjVkYzU0MjFlNjZiYzRhZDY3ZTUyYzM2MWZmMjRkZTE1MmZlNmIuLmY0 MGMzYzFjZmUxZGE5ODMyMTkyMjlhY2QxMGEyNTQ5ZTlhNjM0MjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtMTg2LDcgKzE4Niw2IEBA IFdlYkluc3BlY3Rvci5FeHBlcmltZW50c1NldHRpbmdzID0gZnVuY3Rpb24oKQogICAgIHRoaXMu X2VuYWJsZWRGb3JUZXN0ID0ge307CiAgICAgCiAgICAgLy8gQWRkIGN1cnJlbnRseSBydW5uaW5n IGV4cGVyaW1lbnRzIGhlcmUuCi0gICAgdGhpcy5zaG93U2hhZG93RE9NID0gdGhpcy5fY3JlYXRl RXhwZXJpbWVudCgic2hvd1NoYWRvd0RPTSIsICJTaG93IHNoYWRvdyBET00iKTsKICAgICB0aGlz LnNuaXBwZXRzU3VwcG9ydCA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNuaXBwZXRzU3VwcG9y dCIsICJTbmlwcGV0cyBzdXBwb3J0Iik7CiAgICAgdGhpcy5uYXRpdmVNZW1vcnlTbmFwc2hvdHMg PSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJuYXRpdmVNZW1vcnlTbmFwc2hvdHMiLCAiTmF0aXZl IG1lbW9yeSBwcm9maWxpbmciKTsKICAgICB0aGlzLmxpdmVOYXRpdmVNZW1vcnlDaGFydCA9IHRo aXMuX2NyZWF0ZUV4cGVyaW1lbnQoImxpdmVOYXRpdmVNZW1vcnlDaGFydCIsICJMaXZlIG5hdGl2 ZSBtZW1vcnkgY2hhcnQiKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlNzg4N2FlYjE5MmMwNWE3MjZlMDJjMzM0NGFlN2Ew ZTNjOWM0ZWJmLi5mN2U3NzA0OGU4OTczZjU1ZTk2NjBlNTE3YjAxY2NiMzk1ZGY5NjZjIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDktMDYgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdv b2dsZS5jb20+CisKKyAgICAgICAgTW92ZSBTaGFkb3cgRE9NIGluc3BlY3Rpb24gZmVhdHVyZSBv dXQgZnJvbSBleHBlcmltZW50cyBpZiBTaGFkb3cgRE9NIGZsYWcgaXMgZW5hYmxlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQyNzQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGVkIHRoZSBleHBl Y3RlZCB3aGljaCByZWZsZWN0cyBzaGFkb3cgc3VidHJlZSBleGlzdGVuY2UuCisKKyAgICAgICAg KiBpbnNwZWN0b3IvZWxlbWVudHMvZWRpdC1kb20tYWN0aW9ucy1leHBlY3RlZC50eHQ6CisKIDIw MTItMDktMDUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5h bWVkIGEgbWlzbmFtZWQgZXhwZWN0ZWQgcmVzdWx0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2VsZW1lbnRzL2VkaXQtZG9tLWFjdGlvbnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VkaXQtZG9tLWFjdGlvbnMtZXhwZWN0ZWQudHh0Cmlu ZGV4IDBhNWI4OTEwZmI4ZjEyMmQ2ZWU5NTZiODUwMGRmM2QzNGQyZTU5OTguLmYzM2E5YzQ2NWM0 OThkNTg3ODM0NjY3YTJjNzljOTc1OWE4ZWEyMzUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9lbGVtZW50cy9lZGl0LWRvbS1hY3Rpb25zLWV4cGVjdGVkLnR4dAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvZWRpdC1kb20tYWN0aW9ucy1leHBlY3RlZC50eHQK QEAgLTMzLDcgKzMzLDcgQEAgUnVubmluZzogdGVzdFNldE5vZGVOYW1lSW5wdXQKICAgPC9kaXY+ CiA9PT09IGFmdGVyID09PT0KIC0gPGRpdiBpZD0idGVzdFNldE5vZGVOYW1lSW5wdXQiPgotICAg ICAgPGlucHV0IGlkPSJub2RlLXRvLXNldC1uYW1lLWlucHV0IiA+CisgICAgKyA8aW5wdXQgaWQ9 Im5vZGUtdG8tc2V0LW5hbWUtaW5wdXQiID4KICAgPC9kaXY+CiAKIFJ1bm5pbmc6IHRlc3RTZXRO b2RlVmFsdWUK 162683 2012-09-06 23:41:36 -0700 2012-09-28 01:04:36 -0700 Patch bug-94274-20120907154116.patch text/plain 4254 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3ODMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY1Zjg2YzAwZmZmNTVj ZWRhMDUxYjE1M2ExNTE3YTdkMDNlN2ViYi4uMjc1ZDJjNTM0Njc4ZGUwNjY5MGEwMDI0MDI5OTg2 Yzk1NTEwOTJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA5LTA2ICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIE1vdmUgU2hhZG93IERP TSBpbnNwZWN0aW9uIGZlYXR1cmUgb3V0IGZyb20gZXhwZXJpbWVudHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mjc0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFnbmUgdHVybnMgdGhlIHNo b3dTaGFkb3dET00gZXhwZXJpbWVudHMgaW50byBhIHNldHRpbmdzLAorICAgICAgICBhZGRpbmcg YVNldHRpbmdzU2NyZWVuIGVudHJ5IGZvciB0aGF0LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9ET01BZ2VudC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRp bmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFiKToKKwogMjAxMi0wOS0wNiAgU2hlcmlmZiBC b3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg cm9sbGluZyBvdXQgcjEyNzgyMi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRE9NQWdlbnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RPTUFnZW50LmpzCmluZGV4IDJmNDUxZjU2NTk2NDI5NGUwMjU4NWY0NzUwNWI2YWM4Yzhi NDUyMmMuLjJhMDdkNTJmZmU2N2I4MDEwODBhOGE0MGJiZjlmMWFhNmM2YTE1NmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwpAQCAtNzYsNyAr NzYsNyBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZSA9IGZ1bmN0aW9uKGRvbUFnZW50LCBkb2MsIGlz SW5TaGFkb3dUcmVlLCBwYXlsb2FkKSB7CiAgICAgICAgIHRoaXMuX3JlbnVtYmVyKCk7CiAgICAg fQogCi0gICAgaWYgKHBheWxvYWQuc2hhZG93Um9vdHMgJiYgV2ViSW5zcGVjdG9yLmV4cGVyaW1l bnRzU2V0dGluZ3Muc2hvd1NoYWRvd0RPTS5pc0VuYWJsZWQoKSkgeworICAgIGlmIChwYXlsb2Fk LnNoYWRvd1Jvb3RzICYmIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2hhZG93RE9NLmdldCgp KSB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGF5bG9hZC5zaGFkb3dSb290cy5sZW5n dGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHJvb3QgPSBwYXlsb2FkLnNoYWRvd1Jvb3RzW2ld OwogICAgICAgICAgICAgdmFyIG5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRPTU5vZGUodGhpcy5f ZG9tQWdlbnQsIHRoaXMub3duZXJEb2N1bWVudCwgdHJ1ZSwgcm9vdCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCA2NzY1ZGM1NDIxZTY2 YmM0YWQ2N2U1MmMzNjFmZjI0ZGUxNTJmZTZiLi40ZGQ5YmEwNzc5YzY4ZjM4MTNhMGQ1MzI4OTVk ODg2ZjM4MjUzNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3MuanMKQEAgLTk1LDYgKzk1LDcgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuZG9ja1RvUmlnaHQgPSB0aGlzLmNyZWF0ZVNldHRpbmcoImRvY2tU b1JpZ2h0IiwgZmFsc2UpOwogICAgIHRoaXMuZW11bGF0ZVRvdWNoRXZlbnRzID0gdGhpcy5jcmVh dGVTZXR0aW5nKCJlbXVsYXRlVG91Y2hFdmVudHMiLCBmYWxzZSk7CiAgICAgdGhpcy5zaG93UGFp bnRSZWN0cyA9IHRoaXMuY3JlYXRlU2V0dGluZygic2hvd1BhaW50UmVjdHMiLCBmYWxzZSk7Cisg ICAgdGhpcy5zaG93U2hhZG93RE9NID0gdGhpcy5jcmVhdGVTZXR0aW5nKCJzaG93U2hhZG93RE9N IiwgZmFsc2UpOwogICAgIHRoaXMuem9vbUxldmVsID0gdGhpcy5jcmVhdGVTZXR0aW5nKCJ6b29t TGV2ZWwiLCAwKTsKICAgICB0aGlzLnNhdmVkVVJMcyA9IHRoaXMuY3JlYXRlU2V0dGluZygic2F2 ZWRVUkxzIiwge30pOwogICAgIHRoaXMuamF2YVNjcmlwdERpc2FibGVkID0gdGhpcy5jcmVhdGVT ZXR0aW5nKCJqYXZhU2NyaXB0RGlzYWJsZWQiLCBmYWxzZSk7CkBAIC0xODYsNyArMTg3LDYgQEAg V2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f ZW5hYmxlZEZvclRlc3QgPSB7fTsKICAgICAKICAgICAvLyBBZGQgY3VycmVudGx5IHJ1bm5pbmcg ZXhwZXJpbWVudHMgaGVyZS4KLSAgICB0aGlzLnNob3dTaGFkb3dET00gPSB0aGlzLl9jcmVhdGVF eHBlcmltZW50KCJzaG93U2hhZG93RE9NIiwgIlNob3cgc2hhZG93IERPTSIpOwogICAgIHRoaXMu c25pcHBldHNTdXBwb3J0ID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic25pcHBldHNTdXBwb3J0 IiwgIlNuaXBwZXRzIHN1cHBvcnQiKTsKICAgICB0aGlzLm5hdGl2ZU1lbW9yeVNuYXBzaG90cyA9 IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoIm5hdGl2ZU1lbW9yeVNuYXBzaG90cyIsICJOYXRpdmUg bWVtb3J5IHByb2ZpbGluZyIpOwogICAgIHRoaXMubGl2ZU5hdGl2ZU1lbW9yeUNoYXJ0ID0gdGhp cy5fY3JlYXRlRXhwZXJpbWVudCgibGl2ZU5hdGl2ZU1lbW9yeUNoYXJ0IiwgIkxpdmUgbmF0aXZl IG1lbW9yeSBjaGFydCIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2V0dGluZ3NTY3JlZW4uanMKaW5kZXggNzI4Mzg5YzdmNzY0YWRmMTFlNzI4YTlkYjcy NWU5M2M2MWM4OTIwYy4uNjE5YTVkMDM1MTMwNmM1YTA1NjBkMzUyMDllY2M2ZmU5OTAwYjE1MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1Nj cmVlbi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdz U2NyZWVuLmpzCkBAIC0yNjgsNiArMjY4LDcgQEAgV2ViSW5zcGVjdG9yLkdlbmVyaWNTZXR0aW5n c1RhYiA9IGZ1bmN0aW9uKCkKICAgICAgICAgWyBXZWJJbnNwZWN0b3IuQ29sb3IuRm9ybWF0LkhT TCwgIkhTTDogaHNsKDMwMCwgODAlLCA5MCUpIiBdIF0sIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5j b2xvckZvcm1hdCkpOwogICAgIHAuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0 aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyB1c2VyIGFnZW50IHN0eWxlcyIpLCBXZWJJ bnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1VzZXJBZ2VudFN0eWxlcykpOwogICAgIHAuYXBwZW5kQ2hp bGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiV29y ZCB3cmFwIiksIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kb21Xb3JkV3JhcCkpOworICAgIHAuYXBw ZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2hvdyBTaGFkb3cgRE9NIiksIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2hhZG93RE9N KSk7CiAKICAgICBwID0gdGhpcy5fYXBwZW5kU2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJlbmRlcmluZyIpKTsKICAgICBwLmFwcGVuZENoaWxkKHRoaXMuX2NyZWF0ZUNoZWNrYm94U2V0 dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgcGFpbnQgcmVjdGFuZ2xlcyIpLCBXZWJJ bnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1BhaW50UmVjdHMpKTsK 166166 2012-09-28 01:04:41 -0700 2012-09-28 01:41:07 -0700 Patch for landing bug-94274-20120928170358.patch text/plain 5306 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQzYjdkN2YxNzc0OWI5 ZGJiNmM3Mzk5NmVmMmRiYWM3ZTg2MmQzOC4uYWYzNjhlZjY2ZmIyZmE1MjVlMmZhYWU2OTU4ODk4 ZGY2NzM1OGM4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA5LTI4ICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIE1vdmUgU2hhZG93IERP TSBpbnNwZWN0aW9uIGZlYXR1cmUgb3V0IGZyb20gZXhwZXJpbWVudHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0Mjc0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KKworICAgICAgICBUaGlzIGNoYWduZSB0dXJucyB0aGUgc2hv d1NoYWRvd0RPTSBleHBlcmltZW50cyBpbnRvIGEgc2V0dGluZ3MsCisgICAgICAgIGFkZGluZyBh U2V0dGluZ3NTY3JlZW4gZW50cnkgZm9yIHRoYXQuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01B Z2VudC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu R2VuZXJpY1NldHRpbmdzVGFiKToKKwogMjAxMi0wOS0yOCAgRXVnZW5lIEtseXVjaG5pa292ICA8 ZXVzdGFzLmJ1Z0BnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRWxlbWVudHM6 IFNob3cgZW50aXRpZXMgaW4gZWRpdCBhcyBIVE1MLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDdiZTI1N2JmY2YyYjdkNjA0NWZj ZDNkZmMwODdiOWU2NTcxNzBmNjcuLjhhYzAxNWViZjc5YmEyMzdmNDhkYmJjZjA4ZDEzZDkyZjMz MzY3MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMKQEAgLTM4OSw2ICszODksNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGNvbnNv bGUuIl0gPSAiU2hvdyBjb25zb2xlLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGNvdW50cyBh bmQgc2l6ZXMgYXMgcGVyY2VudGFnZXMuIl0gPSAiU2hvdyBjb3VudHMgYW5kIHNpemVzIGFzIHBl cmNlbnRhZ2VzLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGZ1bmN0aW9uIGRlZmluaXRpb24i XSA9ICJTaG93IGZ1bmN0aW9uIGRlZmluaXRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBp bmhlcml0ZWQiXSA9ICJTaG93IGluaGVyaXRlZCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFNo YWRvdyBET00iXSA9ICJTaG93IFNoYWRvdyBET00iOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyB0 aGUgcmVjb3JkcyB0aGF0IGFyZSBzaG9ydGVyIHRoYW4gJXMiXSA9ICJTaG93IHRoZSByZWNvcmRz IHRoYXQgYXJlIHNob3J0ZXIgdGhhbiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRpbWVz IGFzIHBlcmNlbnRhZ2VzLiJdID0gIlNob3cgdGltZXMgYXMgcGVyY2VudGFnZXMuIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlNob3cgdG90YWwgYW5kIHNlbGYgdGltZXMgYXMgcGVyY2VudGFnZXMuIl0g PSAiU2hvdyB0b3RhbCBhbmQgc2VsZiB0aW1lcyBhcyBwZXJjZW50YWdlcy4iOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggMDZiNTY1OGI3 YTQyNDg5NjRhYTEyNjE2NGRlZDYyM2Y4NjQxMTVjZi4uMjUzY2Y5OTdlOWIyYWVkZDhkYjkyOTU4 MGIxM2IxNTYxZDk5Y2Y5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9ET01BZ2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RPTUFnZW50LmpzCkBAIC03Niw3ICs3Niw3IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0g ZnVuY3Rpb24oZG9tQWdlbnQsIGRvYywgaXNJblNoYWRvd1RyZWUsIHBheWxvYWQpIHsKICAgICAg ICAgdGhpcy5fcmVudW1iZXIoKTsKICAgICB9CiAKLSAgICBpZiAocGF5bG9hZC5zaGFkb3dSb290 cyAmJiBXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zaG93U2hhZG93RE9NLmlzRW5h YmxlZCgpKSB7CisgICAgaWYgKHBheWxvYWQuc2hhZG93Um9vdHMgJiYgV2ViSW5zcGVjdG9yLnNl dHRpbmdzLnNob3dTaGFkb3dET00uZ2V0KCkpIHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBwYXlsb2FkLnNoYWRvd1Jvb3RzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgcm9v dCA9IHBheWxvYWQuc2hhZG93Um9vdHNbaV07CiAgICAgICAgICAgICB2YXIgbm9kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuRE9NTm9kZSh0aGlzLl9kb21BZ2VudCwgdGhpcy5vd25lckRvY3VtZW50LCB0 cnVlLCByb290KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRp bmdzLmpzCmluZGV4IGExMzhjYjY1ODUxNTU1NDkxYTI2NTVkZjQwODc4ZTUyMzk1Nzk1NjIuLjJm YjRhMDViMTcwYWViMWU0MjJjYTU5YzBhMzIzYjY5NDFiODIyZDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtOTUsNiArOTUsNyBAQCBX ZWJJbnNwZWN0b3IuU2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5kb2NrVG9SaWdodCA9 IHRoaXMuY3JlYXRlU2V0dGluZygiZG9ja1RvUmlnaHQiLCBmYWxzZSk7CiAgICAgdGhpcy5lbXVs YXRlVG91Y2hFdmVudHMgPSB0aGlzLmNyZWF0ZVNldHRpbmcoImVtdWxhdGVUb3VjaEV2ZW50cyIs IGZhbHNlKTsKICAgICB0aGlzLnNob3dQYWludFJlY3RzID0gdGhpcy5jcmVhdGVTZXR0aW5nKCJz aG93UGFpbnRSZWN0cyIsIGZhbHNlKTsKKyAgICB0aGlzLnNob3dTaGFkb3dET00gPSB0aGlzLmNy ZWF0ZVNldHRpbmcoInNob3dTaGFkb3dET00iLCBmYWxzZSk7CiAgICAgdGhpcy56b29tTGV2ZWwg PSB0aGlzLmNyZWF0ZVNldHRpbmcoInpvb21MZXZlbCIsIDApOwogICAgIHRoaXMuc2F2ZWRVUkxz ID0gdGhpcy5jcmVhdGVTZXR0aW5nKCJzYXZlZFVSTHMiLCB7fSk7CiAgICAgdGhpcy5qYXZhU2Ny aXB0RGlzYWJsZWQgPSB0aGlzLmNyZWF0ZVNldHRpbmcoImphdmFTY3JpcHREaXNhYmxlZCIsIGZh bHNlKTsKQEAgLTE4Niw3ICsxODcsNiBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5n cyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9lbmFibGVkRm9yVGVzdCA9IHt9OwogICAgIAogICAg IC8vIEFkZCBjdXJyZW50bHkgcnVubmluZyBleHBlcmltZW50cyBoZXJlLgotICAgIHRoaXMuc2hv d1NoYWRvd0RPTSA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNob3dTaGFkb3dET00iLCAiU2hv dyBzaGFkb3cgRE9NIik7CiAgICAgdGhpcy5zbmlwcGV0c1N1cHBvcnQgPSB0aGlzLl9jcmVhdGVF eHBlcmltZW50KCJzbmlwcGV0c1N1cHBvcnQiLCAiU25pcHBldHMgc3VwcG9ydCIpOwogICAgIHRo aXMubmF0aXZlTWVtb3J5U25hcHNob3RzID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgibmF0aXZl TWVtb3J5U25hcHNob3RzIiwgIk5hdGl2ZSBtZW1vcnkgcHJvZmlsaW5nIik7CiAgICAgdGhpcy5s aXZlTmF0aXZlTWVtb3J5Q2hhcnQgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJsaXZlTmF0aXZl TWVtb3J5Q2hhcnQiLCAiTGl2ZSBuYXRpdmUgbWVtb3J5IGNoYXJ0Iik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcwppbmRleCAx Yzk4ZTNlNDA2YzcwY2IyZThlZjU4Y2Y4MDAzMTA0ZWMxNWE2YTBkLi4xYTYyN2RmMDVhZmMyNTM1 N2JhYTBlYjJkYzU0OTkwYjIxY2M2Y2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMKQEAgLTI2OCw2ICsyNjgsNyBAQCBX ZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFiID0gZnVuY3Rpb24oKQogICAgICAgICBbIFdl Ykluc3BlY3Rvci5Db2xvci5Gb3JtYXQuSFNMLCAiSFNMOiBoc2woMzAwLCA4MCUsIDkwJSkiIF0g XSwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmNvbG9yRm9ybWF0KSk7CiAgICAgcC5hcHBlbmRDaGls ZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93 IHVzZXIgYWdlbnQgc3R5bGVzIiksIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93VXNlckFnZW50 U3R5bGVzKSk7CiAgICAgcC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmco V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJXb3JkIHdyYXAiKSwgV2ViSW5zcGVjdG9yLnNldHRpbmdz LmRvbVdvcmRXcmFwKSk7CisgICAgcC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNl dHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IFNoYWRvdyBET00iKSwgV2ViSW5zcGVj dG9yLnNldHRpbmdzLnNob3dTaGFkb3dET00pKTsKIAogICAgIHAgPSB0aGlzLl9hcHBlbmRTZWN0 aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVuZGVyaW5nIikpOwogICAgIHAuYXBwZW5kQ2hp bGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hv dyBwYWludCByZWN0YW5nbGVzIiksIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93UGFpbnRSZWN0 cykpOwo=