40647 2010-06-15 17:24:52 -0700 Add optional contentType parameter to Blob.slice per latest File API spec 2010-06-17 13:15:11 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli jianli dimich kinuko levin oldest_to_newest 238626 0 jianli 2010-06-15 17:24:52 -0700 Need to add optional contentType parameter to Blob.slice per latest File API spec (http://dev.w3.org/2006/webapi/FileAPI/#dfn-Blob). 238627 1 58839 jianli 2010-06-15 17:28:18 -0700 Created attachment 58839 Proposed Patch 238663 2 kinuko 2010-06-15 21:07:05 -0700 (The patch looks good to me though I'm not a reviewer.) > diff --git a/LayoutTests/http/tests/local/resources/send-sliced-dragged-file.js b/LayoutTests/http/tests/local/resources/send-sliced-dragged-file.js > + subfile = (contentType != undefined) ? file.slice(start, length, contentType) : file.slice(start, length); > diff --git a/WebCore/html/Blob.idl b/WebCore/html/Blob.idl > + Blob slice(in long long start, in long long length, in [Optional] DOMString contentType); One question - don't we want to make the contentType parameter [Optional, ConvertUndefinedOrNullToNullString]? Passing undefined value for an optional parameter leaves Blob.type undefined - it sounds a bit awkward to me. 238986 3 58839 fishd 2010-06-16 11:28:48 -0700 Comment on attachment 58839 Proposed Patch WebCore/html/Blob.h:69 + PassRefPtr<Blob> slice(long long start, long long length, const String& contentType = "") const; Do you really want to pass "" here and not String()? 239083 4 58933 jianli 2010-06-16 14:11:12 -0700 Created attachment 58933 Proposed Patch All fixed. 239547 5 jianli 2010-06-17 13:15:11 -0700 Committed as http://trac.webkit.org/changeset/61343. 58839 2010-06-15 17:28:18 -0700 2010-06-16 14:11:12 -0700 Proposed Patch 40647 text/plain 8670 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjY2NmYTU5Li4wZThiOTA0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYt MTUgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBvcHRpb25hbCBjb250ZW50VHlwZSBwYXJh bWV0ZXIgdG8gQmxvYi5zbGljZSBwZXIgbGF0ZXN0IEZpbGUgQVBJIHNwZWMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDY0NworCisgICAgICAgIFVw ZGF0ZWQgdGhlIHRlc3QgZm9yIHRoZSBvcHRpb25hbCBwYXJhbWV0ZXIuCisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL2xvY2FsL3Jlc291cmNlcy9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUuanM6Cisg ICAgICAgICogaHR0cC90ZXN0cy9sb2NhbC9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUtZXhwZWN0 ZWQudHh0OgorCiAyMDEwLTA2LTE1ICBBbmRyZXcgU2NoZXJrdXMgIDxzY2hlcmt1c0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgdXBkYXRpbmcgQ2hyb21pdW0gdGVzdCBleHBl Y3RhdGlvbnMgZm9yIG1lZGlhIGxheW91dCB0ZXN0cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvbG9jYWwvcmVzb3VyY2VzL3NlbmQtc2xpY2VkLWRyYWdnZWQtZmlsZS5qcyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvcmVzb3VyY2VzL3NlbmQtc2xpY2VkLWRyYWdn ZWQtZmlsZS5qcwppbmRleCA0MjUyOTYyLi4wNDQ4MjAyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2xvY2FsL3Jlc291cmNlcy9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUuanMK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9yZXNvdXJjZXMvc2VuZC1zbGljZWQt ZHJhZ2dlZC1maWxlLmpzCkBAIC04NiwyOSArODYsMzEgQEAgZnVuY3Rpb24gY29tcHV0ZUV4cGVj dGVkTGVuZ3RoKGZpbGVMZW5ndGgsIHN0YXJ0LCBsZW5ndGgpCiAgICAgcmV0dXJuIGV4cGVjdGVk TGVuZ3RoOwogfQogCi1mdW5jdGlvbiBvblN0YWJsZUZpbGVEcm9wKGZpbGUsIGZpbGVQYXRoLCBm aWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3RoKQorZnVuY3Rpb24gb25TdGFibGVGaWxlRHJvcChmaWxl LCBmaWxlUGF0aCwgZmlsZUxlbmd0aCwgc3RhcnQsIGxlbmd0aCwgY29udGVudFR5cGUpCiB7CiAg ICAgLy8gU2xpY2UgdGhlIGZpbGUuCi0gICAgc3ViZmlsZSA9IGZpbGUuc2xpY2Uoc3RhcnQsIGxl bmd0aCk7CisgICAgc3ViZmlsZSA9IChjb250ZW50VHlwZSAhPSB1bmRlZmluZWQpID8gZmlsZS5z bGljZShzdGFydCwgbGVuZ3RoLCBjb250ZW50VHlwZSkgOiBmaWxlLnNsaWNlKHN0YXJ0LCBsZW5n dGgpOwogICAgIHNob3VsZEV2YWx1YXRlVG8oInN1YmZpbGUuc2l6ZSIsIGNvbXB1dGVFeHBlY3Rl ZExlbmd0aChmaWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3RoKSk7CisgICAgc2hvdWxkQmUoInN1YmZp bGUudHlwZSIsIChjb250ZW50VHlwZSAhPSB1bmRlZmluZWQpID8gJyInICsgY29udGVudFR5cGUg KyAnIicgOiAnIiInKTsKIAogICAgIC8vIFVwbG9hZCB0aGUgc2xpY2VkIGZpbGUuCiAgICAgdXBs b2FkRmlsZShzdWJmaWxlLCBmaWxlUGF0aCwgc3RhcnQsIGxlbmd0aCwgZmFsc2UpOwogfQogCi1m dW5jdGlvbiBkcmFnQW5kU2xpY2VTdGFibGVGaWxlKGZpbGVQYXRoLCBmaWxlTGVuZ3RoLCBzdGFy dCwgbGVuZ3RoKQorZnVuY3Rpb24gZHJhZ0FuZFNsaWNlU3RhYmxlRmlsZShmaWxlUGF0aCwgZmls ZUxlbmd0aCwgc3RhcnQsIGxlbmd0aCwgY29udGVudFR5cGUpCiB7Ci0gICAgc2V0RmlsZUlucHV0 RHJvcENhbGxiYWNrKGZ1bmN0aW9uKGZpbGUpIHsgb25TdGFibGVGaWxlRHJvcChmaWxlLCAiLi4v bG9jYWwvIiArIGZpbGVQYXRoLCBmaWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3RoKTsgfSk7CisgICAg c2V0RmlsZUlucHV0RHJvcENhbGxiYWNrKGZ1bmN0aW9uKGZpbGUpIHsgb25TdGFibGVGaWxlRHJv cChmaWxlLCAiLi4vbG9jYWwvIiArIGZpbGVQYXRoLCBmaWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3Ro LCBjb250ZW50VHlwZSk7IH0pOwogICAgIGV2ZW50U2VuZGVyLmJlZ2luRHJhZ1dpdGhGaWxlcyhb ZmlsZVBhdGhdKTsKICAgICBtb3ZlTW91c2VUb0NlbnRlck9mRWxlbWVudChmaWxlSW5wdXQpOwog ICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKIH0KIAotZnVuY3Rpb24gb25VbnN0YWJsZUZpbGVE cm9wKGZpbGUsIGZpbGVQYXRoLCBmaWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3RoKQorZnVuY3Rpb24g b25VbnN0YWJsZUZpbGVEcm9wKGZpbGUsIGZpbGVQYXRoLCBmaWxlTGVuZ3RoLCBzdGFydCwgbGVu Z3RoLCBjb250ZW50VHlwZSkKIHsKICAgICAvLyBTbGljZSB0aGUgZmlsZS4KLSAgICBzdWJmaWxl ID0gZmlsZS5zbGljZShzdGFydCwgbGVuZ3RoKTsKKyAgICBzdWJmaWxlID0gKGNvbnRlbnRUeXBl ICE9IHVuZGVmaW5lZCkgPyBmaWxlLnNsaWNlKHN0YXJ0LCBsZW5ndGgsIGNvbnRlbnRUeXBlKSA6 IGZpbGUuc2xpY2Uoc3RhcnQsIGxlbmd0aCk7CiAgICAgc2hvdWxkRXZhbHVhdGVUbygic3ViZmls ZS5zaXplIiwgY29tcHV0ZUV4cGVjdGVkTGVuZ3RoKGZpbGVMZW5ndGgsIHN0YXJ0LCBsZW5ndGgp KTsKKyAgICBzaG91bGRCZSgic3ViZmlsZS50eXBlIiwgKGNvbnRlbnRUeXBlICE9IHVuZGVmaW5l ZCkgPyAnIicgKyBjb250ZW50VHlwZSArICciJyA6ICciIicpOwogICAKICAgICAvLyBVcGxvYWQg dGhlIHNsaWNlZCBmaWxlLgogICAgIHVwbG9hZEZpbGUoc3ViZmlsZSwgZmlsZVBhdGgsIHN0YXJ0 LCBsZW5ndGgsIGZhbHNlKTsKQEAgLTEyMywxMyArMTI1LDEzIEBAIGZ1bmN0aW9uIG9uVW5zdGFi bGVGaWxlRHJvcChmaWxlLCBmaWxlUGF0aCwgZmlsZUxlbmd0aCwgc3RhcnQsIGxlbmd0aCkKICAg ICByZW1vdmVUZW1wRmlsZSgpOwogfQogCi1mdW5jdGlvbiBkcmFnQW5kU2xpY2VVbnN0YWJsZUZp bGUoc3RhcnQsIGxlbmd0aCkKK2Z1bmN0aW9uIGRyYWdBbmRTbGljZVVuc3RhYmxlRmlsZShzdGFy dCwgbGVuZ3RoLCBjb250ZW50VHlwZSkKIHsKICAgICB2YXIgdGVtcEZpbGVQYXRoID0gY3JlYXRl VGVtcEZpbGUodGVtcEZpbGVDb250ZW50KTsKICAgICBpZiAodGVtcEZpbGVQYXRoLmxlbmd0aCA9 PSAwKQogICAgICAgICByZXR1cm47CiAKLSAgICBzZXRGaWxlSW5wdXREcm9wQ2FsbGJhY2soZnVu Y3Rpb24oZmlsZSkgeyBvblVuc3RhYmxlRmlsZURyb3AoZmlsZSwgdGVtcEZpbGVQYXRoLCB0ZW1w RmlsZUNvbnRlbnQubGVuZ3RoLCBzdGFydCwgbGVuZ3RoKTsgfSk7CisgICAgc2V0RmlsZUlucHV0 RHJvcENhbGxiYWNrKGZ1bmN0aW9uKGZpbGUpIHsgb25VbnN0YWJsZUZpbGVEcm9wKGZpbGUsIHRl bXBGaWxlUGF0aCwgdGVtcEZpbGVDb250ZW50Lmxlbmd0aCwgc3RhcnQsIGxlbmd0aCwgY29udGVu dFR5cGUpOyB9KTsKICAgICBldmVudFNlbmRlci5iZWdpbkRyYWdXaXRoRmlsZXMoW3RlbXBGaWxl UGF0aF0pOwogICAgIG1vdmVNb3VzZVRvQ2VudGVyT2ZFbGVtZW50KGZpbGVJbnB1dCk7CiAgICAg ZXZlbnRTZW5kZXIubW91c2VVcCgpOwpAQCAtMTQyLDggKzE0NCw4IEBAIGZ1bmN0aW9uIHJ1blRl c3QoKQogCiAgICAgZGVidWcoIlRlc3Qgc2xpY2luZyBhbmQgc2VuZGluZyBhIHNtYWxsIGZpbGUu Iik7CiAgICAgZHJhZ0FuZFNsaWNlU3RhYmxlRmlsZSgicmVzb3VyY2VzL2ZpbGUtZm9yLWRyYWct dG8tc2VuZC50eHQiLCAxMCwgMiwgNCk7Ci0gICAgZHJhZ0FuZFNsaWNlU3RhYmxlRmlsZSgicmVz b3VyY2VzL2ZpbGUtZm9yLWRyYWctdG8tc2VuZC50eHQiLCAxMCwgMiwgMjApOwotICAgIGRyYWdB bmRTbGljZVN0YWJsZUZpbGUoInJlc291cmNlcy9maWxlLWZvci1kcmFnLXRvLXNlbmQudHh0Iiwg MTAsIDE1LCAyMCk7CisgICAgZHJhZ0FuZFNsaWNlU3RhYmxlRmlsZSgicmVzb3VyY2VzL2ZpbGUt Zm9yLWRyYWctdG8tc2VuZC50eHQiLCAxMCwgMiwgMjAsICJ0eXBlL2ZvbyIpOworICAgIGRyYWdB bmRTbGljZVN0YWJsZUZpbGUoInJlc291cmNlcy9maWxlLWZvci1kcmFnLXRvLXNlbmQudHh0Iiwg MTAsIDE1LCAyMCwgInR5cGUvYmFyIik7CiAKICAgICAvLyBUaGlzIGlzIHRvIHRlc3QgYSBmaWxl IHRoYXQgZXhjZWVkcyB0aGUgcmVhZCBidWZmZXIgbGltaXQgKDJLIGluIE1hYykuCiAgICAgZGVi dWcoIlRlc3Qgc2xpY2luZyBhbmQgc2VuZGluZyBhIGJpZyBmaWxlLiIpOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9zZW5kLXNsaWNlZC1kcmFn Z2VkLWZpbGUtZXhwZWN0ZWQudHh0CmluZGV4IDIwMTVhM2QuLmU3ODI3YmMgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvc2VuZC1zbGljZWQtZHJhZ2dlZC1maWxlLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvY2FsL3NlbmQtc2xpY2Vk LWRyYWdnZWQtZmlsZS1leHBlY3RlZC50eHQKQEAgLTYsMzAgKzYsMzggQEAgT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRF U1QgQ09NUExFVEUKIFRlc3Qgc2xpY2luZyBhbmQgc2VuZGluZyBhbiBlbXB0eSBmaWxlLgogUEFT UyBldmVudC5kYXRhVHJhbnNmZXIgY29udGFpbnMgYSBGaWxlIG9iamVjdCBvbiBkcm9wLgogUEFT UyBzdWJmaWxlLnNpemUgaXMgMAorUEFTUyBzdWJmaWxlLnR5cGUgaXMgIiIKIFBBU1MgRXhwZWN0 ZWQgcmVzcG9uc2UgZGF0YSByZWNlaXZlZDogT0sKIFRlc3Qgc2xpY2luZyBhbmQgc2VuZGluZyBh IHNtYWxsIGZpbGUuCiBQQVNTIGV2ZW50LmRhdGFUcmFuc2ZlciBjb250YWlucyBhIEZpbGUgb2Jq ZWN0IG9uIGRyb3AuCiBQQVNTIHN1YmZpbGUuc2l6ZSBpcyA0CitQQVNTIHN1YmZpbGUudHlwZSBp cyAiIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBkYXRhIHJlY2VpdmVkOiBPSwogUEFTUyBldmVu dC5kYXRhVHJhbnNmZXIgY29udGFpbnMgYSBGaWxlIG9iamVjdCBvbiBkcm9wLgogUEFTUyBzdWJm aWxlLnNpemUgaXMgOAorUEFTUyBzdWJmaWxlLnR5cGUgaXMgInR5cGUvZm9vIgogUEFTUyBFeHBl Y3RlZCByZXNwb25zZSBkYXRhIHJlY2VpdmVkOiBPSwogUEFTUyBldmVudC5kYXRhVHJhbnNmZXIg Y29udGFpbnMgYSBGaWxlIG9iamVjdCBvbiBkcm9wLgogUEFTUyBzdWJmaWxlLnNpemUgaXMgMAor UEFTUyBzdWJmaWxlLnR5cGUgaXMgInR5cGUvYmFyIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBk YXRhIHJlY2VpdmVkOiBPSwogVGVzdCBzbGljaW5nIGFuZCBzZW5kaW5nIGEgYmlnIGZpbGUuCiBQ QVNTIGV2ZW50LmRhdGFUcmFuc2ZlciBjb250YWlucyBhIEZpbGUgb2JqZWN0IG9uIGRyb3AuCiBQ QVNTIHN1YmZpbGUuc2l6ZSBpcyA0MAorUEFTUyBzdWJmaWxlLnR5cGUgaXMgIiIKIFBBU1MgRXhw ZWN0ZWQgcmVzcG9uc2UgZGF0YSByZWNlaXZlZDogT0sKIFBBU1MgZXZlbnQuZGF0YVRyYW5zZmVy IGNvbnRhaW5zIGEgRmlsZSBvYmplY3Qgb24gZHJvcC4KIFBBU1Mgc3ViZmlsZS5zaXplIGlzIDMw MDAKK1BBU1Mgc3ViZmlsZS50eXBlIGlzICIiCiBQQVNTIEV4cGVjdGVkIHJlc3BvbnNlIGRhdGEg cmVjZWl2ZWQ6IE9LCiBQQVNTIGV2ZW50LmRhdGFUcmFuc2ZlciBjb250YWlucyBhIEZpbGUgb2Jq ZWN0IG9uIGRyb3AuCiBQQVNTIHN1YmZpbGUuc2l6ZSBpcyA5MjQyCitQQVNTIHN1YmZpbGUudHlw ZSBpcyAiIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBkYXRhIHJlY2VpdmVkOiBPSwogVGVzdCBz bGljaW5nIGFuZCBzZW5kaW5nIGEgZmlsZSB0aGF0IGhhcyBiZWVuIGNoYW5nZWQgcmlnaHQgYmVm b3JlIHNlbmRpbmcuCiBQQVNTIGV2ZW50LmRhdGFUcmFuc2ZlciBjb250YWlucyBhIEZpbGUgb2Jq ZWN0IG9uIGRyb3AuCiBQQVNTIHN1YmZpbGUuc2l6ZSBpcyA1CitQQVNTIHN1YmZpbGUudHlwZSBp cyAiIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBkYXRhIHJlY2VpdmVkOiBPSwogUEFTUyBFeHBl Y3RlZCBleGNlcHRpb24gdGhyb3duOiBFcnJvcjogTkVUV09SS19FUlI6IFhNTEh0dHBSZXF1ZXN0 IEV4Y2VwdGlvbiAxMDEKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKZGlmZiAtLWdp dCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE5MjkzNy4u YTFjNzY1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwxOSBAQAogMjAxMC0wNi0xNSAgSmlhbiBMaSAgPGppYW5saUBjaHJv bWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIG9wdGlvbmFsIGNvbnRlbnRUeXBlIHBhcmFtZXRlciB0byBCbG9iLnNsaWNlIHBlciBs YXRlc3QgRmlsZSBBUEkgc3BlYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQwNjQ3CisKKyAgICAgICAgVGVzdGVkIGJ5IGh0dHAvdGVzdHMvbG9jYWwv cmVzb3VyY2VzL3NlbmQtc2xpY2VkLWRyYWdnZWQtZmlsZS5odG1sLgorCisgICAgICAgICogaHRt bC9CbG9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJsb2I6OnNsaWNlKToKKyAgICAgICAgKiBo dG1sL0Jsb2IuaDoKKyAgICAgICAgKiBodG1sL0Jsb2IuaWRsOgorCisyMDEwLTA2LTE1ICBKaWFu IExpICA8amlhbmxpQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBM ZXZpbi4KIAogICAgICAgICBNb3ZlIHR5cGUgYXR0cmlidXRlIGZyb20gRmlsZS5pZGwgdG8gQmxv Yi5pZGwgcGVyIGxhdGVzdCBGaWxlIEFQSSBzcGVjLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0Jsb2IuY3BwIGIvV2ViQ29yZS9odG1sL0Jsb2IuY3BwCmluZGV4IDZkMjVkOGQuLmJhZjNkNDkg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9CbG9iLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvQmxv Yi5jcHAKQEAgLTY2LDcgKzY2LDcgQEAgY29uc3QgU3RyaW5nJiBCbG9iOjpwYXRoKCkgY29uc3QK IH0KIAogI2lmIEVOQUJMRShCTE9CX1NMSUNFKQotUGFzc1JlZlB0cjxCbG9iPiBCbG9iOjpzbGlj ZShsb25nIGxvbmcgc3RhcnQsIGxvbmcgbG9uZyBsZW5ndGgpIGNvbnN0CitQYXNzUmVmUHRyPEJs b2I+IEJsb2I6OnNsaWNlKGxvbmcgbG9uZyBzdGFydCwgbG9uZyBsb25nIGxlbmd0aCwgY29uc3Qg U3RyaW5nJiBjb250ZW50VHlwZSkgY29uc3QKIHsKICAgICBpZiAoc3RhcnQgPCAwKQogICAgICAg ICBzdGFydCA9IDA7CkBAIC05MCw4ICs5MCw3IEBAIFBhc3NSZWZQdHI8QmxvYj4gQmxvYjo6c2xp Y2UobG9uZyBsb25nIHN0YXJ0LCBsb25nIGxvbmcgbGVuZ3RoKSBjb25zdAogICAgICAgICBsZW5n dGggLT0gaXRlbXMubGFzdCgpLT5zaXplKCk7CiAgICAgICAgIHN0YXJ0ID0gMDsKICAgICB9Ci0g ICAgLy8gRklYTUU6IFBhc3MgY29udGVudCB0eXBlIHdoZW4gd2UgYWRkIGl0IHRvIHNsaWNlJ3Mg YXJndW1lbnRzLgotICAgIHJldHVybiBCbG9iOjpjcmVhdGUoU3RyaW5nKCksIGl0ZW1zKTsKKyAg ICByZXR1cm4gQmxvYjo6Y3JlYXRlKGNvbnRlbnRUeXBlLCBpdGVtcyk7CiB9CiAjZW5kaWYgLy8g RU5BQkxFKEJMT0JfU0xJQ0UpCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9CbG9iLmggYi9X ZWJDb3JlL2h0bWwvQmxvYi5oCmluZGV4IGFjYTYwZWYuLjFkNzE0NjkgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaHRtbC9CbG9iLmgKKysrIGIvV2ViQ29yZS9odG1sL0Jsb2IuaApAQCAtNjYsNyArNjYs NyBAQCBwdWJsaWM6CiAgICAgY29uc3QgQmxvYkl0ZW1MaXN0JiBpdGVtcygpIGNvbnN0IHsgcmV0 dXJuIG1faXRlbXM7IH0KIAogI2lmIEVOQUJMRShCTE9CX1NMSUNFKQotICAgIFBhc3NSZWZQdHI8 QmxvYj4gc2xpY2UobG9uZyBsb25nIHN0YXJ0LCBsb25nIGxvbmcgbGVuZ3RoKSBjb25zdDsKKyAg ICBQYXNzUmVmUHRyPEJsb2I+IHNsaWNlKGxvbmcgbG9uZyBzdGFydCwgbG9uZyBsb25nIGxlbmd0 aCwgY29uc3QgU3RyaW5nJiBjb250ZW50VHlwZSA9ICIiKSBjb25zdDsKICNlbmRpZgogCiBwcm90 ZWN0ZWQ6CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvQmxvYi5pZGwgYi9XZWJDb3JlL2h0bWwv QmxvYi5pZGwKaW5kZXggMWQwYWQxNC4uNWRjNDc3ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1s L0Jsb2IuaWRsCisrKyBiL1dlYkNvcmUvaHRtbC9CbG9iLmlkbApAQCAtMzUsNyArMzUsNyBAQCBt b2R1bGUgaHRtbCB7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgdHlwZTsK IAogI2lmIGRlZmluZWQoRU5BQkxFX0JMT0JfU0xJQ0UpICYmIEVOQUJMRV9CTE9CX1NMSUNFCi0g ICAgICAgIEJsb2Igc2xpY2UoaW4gbG9uZyBsb25nIHN0YXJ0LCBpbiBsb25nIGxvbmcgbGVuZ3Ro KTsKKyAgICAgICAgQmxvYiBzbGljZShpbiBsb25nIGxvbmcgc3RhcnQsIGluIGxvbmcgbG9uZyBs ZW5ndGgsIGluIFtPcHRpb25hbF0gRE9NU3RyaW5nIGNvbnRlbnRUeXBlKTsKICNlbmRpZgogICAg IH07CiAK 58933 2010-06-16 14:11:12 -0700 2010-06-17 11:29:31 -0700 Proposed Patch 40647_2 text/plain 8790 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjY2NmYTU5Li4wZThiOTA0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYt MTUgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBvcHRpb25hbCBjb250ZW50VHlwZSBwYXJh bWV0ZXIgdG8gQmxvYi5zbGljZSBwZXIgbGF0ZXN0IEZpbGUgQVBJIHNwZWMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDY0NworCisgICAgICAgIFVw ZGF0ZWQgdGhlIHRlc3QgZm9yIHRoZSBvcHRpb25hbCBwYXJhbWV0ZXIuCisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL2xvY2FsL3Jlc291cmNlcy9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUuanM6Cisg ICAgICAgICogaHR0cC90ZXN0cy9sb2NhbC9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUtZXhwZWN0 ZWQudHh0OgorCiAyMDEwLTA2LTE1ICBBbmRyZXcgU2NoZXJrdXMgIDxzY2hlcmt1c0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgdXBkYXRpbmcgQ2hyb21pdW0gdGVzdCBleHBl Y3RhdGlvbnMgZm9yIG1lZGlhIGxheW91dCB0ZXN0cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvbG9jYWwvcmVzb3VyY2VzL3NlbmQtc2xpY2VkLWRyYWdnZWQtZmlsZS5qcyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvcmVzb3VyY2VzL3NlbmQtc2xpY2VkLWRyYWdn ZWQtZmlsZS5qcwppbmRleCA0MjUyOTYyLi44YmJmYjJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2xvY2FsL3Jlc291cmNlcy9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUuanMK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9yZXNvdXJjZXMvc2VuZC1zbGljZWQt ZHJhZ2dlZC1maWxlLmpzCkBAIC04NiwyOSArODYsMzEgQEAgZnVuY3Rpb24gY29tcHV0ZUV4cGVj dGVkTGVuZ3RoKGZpbGVMZW5ndGgsIHN0YXJ0LCBsZW5ndGgpCiAgICAgcmV0dXJuIGV4cGVjdGVk TGVuZ3RoOwogfQogCi1mdW5jdGlvbiBvblN0YWJsZUZpbGVEcm9wKGZpbGUsIGZpbGVQYXRoLCBm aWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3RoKQorZnVuY3Rpb24gb25TdGFibGVGaWxlRHJvcChmaWxl LCBmaWxlUGF0aCwgZmlsZUxlbmd0aCwgc3RhcnQsIGxlbmd0aCwgY29udGVudFR5cGUpCiB7CiAg ICAgLy8gU2xpY2UgdGhlIGZpbGUuCi0gICAgc3ViZmlsZSA9IGZpbGUuc2xpY2Uoc3RhcnQsIGxl bmd0aCk7CisgICAgc3ViZmlsZSA9IGZpbGUuc2xpY2Uoc3RhcnQsIGxlbmd0aCwgY29udGVudFR5 cGUpOwogICAgIHNob3VsZEV2YWx1YXRlVG8oInN1YmZpbGUuc2l6ZSIsIGNvbXB1dGVFeHBlY3Rl ZExlbmd0aChmaWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3RoKSk7CisgICAgc2hvdWxkQmUoInN1YmZp bGUudHlwZSIsIChjb250ZW50VHlwZSAhPSB1bmRlZmluZWQgJiYgY29udGVudFR5cGUgIT0gbnVs bCkgPyAnIicgKyBjb250ZW50VHlwZSArICciJyA6ICciIicpOwogCiAgICAgLy8gVXBsb2FkIHRo ZSBzbGljZWQgZmlsZS4KICAgICB1cGxvYWRGaWxlKHN1YmZpbGUsIGZpbGVQYXRoLCBzdGFydCwg bGVuZ3RoLCBmYWxzZSk7CiB9CiAKLWZ1bmN0aW9uIGRyYWdBbmRTbGljZVN0YWJsZUZpbGUoZmls ZVBhdGgsIGZpbGVMZW5ndGgsIHN0YXJ0LCBsZW5ndGgpCitmdW5jdGlvbiBkcmFnQW5kU2xpY2VT dGFibGVGaWxlKGZpbGVQYXRoLCBmaWxlTGVuZ3RoLCBzdGFydCwgbGVuZ3RoLCBjb250ZW50VHlw ZSkKIHsKLSAgICBzZXRGaWxlSW5wdXREcm9wQ2FsbGJhY2soZnVuY3Rpb24oZmlsZSkgeyBvblN0 YWJsZUZpbGVEcm9wKGZpbGUsICIuLi9sb2NhbC8iICsgZmlsZVBhdGgsIGZpbGVMZW5ndGgsIHN0 YXJ0LCBsZW5ndGgpOyB9KTsKKyAgICBzZXRGaWxlSW5wdXREcm9wQ2FsbGJhY2soZnVuY3Rpb24o ZmlsZSkgeyBvblN0YWJsZUZpbGVEcm9wKGZpbGUsICIuLi9sb2NhbC8iICsgZmlsZVBhdGgsIGZp bGVMZW5ndGgsIHN0YXJ0LCBsZW5ndGgsIGNvbnRlbnRUeXBlKTsgfSk7CiAgICAgZXZlbnRTZW5k ZXIuYmVnaW5EcmFnV2l0aEZpbGVzKFtmaWxlUGF0aF0pOwogICAgIG1vdmVNb3VzZVRvQ2VudGVy T2ZFbGVtZW50KGZpbGVJbnB1dCk7CiAgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOwogfQogCi1m dW5jdGlvbiBvblVuc3RhYmxlRmlsZURyb3AoZmlsZSwgZmlsZVBhdGgsIGZpbGVMZW5ndGgsIHN0 YXJ0LCBsZW5ndGgpCitmdW5jdGlvbiBvblVuc3RhYmxlRmlsZURyb3AoZmlsZSwgZmlsZVBhdGgs IGZpbGVMZW5ndGgsIHN0YXJ0LCBsZW5ndGgsIGNvbnRlbnRUeXBlKQogewogICAgIC8vIFNsaWNl IHRoZSBmaWxlLgotICAgIHN1YmZpbGUgPSBmaWxlLnNsaWNlKHN0YXJ0LCBsZW5ndGgpOworICAg IHN1YmZpbGUgPSBmaWxlLnNsaWNlKHN0YXJ0LCBsZW5ndGgsIGNvbnRlbnRUeXBlKTsKICAgICBz aG91bGRFdmFsdWF0ZVRvKCJzdWJmaWxlLnNpemUiLCBjb21wdXRlRXhwZWN0ZWRMZW5ndGgoZmls ZUxlbmd0aCwgc3RhcnQsIGxlbmd0aCkpOworICAgIHNob3VsZEJlKCJzdWJmaWxlLnR5cGUiLCAo Y29udGVudFR5cGUgIT0gdW5kZWZpbmVkICYmIGNvbnRlbnRUeXBlICE9IG51bGwpID8gJyInICsg Y29udGVudFR5cGUgKyAnIicgOiAnIiInKTsKICAgCiAgICAgLy8gVXBsb2FkIHRoZSBzbGljZWQg ZmlsZS4KICAgICB1cGxvYWRGaWxlKHN1YmZpbGUsIGZpbGVQYXRoLCBzdGFydCwgbGVuZ3RoLCBm YWxzZSk7CkBAIC0xMjMsMTMgKzEyNSwxMyBAQCBmdW5jdGlvbiBvblVuc3RhYmxlRmlsZURyb3Ao ZmlsZSwgZmlsZVBhdGgsIGZpbGVMZW5ndGgsIHN0YXJ0LCBsZW5ndGgpCiAgICAgcmVtb3ZlVGVt cEZpbGUoKTsKIH0KIAotZnVuY3Rpb24gZHJhZ0FuZFNsaWNlVW5zdGFibGVGaWxlKHN0YXJ0LCBs ZW5ndGgpCitmdW5jdGlvbiBkcmFnQW5kU2xpY2VVbnN0YWJsZUZpbGUoc3RhcnQsIGxlbmd0aCwg Y29udGVudFR5cGUpCiB7CiAgICAgdmFyIHRlbXBGaWxlUGF0aCA9IGNyZWF0ZVRlbXBGaWxlKHRl bXBGaWxlQ29udGVudCk7CiAgICAgaWYgKHRlbXBGaWxlUGF0aC5sZW5ndGggPT0gMCkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgc2V0RmlsZUlucHV0RHJvcENhbGxiYWNrKGZ1bmN0aW9uKGZpbGUp IHsgb25VbnN0YWJsZUZpbGVEcm9wKGZpbGUsIHRlbXBGaWxlUGF0aCwgdGVtcEZpbGVDb250ZW50 Lmxlbmd0aCwgc3RhcnQsIGxlbmd0aCk7IH0pOworICAgIHNldEZpbGVJbnB1dERyb3BDYWxsYmFj ayhmdW5jdGlvbihmaWxlKSB7IG9uVW5zdGFibGVGaWxlRHJvcChmaWxlLCB0ZW1wRmlsZVBhdGgs IHRlbXBGaWxlQ29udGVudC5sZW5ndGgsIHN0YXJ0LCBsZW5ndGgsIGNvbnRlbnRUeXBlKTsgfSk7 CiAgICAgZXZlbnRTZW5kZXIuYmVnaW5EcmFnV2l0aEZpbGVzKFt0ZW1wRmlsZVBhdGhdKTsKICAg ICBtb3ZlTW91c2VUb0NlbnRlck9mRWxlbWVudChmaWxlSW5wdXQpOwogICAgIGV2ZW50U2VuZGVy Lm1vdXNlVXAoKTsKQEAgLTE0MSw5ICsxNDMsOSBAQCBmdW5jdGlvbiBydW5UZXN0KCkKICAgICBk cmFnQW5kU2xpY2VTdGFibGVGaWxlKCJyZXNvdXJjZXMvZW1wdHkudHh0IiwgMCwgMCwgMTApOwog CiAgICAgZGVidWcoIlRlc3Qgc2xpY2luZyBhbmQgc2VuZGluZyBhIHNtYWxsIGZpbGUuIik7Ci0g ICAgZHJhZ0FuZFNsaWNlU3RhYmxlRmlsZSgicmVzb3VyY2VzL2ZpbGUtZm9yLWRyYWctdG8tc2Vu ZC50eHQiLCAxMCwgMiwgNCk7Ci0gICAgZHJhZ0FuZFNsaWNlU3RhYmxlRmlsZSgicmVzb3VyY2Vz L2ZpbGUtZm9yLWRyYWctdG8tc2VuZC50eHQiLCAxMCwgMiwgMjApOwotICAgIGRyYWdBbmRTbGlj ZVN0YWJsZUZpbGUoInJlc291cmNlcy9maWxlLWZvci1kcmFnLXRvLXNlbmQudHh0IiwgMTAsIDE1 LCAyMCk7CisgICAgZHJhZ0FuZFNsaWNlU3RhYmxlRmlsZSgicmVzb3VyY2VzL2ZpbGUtZm9yLWRy YWctdG8tc2VuZC50eHQiLCAxMCwgMiwgNCwgbnVsbCk7CisgICAgZHJhZ0FuZFNsaWNlU3RhYmxl RmlsZSgicmVzb3VyY2VzL2ZpbGUtZm9yLWRyYWctdG8tc2VuZC50eHQiLCAxMCwgMiwgMjAsICJ0 eXBlL2ZvbyIpOworICAgIGRyYWdBbmRTbGljZVN0YWJsZUZpbGUoInJlc291cmNlcy9maWxlLWZv ci1kcmFnLXRvLXNlbmQudHh0IiwgMTAsIDE1LCAyMCwgInR5cGUvYmFyIik7CiAKICAgICAvLyBU aGlzIGlzIHRvIHRlc3QgYSBmaWxlIHRoYXQgZXhjZWVkcyB0aGUgcmVhZCBidWZmZXIgbGltaXQg KDJLIGluIE1hYykuCiAgICAgZGVidWcoIlRlc3Qgc2xpY2luZyBhbmQgc2VuZGluZyBhIGJpZyBm aWxlLiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9zZW5kLXNs aWNlZC1kcmFnZ2VkLWZpbGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9s b2NhbC9zZW5kLXNsaWNlZC1kcmFnZ2VkLWZpbGUtZXhwZWN0ZWQudHh0CmluZGV4IDIwMTVhM2Qu LmU3ODI3YmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvc2VuZC1z bGljZWQtZHJhZ2dlZC1maWxlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2xvY2FsL3NlbmQtc2xpY2VkLWRyYWdnZWQtZmlsZS1leHBlY3RlZC50eHQKQEAgLTYsMzAg KzYsMzggQEAgT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUKIFRlc3Qgc2xpY2luZyBhbmQgc2VuZGlu ZyBhbiBlbXB0eSBmaWxlLgogUEFTUyBldmVudC5kYXRhVHJhbnNmZXIgY29udGFpbnMgYSBGaWxl IG9iamVjdCBvbiBkcm9wLgogUEFTUyBzdWJmaWxlLnNpemUgaXMgMAorUEFTUyBzdWJmaWxlLnR5 cGUgaXMgIiIKIFBBU1MgRXhwZWN0ZWQgcmVzcG9uc2UgZGF0YSByZWNlaXZlZDogT0sKIFRlc3Qg c2xpY2luZyBhbmQgc2VuZGluZyBhIHNtYWxsIGZpbGUuCiBQQVNTIGV2ZW50LmRhdGFUcmFuc2Zl ciBjb250YWlucyBhIEZpbGUgb2JqZWN0IG9uIGRyb3AuCiBQQVNTIHN1YmZpbGUuc2l6ZSBpcyA0 CitQQVNTIHN1YmZpbGUudHlwZSBpcyAiIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBkYXRhIHJl Y2VpdmVkOiBPSwogUEFTUyBldmVudC5kYXRhVHJhbnNmZXIgY29udGFpbnMgYSBGaWxlIG9iamVj dCBvbiBkcm9wLgogUEFTUyBzdWJmaWxlLnNpemUgaXMgOAorUEFTUyBzdWJmaWxlLnR5cGUgaXMg InR5cGUvZm9vIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBkYXRhIHJlY2VpdmVkOiBPSwogUEFT UyBldmVudC5kYXRhVHJhbnNmZXIgY29udGFpbnMgYSBGaWxlIG9iamVjdCBvbiBkcm9wLgogUEFT UyBzdWJmaWxlLnNpemUgaXMgMAorUEFTUyBzdWJmaWxlLnR5cGUgaXMgInR5cGUvYmFyIgogUEFT UyBFeHBlY3RlZCByZXNwb25zZSBkYXRhIHJlY2VpdmVkOiBPSwogVGVzdCBzbGljaW5nIGFuZCBz ZW5kaW5nIGEgYmlnIGZpbGUuCiBQQVNTIGV2ZW50LmRhdGFUcmFuc2ZlciBjb250YWlucyBhIEZp bGUgb2JqZWN0IG9uIGRyb3AuCiBQQVNTIHN1YmZpbGUuc2l6ZSBpcyA0MAorUEFTUyBzdWJmaWxl LnR5cGUgaXMgIiIKIFBBU1MgRXhwZWN0ZWQgcmVzcG9uc2UgZGF0YSByZWNlaXZlZDogT0sKIFBB U1MgZXZlbnQuZGF0YVRyYW5zZmVyIGNvbnRhaW5zIGEgRmlsZSBvYmplY3Qgb24gZHJvcC4KIFBB U1Mgc3ViZmlsZS5zaXplIGlzIDMwMDAKK1BBU1Mgc3ViZmlsZS50eXBlIGlzICIiCiBQQVNTIEV4 cGVjdGVkIHJlc3BvbnNlIGRhdGEgcmVjZWl2ZWQ6IE9LCiBQQVNTIGV2ZW50LmRhdGFUcmFuc2Zl ciBjb250YWlucyBhIEZpbGUgb2JqZWN0IG9uIGRyb3AuCiBQQVNTIHN1YmZpbGUuc2l6ZSBpcyA5 MjQyCitQQVNTIHN1YmZpbGUudHlwZSBpcyAiIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBkYXRh IHJlY2VpdmVkOiBPSwogVGVzdCBzbGljaW5nIGFuZCBzZW5kaW5nIGEgZmlsZSB0aGF0IGhhcyBi ZWVuIGNoYW5nZWQgcmlnaHQgYmVmb3JlIHNlbmRpbmcuCiBQQVNTIGV2ZW50LmRhdGFUcmFuc2Zl ciBjb250YWlucyBhIEZpbGUgb2JqZWN0IG9uIGRyb3AuCiBQQVNTIHN1YmZpbGUuc2l6ZSBpcyA1 CitQQVNTIHN1YmZpbGUudHlwZSBpcyAiIgogUEFTUyBFeHBlY3RlZCByZXNwb25zZSBkYXRhIHJl Y2VpdmVkOiBPSwogUEFTUyBFeHBlY3RlZCBleGNlcHRpb24gdGhyb3duOiBFcnJvcjogTkVUV09S S19FUlI6IFhNTEh0dHBSZXF1ZXN0IEV4Y2VwdGlvbiAxMDEKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFy c2VkIGlzIHRydWUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggMzE5MjkzNy4uYTFjNzY1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBAQAogMjAxMC0wNi0xNSAg SmlhbiBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG9wdGlvbmFsIGNvbnRlbnRUeXBlIHBhcmFtZXRl ciB0byBCbG9iLnNsaWNlIHBlciBsYXRlc3QgRmlsZSBBUEkgc3BlYy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNjQ3CisKKyAgICAgICAgVGVzdGVk IGJ5IGh0dHAvdGVzdHMvbG9jYWwvcmVzb3VyY2VzL3NlbmQtc2xpY2VkLWRyYWdnZWQtZmlsZS5o dG1sLgorCisgICAgICAgICogaHRtbC9CbG9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJsb2I6 OnNsaWNlKToKKyAgICAgICAgKiBodG1sL0Jsb2IuaDoKKyAgICAgICAgKiBodG1sL0Jsb2IuaWRs OgorCisyMDEwLTA2LTE1ICBKaWFuIExpICA8amlhbmxpQGNocm9taXVtLm9yZz4KKwogICAgICAg ICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KIAogICAgICAgICBNb3ZlIHR5cGUgYXR0cmlidXRl IGZyb20gRmlsZS5pZGwgdG8gQmxvYi5pZGwgcGVyIGxhdGVzdCBGaWxlIEFQSSBzcGVjLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9odG1sL0Jsb2IuY3BwIGIvV2ViQ29yZS9odG1sL0Jsb2IuY3BwCmlu ZGV4IDZkMjVkOGQuLmJhZjNkNDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9CbG9iLmNwcAor KysgYi9XZWJDb3JlL2h0bWwvQmxvYi5jcHAKQEAgLTY2LDcgKzY2LDcgQEAgY29uc3QgU3RyaW5n JiBCbG9iOjpwYXRoKCkgY29uc3QKIH0KIAogI2lmIEVOQUJMRShCTE9CX1NMSUNFKQotUGFzc1Jl ZlB0cjxCbG9iPiBCbG9iOjpzbGljZShsb25nIGxvbmcgc3RhcnQsIGxvbmcgbG9uZyBsZW5ndGgp IGNvbnN0CitQYXNzUmVmUHRyPEJsb2I+IEJsb2I6OnNsaWNlKGxvbmcgbG9uZyBzdGFydCwgbG9u ZyBsb25nIGxlbmd0aCwgY29uc3QgU3RyaW5nJiBjb250ZW50VHlwZSkgY29uc3QKIHsKICAgICBp ZiAoc3RhcnQgPCAwKQogICAgICAgICBzdGFydCA9IDA7CkBAIC05MCw4ICs5MCw3IEBAIFBhc3NS ZWZQdHI8QmxvYj4gQmxvYjo6c2xpY2UobG9uZyBsb25nIHN0YXJ0LCBsb25nIGxvbmcgbGVuZ3Ro KSBjb25zdAogICAgICAgICBsZW5ndGggLT0gaXRlbXMubGFzdCgpLT5zaXplKCk7CiAgICAgICAg IHN0YXJ0ID0gMDsKICAgICB9Ci0gICAgLy8gRklYTUU6IFBhc3MgY29udGVudCB0eXBlIHdoZW4g d2UgYWRkIGl0IHRvIHNsaWNlJ3MgYXJndW1lbnRzLgotICAgIHJldHVybiBCbG9iOjpjcmVhdGUo U3RyaW5nKCksIGl0ZW1zKTsKKyAgICByZXR1cm4gQmxvYjo6Y3JlYXRlKGNvbnRlbnRUeXBlLCBp dGVtcyk7CiB9CiAjZW5kaWYgLy8gRU5BQkxFKEJMT0JfU0xJQ0UpCiAKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaHRtbC9CbG9iLmggYi9XZWJDb3JlL2h0bWwvQmxvYi5oCmluZGV4IGFjYTYwZWYuLmFk NmM3YTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9CbG9iLmgKKysrIGIvV2ViQ29yZS9odG1s L0Jsb2IuaApAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAgICAgY29uc3QgQmxvYkl0ZW1MaXN0 JiBpdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1faXRlbXM7IH0KIAogI2lmIEVOQUJMRShCTE9CX1NM SUNFKQotICAgIFBhc3NSZWZQdHI8QmxvYj4gc2xpY2UobG9uZyBsb25nIHN0YXJ0LCBsb25nIGxv bmcgbGVuZ3RoKSBjb25zdDsKKyAgICBQYXNzUmVmUHRyPEJsb2I+IHNsaWNlKGxvbmcgbG9uZyBz dGFydCwgbG9uZyBsb25nIGxlbmd0aCwgY29uc3QgU3RyaW5nJiBjb250ZW50VHlwZSA9IFN0cmlu ZygpKSBjb25zdDsKICNlbmRpZgogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0 bWwvQmxvYi5pZGwgYi9XZWJDb3JlL2h0bWwvQmxvYi5pZGwKaW5kZXggMWQwYWQxNC4uMGFlMjc1 OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0Jsb2IuaWRsCisrKyBiL1dlYkNvcmUvaHRtbC9C bG9iLmlkbApAQCAtMzUsNyArMzUsNyBAQCBtb2R1bGUgaHRtbCB7CiAgICAgICAgIHJlYWRvbmx5 IGF0dHJpYnV0ZSBET01TdHJpbmcgdHlwZTsKIAogI2lmIGRlZmluZWQoRU5BQkxFX0JMT0JfU0xJ Q0UpICYmIEVOQUJMRV9CTE9CX1NMSUNFCi0gICAgICAgIEJsb2Igc2xpY2UoaW4gbG9uZyBsb25n IHN0YXJ0LCBpbiBsb25nIGxvbmcgbGVuZ3RoKTsKKyAgICAgICAgQmxvYiBzbGljZShpbiBsb25n IGxvbmcgc3RhcnQsIGluIGxvbmcgbG9uZyBsZW5ndGgsIGluIFtPcHRpb25hbCwgQ29udmVydFVu ZGVmaW5lZE9yTnVsbFRvTnVsbFN0cmluZ10gRE9NU3RyaW5nIGNvbnRlbnRUeXBlKTsKICNlbmRp ZgogICAgIH07CiAK