81492 2012-03-18 22:57:20 -0700 Use CSSPrimitiveValue::convertToLength() in a few places. 2012-03-21 17:58:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson eric joethomas kling macpherson menard webkit.review.bot oldest_to_newest 581634 0 macpherson 2012-03-18 22:57:20 -0700 Use CSSPrimitiveValue::convertToLength() in a few places. 581636 1 132546 macpherson 2012-03-18 23:01:37 -0700 Created attachment 132546 Patch 583557 2 132546 eric 2012-03-20 16:05:31 -0700 Comment on attachment 132546 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132546&action=review OK. These template functions seem slightly awkward to use. I could easily imagine missing one of the OR bits I should have when writing new code. :( > Source/WebCore/css/CSSStyleApplyProperty.cpp:1568 > + selector->style()->setVerticalAlignLength(primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom())); I think having a Length local might help readability here. :) 583715 3 132949 macpherson 2012-03-20 19:43:02 -0700 Created attachment 132949 Patch 583718 4 webkit.review.bot 2012-03-20 19:49:20 -0700 Attachment 132949 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/css/CSSPrimitiveValueMappings.h:34: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 583719 5 132949 macpherson 2012-03-20 19:50:42 -0700 Comment on attachment 132949 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132949&action=review >> Source/WebCore/css/CSSPrimitiveValueMappings.h:34 >> +#include "CSSCalculationValue.h" > > Alphabetical sorting problem. [build/include_order] [4] It lies! 584766 6 132949 simon.fraser 2012-03-21 16:48:45 -0700 Comment on attachment 132949 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132949&action=review > Source/WebCore/ChangeLog:8 > + > + Reviewed by NOBODY (OOPS!). > + > + No new tests - refactoring only. Why no description of changes? You at least need to justify the refactoring. 584767 7 132949 eric 2012-03-21 16:48:57 -0700 Comment on attachment 132949 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132949&action=review Seems reasonable. >>> Source/WebCore/css/CSSPrimitiveValueMappings.h:34 >>> +#include "CSSCalculationValue.h" >> >> Alphabetical sorting problem. [build/include_order] [4] > > It lies! It thinks ColorSpace should be after CSS. the capital S is before all lower case letters, I believe. 584779 8 133146 macpherson 2012-03-21 17:13:37 -0700 Created attachment 133146 Patch for landing 584836 9 133146 webkit.review.bot 2012-03-21 17:58:52 -0700 Comment on attachment 133146 Patch for landing Clearing flags on attachment: 133146 Committed r111631: <http://trac.webkit.org/changeset/111631> 584837 10 webkit.review.bot 2012-03-21 17:58:57 -0700 All reviewed patches have been landed. Closing bug. 132546 2012-03-18 23:01:37 -0700 2012-03-20 19:42:53 -0700 Patch bug-81492-20120319170135.patch text/plain 4309 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhkZDhjOThhNDJkYjZi Zjc5M2Q0OTgxNWIzMDMxYjE3OWY5Yjk4Mi4uZWQzZTY1YTRkMjZhODkwNzQ0OTRmMTgzMjFlNTU0 NjUzM2M5OTc5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTE4ICBMdWtl IE1hY3BoZXJzb24gIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgQ1NT UHJpbWl0aXZlVmFsdWU6OmNvbnZlcnRUb0xlbmd0aCgpIGluIGEgZmV3IHBsYWNlcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNDkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0g cmVmYWN0b3Jpbmcgb25seS4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVZlcnRpY2FsQWxpZ246OmFwcGx5 VmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdCk6CisK IDIwMTItMDMtMTggIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgW2Nocm9taXVtXSBEb24ndCBvY2NsdWRlIG9uIG1haW4tdGhyZWFkIGJlaGluZCBsYXllcnMv c3VyZmFjZXMgd2l0aCBpbXBsLXRocmVhZCBhbmltYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCmluZGV4IGU1N2EzZmI0N2NhZTYzZjMxY2RkZDc5 OGQ0ZjQ1YzM5MzQ0ZjY3YzUuLjM4ZDNiMTgyYWFmNzJlMzI3NjFhNDhkMTIzMzE5MDBlMDk4ZmFj ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCkBA IC0xNTY1LDEzICsxNTY1LDcgQEAgcHVibGljOgogICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUt PmdldElkZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gc2VsZWN0b3ItPnN0eWxlKCktPnNldFZl cnRpY2FsQWxpZ24oKnByaW1pdGl2ZVZhbHVlKTsKIAotICAgICAgICBMZW5ndGggbGVuZ3RoOwot ICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmlzTGVuZ3RoKCkpCi0gICAgICAgICAgICBsZW5n dGggPSBwcmltaXRpdmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aDxMZW5ndGg+KHNlbGVjdG9yLT5zdHls ZSgpLCBzZWxlY3Rvci0+cm9vdEVsZW1lbnRTdHlsZSgpLCBzZWxlY3Rvci0+c3R5bGUoKS0+ZWZm ZWN0aXZlWm9vbSgpKTsKLSAgICAgICAgZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmlzUGVyY2Vu dGFnZSgpKQotICAgICAgICAgICAgbGVuZ3RoID0gTGVuZ3RoKHByaW1pdGl2ZVZhbHVlLT5nZXRE b3VibGVWYWx1ZSgpLCBQZXJjZW50KTsKLQotICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0 VmVydGljYWxBbGlnbkxlbmd0aChsZW5ndGgpOworICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+ c2V0VmVydGljYWxBbGlnbkxlbmd0aChwcmltaXRpdmVWYWx1ZS0+Y29udmVydFRvTGVuZ3RoPEZp eGVkSW50ZWdlckNvbnZlcnNpb24gfCBQZXJjZW50Q29udmVyc2lvbj4oc2VsZWN0b3ItPnN0eWxl KCksIHNlbGVjdG9yLT5yb290RWxlbWVudFN0eWxlKCksIHNlbGVjdG9yLT5zdHlsZSgpLT5lZmZl Y3RpdmVab29tKCkpKTsKICAgICB9CiAKICAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0 ZUhhbmRsZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCmluZGV4IDVk MmM5OTJhYzljOTZhNDYyMjQxMDEwZjM3ZmUyZDgxZGY4NjdhMDkuLjkxZDUxNzllMDFjZTBlYzlh Y2VlOThiMzE0NTY2ZjVhYWM1M2UzYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAKQEAgLTQyMDksMzEgKzQyMDksMjEgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjpt YXBGaWxsU2l6ZShDU1NQcm9wZXJ0eUlELCBGaWxsTGF5ZXIqIGxheWVyLCBDU1NWYWx1ZSogdmEK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFBhaXIqIHBhaXIgPSBwcmltaXRpdmVWYWx1 ZS0+Z2V0UGFpclZhbHVlKCk7Ci0KLSAgICBDU1NQcmltaXRpdmVWYWx1ZSogZmlyc3QgPSBwYWly ID8gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihwYWlyLT5maXJzdCgpKSA6IHByaW1p dGl2ZVZhbHVlOwotICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBzZWNvbmQgPSBwYWlyID8gc3RhdGlj X2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihwYWlyLT5zZWNvbmQoKSkgOiAwOwotCi0gICAgTGVu Z3RoIGZpcnN0TGVuZ3RoLCBzZWNvbmRMZW5ndGg7Ci0KICAgICBmbG9hdCB6b29tRmFjdG9yID0g bV9zdHlsZS0+ZWZmZWN0aXZlWm9vbSgpOwotCi0gICAgaWYgKGZpcnN0LT5nZXRJZGVudCgpID09 IENTU1ZhbHVlQXV0bykKLSAgICAgICAgZmlyc3RMZW5ndGggPSBMZW5ndGgoKTsKLSAgICBlbHNl IGlmIChmaXJzdC0+aXNMZW5ndGgoKSkKLSAgICAgICAgZmlyc3RMZW5ndGggPSBmaXJzdC0+Y29t cHV0ZUxlbmd0aDxMZW5ndGg+KHN0eWxlKCksIG1fcm9vdEVsZW1lbnRTdHlsZSwgem9vbUZhY3Rv cik7Ci0gICAgZWxzZSBpZiAoZmlyc3QtPmlzUGVyY2VudGFnZSgpKQotICAgICAgICBmaXJzdExl bmd0aCA9IExlbmd0aChmaXJzdC0+Z2V0RG91YmxlVmFsdWUoKSwgUGVyY2VudCk7Ci0gICAgZWxz ZQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoIXNlY29uZCB8fCBzZWNvbmQtPmdldElkZW50 KCkgPT0gQ1NTVmFsdWVBdXRvKQorICAgIExlbmd0aCBmaXJzdExlbmd0aDsKKyAgICBMZW5ndGgg c2Vjb25kTGVuZ3RoOworCisgICAgaWYgKFBhaXIqIHBhaXIgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0 UGFpclZhbHVlKCkpIHsKKyAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIGZpcnN0ID0gc3RhdGlj X2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihwYWlyLT5maXJzdCgpKTsKKyAgICAgICAgQ1NTUHJp bWl0aXZlVmFsdWUqIHNlY29uZCA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4ocGFp ci0+c2Vjb25kKCkpOworICAgICAgICBmaXJzdExlbmd0aCA9IGZpcnN0LT5jb252ZXJ0VG9MZW5n dGg8Rml4ZWRJbnRlZ2VyQ29udmVyc2lvbiB8IEF1dG9Db252ZXJzaW9uIHwgUGVyY2VudENvbnZl cnNpb24+KHN0eWxlKCksIG1fcm9vdEVsZW1lbnRTdHlsZSwgem9vbUZhY3Rvcik7CisgICAgICAg IHNlY29uZExlbmd0aCA9IHNlY29uZC0+Y29udmVydFRvTGVuZ3RoPEZpeGVkSW50ZWdlckNvbnZl cnNpb24gfCBBdXRvQ29udmVyc2lvbiB8IFBlcmNlbnRDb252ZXJzaW9uPihzdHlsZSgpLCBtX3Jv b3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOworICAgIH0gZWxzZSB7CisgICAgICAgIGZpcnN0 TGVuZ3RoID0gcHJpbWl0aXZlVmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhlZEludGVnZXJDb252 ZXJzaW9uIHwgQXV0b0NvbnZlcnNpb24gfCBQZXJjZW50Q29udmVyc2lvbj4oc3R5bGUoKSwgbV9y b290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKICAgICAgICAgc2Vjb25kTGVuZ3RoID0gTGVu Z3RoKCk7Ci0gICAgZWxzZSBpZiAoc2Vjb25kLT5pc0xlbmd0aCgpKQotICAgICAgICBzZWNvbmRM ZW5ndGggPSBzZWNvbmQtPmNvbXB1dGVMZW5ndGg8TGVuZ3RoPihzdHlsZSgpLCBtX3Jvb3RFbGVt ZW50U3R5bGUsIHpvb21GYWN0b3IpOwotICAgIGVsc2UgaWYgKHNlY29uZC0+aXNQZXJjZW50YWdl KCkpCi0gICAgICAgIHNlY29uZExlbmd0aCA9IExlbmd0aChzZWNvbmQtPmdldERvdWJsZVZhbHVl KCksIFBlcmNlbnQpOwotICAgIGVsc2UKKyAgICB9CisKKyAgICBpZiAoZmlyc3RMZW5ndGguaXNV bmRlZmluZWQoKSB8fCBzZWNvbmRMZW5ndGguaXNVbmRlZmluZWQoKSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgYi5zZXRXaWR0aChmaXJzdExlbmd0aCk7Cg== 132949 2012-03-20 19:43:02 -0700 2012-03-21 17:13:28 -0700 Patch bug-81492-20120321134300.patch text/plain 5967 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRmNjViNWIxYWYyMWM5 YTJiN2E4OGVjNDI4NDUyZmU4ZmY0ZjEyYi4uYmExZDg4MThiMTkzNmFhOTZjZmVmYjA3MjYzYjZk NjdlOThmMjdlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTE4ICBMdWtl IE1hY3BoZXJzb24gIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgQ1NT UHJpbWl0aXZlVmFsdWU6OmNvbnZlcnRUb0xlbmd0aCgpIGluIGEgZmV3IHBsYWNlcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNDkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0g cmVmYWN0b3Jpbmcgb25seS4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVZlcnRpY2FsQWxpZ246OmFwcGx5 VmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdCk6CisK IDIwMTItMDMtMjAgIEFkYW0gS2xlaW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg SW5jbHVkZSBmaXggZm9yIGRvbS94aHRtbCB0ZXN0IHByb21pc2VkIGluIHIxMTE0NDkuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAppbmRleCA0Nzhj OTgzNjJlMjNjMGEyODM3ZmM2ZTRkNTAzZjM5NDc5ZmFmYmZiLi4xYjdiM2U3MDRiZWUyMWJkZmVk NmVhZWQwNDk1NWY5ZWE4N2ZlZjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmlt aXRpdmVWYWx1ZU1hcHBpbmdzLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNkZWZpbmUgQ1NTUHJpbWl0 aXZlVmFsdWVNYXBwaW5nc19oCiAKICNpbmNsdWRlICJDb2xvclNwYWNlLmgiCisjaW5jbHVkZSAi Q1NTQ2FsY3VsYXRpb25WYWx1ZS5oIgogI2luY2x1ZGUgIkNTU1ByaW1pdGl2ZVZhbHVlLmgiCiAj aW5jbHVkZSAiQ1NTVmFsdWVLZXl3b3Jkcy5oIgogI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5o IgpAQCAtMzc2NywxMSArMzc2OCwxMyBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVW YWx1ZTo6b3BlcmF0b3IgV3JhcFRocm91Z2goKSBjb25zdAogfQogCiBlbnVtIExlbmd0aENvbnZl cnNpb24geworICAgIEFueUNvbnZlcnNpb24gPSB+MCwKICAgICBGaXhlZEludGVnZXJDb252ZXJz aW9uID0gMSA8PCAwLAogICAgIEZpeGVkRmxvYXRDb252ZXJzaW9uID0gMSA8PCAxLAogICAgIEF1 dG9Db252ZXJzaW9uID0gMSA8PCAyLAogICAgIFBlcmNlbnRDb252ZXJzaW9uID0gMSA8PCAzLAot ICAgIEZyYWN0aW9uQ29udmVyc2lvbiA9IDEgPDwgNAorICAgIEZyYWN0aW9uQ29udmVyc2lvbiA9 IDEgPDwgNCwKKyAgICBDYWxjdWxhdGVkQ29udmVyc2lvbiA9IDEgPDwgNQogfTsKIAogdGVtcGxh dGU8aW50IHN1cHBvcnRlZD4gTGVuZ3RoIENTU1ByaW1pdGl2ZVZhbHVlOjpjb252ZXJ0VG9MZW5n dGgoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUgbXVs dGlwbGllciwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSkKQEAgLTM3ODgsNiArMzc5MSw4IEBAIHRl bXBsYXRlPGludCBzdXBwb3J0ZWQ+IExlbmd0aCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29udmVydFRv TGVuZ3RoKFJlbmRlclN0eWxlKiBzCiAgICAgICAgIHJldHVybiBMZW5ndGgoZ2V0RG91YmxlVmFs dWUoKSAqIDEwMC4wLCBQZXJjZW50KTsKICAgICBpZiAoKHN1cHBvcnRlZCAmIEF1dG9Db252ZXJz aW9uKSAmJiBnZXRJZGVudCgpID09IENTU1ZhbHVlQXV0bykKICAgICAgICAgcmV0dXJuIExlbmd0 aChBdXRvKTsKKyAgICBpZiAoKHN1cHBvcnRlZCAmIENhbGN1bGF0ZWRDb252ZXJzaW9uKSAmJiBp c0NhbGN1bGF0ZWQoKSkKKyAgICAgICAgcmV0dXJuIExlbmd0aChjc3NDYWxjVmFsdWUoKS0+dG9D YWxjVmFsdWUoc3R5bGUsIHJvb3RTdHlsZSwgbXVsdGlwbGllcikpOwogICAgIHJldHVybiBMZW5n dGgoVW5kZWZpbmVkKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlQXBwbHlQcm9wZXJ0eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVBy b3BlcnR5LmNwcAppbmRleCA2YzFlYWQ4OThlNDU3NmQ0NjQyNjFhZGIxZTc3YmU5OWRhNzRmNDRh Li5iMGUyNWI2MTI5NDE5ZjBiOGI1ZWM5NDg5NmJmNTkwNjhhNTgyMDlmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcApAQCAtMTU2MywxMyArMTU2Myw3 IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpKQogICAg ICAgICAgICAgcmV0dXJuIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRWZXJ0aWNhbEFsaWduKCpwcmlt aXRpdmVWYWx1ZSk7CiAKLSAgICAgICAgTGVuZ3RoIGxlbmd0aDsKLSAgICAgICAgaWYgKHByaW1p dGl2ZVZhbHVlLT5pc0xlbmd0aCgpKQotICAgICAgICAgICAgbGVuZ3RoID0gcHJpbWl0aXZlVmFs dWUtPmNvbXB1dGVMZW5ndGg8TGVuZ3RoPihzZWxlY3Rvci0+c3R5bGUoKSwgc2VsZWN0b3ItPnJv b3RFbGVtZW50U3R5bGUoKSwgc2VsZWN0b3ItPnN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKSk7Ci0g ICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc1BlcmNlbnRhZ2UoKSkKLSAgICAgICAg ICAgIGxlbmd0aCA9IExlbmd0aChwcmltaXRpdmVWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKSwgUGVy Y2VudCk7Ci0KLSAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldFZlcnRpY2FsQWxpZ25MZW5n dGgobGVuZ3RoKTsKKyAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldFZlcnRpY2FsQWxpZ25M ZW5ndGgocHJpbWl0aXZlVmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhlZEludGVnZXJDb252ZXJz aW9uIHwgUGVyY2VudENvbnZlcnNpb24+KHNlbGVjdG9yLT5zdHlsZSgpLCBzZWxlY3Rvci0+cm9v dEVsZW1lbnRTdHlsZSgpLCBzZWxlY3Rvci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpKSk7CiAg ICAgfQogCiAgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCA5NzE3OGVhMDI4YWZmYWY2MTlh ODI3M2IwNWI0OTMyN2FiZjU4ZjBmLi5hMGRkY2Q0ZmI0MjI2YmJlZjA1ZTAzNDJjMjFiMzc5YjFi MjRhNjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC00MTk5 LDM1ICs0MTk5LDIyIEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6bWFwRmlsbFNpemUoQ1NTUHJv cGVydHlJRCwgRmlsbExheWVyKiBsYXllciwgQ1NTVmFsdWUqIHZhCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICBQYWlyKiBwYWlyID0gcHJpbWl0aXZlVmFsdWUtPmdldFBhaXJWYWx1ZSgp OwotCi0gICAgQ1NTUHJpbWl0aXZlVmFsdWUqIGZpcnN0ID0gcGFpciA/IHN0YXRpY19jYXN0PENT U1ByaW1pdGl2ZVZhbHVlKj4ocGFpci0+Zmlyc3QoKSkgOiBwcmltaXRpdmVWYWx1ZTsKLSAgICBD U1NQcmltaXRpdmVWYWx1ZSogc2Vjb25kID0gcGFpciA/IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2 ZVZhbHVlKj4ocGFpci0+c2Vjb25kKCkpIDogMDsKLQotICAgIExlbmd0aCBmaXJzdExlbmd0aCwg c2Vjb25kTGVuZ3RoOwotCiAgICAgZmxvYXQgem9vbUZhY3RvciA9IG1fc3R5bGUtPmVmZmVjdGl2 ZVpvb20oKTsKIAotICAgIGlmIChmaXJzdC0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pCi0g ICAgICAgIGZpcnN0TGVuZ3RoID0gTGVuZ3RoKCk7Ci0gICAgZWxzZSBpZiAoZmlyc3QtPmlzTGVu Z3RoKCkpCi0gICAgICAgIGZpcnN0TGVuZ3RoID0gZmlyc3QtPmNvbXB1dGVMZW5ndGg8TGVuZ3Ro PihzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOwotICAgIGVsc2UgaWYg KGZpcnN0LT5pc1BlcmNlbnRhZ2UoKSkKLSAgICAgICAgZmlyc3RMZW5ndGggPSBMZW5ndGgoZmly c3QtPmdldERvdWJsZVZhbHVlKCksIFBlcmNlbnQpOwotICAgIGVsc2UgaWYgKGZpcnN0LT5pc0Nh bGN1bGF0ZWRQZXJjZW50YWdlV2l0aExlbmd0aCgpKQotICAgICAgICBmaXJzdExlbmd0aCA9IExl bmd0aChmaXJzdC0+Y3NzQ2FsY1ZhbHVlKCktPnRvQ2FsY1ZhbHVlKHN0eWxlKCksIG1fcm9vdEVs ZW1lbnRTdHlsZSwgem9vbUZhY3RvcikpOwotICAgIGVsc2UKLSAgICAgICAgcmV0dXJuOworICAg IExlbmd0aCBmaXJzdExlbmd0aDsKKyAgICBMZW5ndGggc2Vjb25kTGVuZ3RoOwogCi0gICAgaWYg KCFzZWNvbmQgfHwgc2Vjb25kLT5nZXRJZGVudCgpID09IENTU1ZhbHVlQXV0bykKKyAgICBpZiAo UGFpciogcGFpciA9IHByaW1pdGl2ZVZhbHVlLT5nZXRQYWlyVmFsdWUoKSkgeworICAgICAgICBD U1NQcmltaXRpdmVWYWx1ZSogZmlyc3QgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+ KHBhaXItPmZpcnN0KCkpOworICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSogc2Vjb25kID0gc3Rh dGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihwYWlyLT5zZWNvbmQoKSk7CisgICAgICAgIGZp cnN0TGVuZ3RoID0gZmlyc3QtPmNvbnZlcnRUb0xlbmd0aDxBbnlDb252ZXJzaW9uPihzdHlsZSgp LCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOworICAgICAgICBzZWNvbmRMZW5ndGgg PSBzZWNvbmQtPmNvbnZlcnRUb0xlbmd0aDxBbnlDb252ZXJzaW9uPihzdHlsZSgpLCBtX3Jvb3RF bGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOworICAgIH0gZWxzZSB7CisgICAgICAgIGZpcnN0TGVu Z3RoID0gcHJpbWl0aXZlVmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxBbnlDb252ZXJzaW9uPihzdHls ZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOwogICAgICAgICBzZWNvbmRMZW5n dGggPSBMZW5ndGgoKTsKLSAgICBlbHNlIGlmIChzZWNvbmQtPmlzTGVuZ3RoKCkpCi0gICAgICAg IHNlY29uZExlbmd0aCA9IHNlY29uZC0+Y29tcHV0ZUxlbmd0aDxMZW5ndGg+KHN0eWxlKCksIG1f cm9vdEVsZW1lbnRTdHlsZSwgem9vbUZhY3Rvcik7Ci0gICAgZWxzZSBpZiAoc2Vjb25kLT5pc1Bl cmNlbnRhZ2UoKSkKLSAgICAgICAgc2Vjb25kTGVuZ3RoID0gTGVuZ3RoKHNlY29uZC0+Z2V0RG91 YmxlVmFsdWUoKSwgUGVyY2VudCk7Ci0gICAgZWxzZSBpZiAoc2Vjb25kLT5pc0NhbGN1bGF0ZWRQ ZXJjZW50YWdlV2l0aExlbmd0aCgpKQotICAgICAgICBzZWNvbmRMZW5ndGggPSBMZW5ndGgoc2Vj b25kLT5jc3NDYWxjVmFsdWUoKS0+dG9DYWxjVmFsdWUoc3R5bGUoKSwgbV9yb290RWxlbWVudFN0 eWxlLCB6b29tRmFjdG9yKSk7Ci0gICAgZWxzZQorICAgIH0KKworICAgIGlmIChmaXJzdExlbmd0 aC5pc1VuZGVmaW5lZCgpIHx8IHNlY29uZExlbmd0aC5pc1VuZGVmaW5lZCgpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBiLnNldFdpZHRoKGZpcnN0TGVuZ3RoKTsK 133146 2012-03-21 17:13:37 -0700 2012-03-21 17:58:52 -0700 Patch for landing bug-81492-20120322111335.patch text/plain 6325 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2IxN2U4ZjMzMWJkNDI4 ZGRmZjE5ZjUxM2ZkOTEyMzQ3NDI1ZGEwYy4uMDM2NTIzNGM5NDhkZDZiMTRmNzI0MDg4M2NlNzIx Y2RjMzdjYTA1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAzLTE4ICBMdWtl IE1hY3BoZXJzb24gIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgQ1NT UHJpbWl0aXZlVmFsdWU6OmNvbnZlcnRUb0xlbmd0aCgpIGluIGEgZmV3IHBsYWNlcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNDkyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0gcmVm YWN0b3Jpbmcgb25seS4KKworICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZTo6Y29udmVydFRvTGVu Z3RoKCkgcHJvdmlkZXMgdGhlIHNhbWUgZnVuY3Rpb25hbGl0eSB0aGF0IGlzIGR1cGxpY2F0ZWQK KyAgICAgICAgaW4gbWFueSBwbGFjZXMgaW4gQ1NTU3R5bGVTZWxlY3Rvci4gVGhpcyBwYXRjaCBy ZW1vdmVzIHNvbWUgb2YgdGhhdCBjb2RlIGR1cGxpY2F0aW9uLgorCisgICAgICAgICogY3NzL0NT U1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5 VmVydGljYWxBbGlnbjo6YXBwbHlWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6Y29sbGVjdE1hdGNo aW5nUnVsZXNGb3JMaXN0KToKKwogMjAxMi0wMy0yMSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEVhcmx5IG91dCBpbiBhIG5ldyBwcmVw YXJlVG9EcmF3KCkgc3RlcCBpZiBjaGVja2VyYm9hcmRpbmcgYW4gYWNjZWxlcmF0ZWQgYW5pbWF0 aW9uIGluIG9yZGVyIHRvIHNraXAgdGhlIGZyYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAppbmRleCA0NzhjOTgzNjJlMjNjMGEyODM3ZmM2ZTRk NTAzZjM5NDc5ZmFmYmZiLi41MmU1ZTFmMDlmMGZiMWM0ZmMwYjJmOWIzYWQzZWRiNmY0N2RjYTM0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5n cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgK QEAgLTMwLDggKzMwLDkgQEAKICNpZm5kZWYgQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5nc19oCiAj ZGVmaW5lIENTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3NfaAogCi0jaW5jbHVkZSAiQ29sb3JTcGFj ZS5oIgorI2luY2x1ZGUgIkNTU0NhbGN1bGF0aW9uVmFsdWUuaCIKICNpbmNsdWRlICJDU1NQcmlt aXRpdmVWYWx1ZS5oIgorI2luY2x1ZGUgIkNvbG9yU3BhY2UuaCIKICNpbmNsdWRlICJDU1NWYWx1 ZUtleXdvcmRzLmgiCiAjaW5jbHVkZSAiRm9udERlc2NyaXB0aW9uLmgiCiAjaW5jbHVkZSAiRm9u dFNtb290aGluZ01vZGUuaCIKQEAgLTM3NjcsMTEgKzM3NjgsMTMgQEAgdGVtcGxhdGU8PiBpbmxp bmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIFdyYXBUaHJvdWdoKCkgY29uc3QKIH0KIAog ZW51bSBMZW5ndGhDb252ZXJzaW9uIHsKKyAgICBBbnlDb252ZXJzaW9uID0gfjAsCiAgICAgRml4 ZWRJbnRlZ2VyQ29udmVyc2lvbiA9IDEgPDwgMCwKICAgICBGaXhlZEZsb2F0Q29udmVyc2lvbiA9 IDEgPDwgMSwKICAgICBBdXRvQ29udmVyc2lvbiA9IDEgPDwgMiwKICAgICBQZXJjZW50Q29udmVy c2lvbiA9IDEgPDwgMywKLSAgICBGcmFjdGlvbkNvbnZlcnNpb24gPSAxIDw8IDQKKyAgICBGcmFj dGlvbkNvbnZlcnNpb24gPSAxIDw8IDQsCisgICAgQ2FsY3VsYXRlZENvbnZlcnNpb24gPSAxIDw8 IDUKIH07CiAKIHRlbXBsYXRlPGludCBzdXBwb3J0ZWQ+IExlbmd0aCBDU1NQcmltaXRpdmVWYWx1 ZTo6Y29udmVydFRvTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RT dHlsZSwgZG91YmxlIG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpCkBAIC0zNzg4 LDYgKzM3OTEsOCBAQCB0ZW1wbGF0ZTxpbnQgc3VwcG9ydGVkPiBMZW5ndGggQ1NTUHJpbWl0aXZl VmFsdWU6OmNvbnZlcnRUb0xlbmd0aChSZW5kZXJTdHlsZSogcwogICAgICAgICByZXR1cm4gTGVu Z3RoKGdldERvdWJsZVZhbHVlKCkgKiAxMDAuMCwgUGVyY2VudCk7CiAgICAgaWYgKChzdXBwb3J0 ZWQgJiBBdXRvQ29udmVyc2lvbikgJiYgZ2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pCiAgICAg ICAgIHJldHVybiBMZW5ndGgoQXV0byk7CisgICAgaWYgKChzdXBwb3J0ZWQgJiBDYWxjdWxhdGVk Q29udmVyc2lvbikgJiYgaXNDYWxjdWxhdGVkKCkpCisgICAgICAgIHJldHVybiBMZW5ndGgoY3Nz Q2FsY1ZhbHVlKCktPnRvQ2FsY1ZhbHVlKHN0eWxlLCByb290U3R5bGUsIG11bHRpcGxpZXIpKTsK ICAgICByZXR1cm4gTGVuZ3RoKFVuZGVmaW5lZCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAKaW5kZXggNmMxZWFkODk4ZTQ1NzZkNDY0MjYxYWRi MWU3N2JlOTlkYTc0ZjQ0YS4uYjBlMjViNjEyOTQxOWYwYjhiNWVjOTQ4OTZiZjU5MDY4YTU4MjA5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAKQEAg LTE1NjMsMTMgKzE1NjMsNyBAQCBwdWJsaWM6CiAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+ Z2V0SWRlbnQoKSkKICAgICAgICAgICAgIHJldHVybiBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0VmVy dGljYWxBbGlnbigqcHJpbWl0aXZlVmFsdWUpOwogCi0gICAgICAgIExlbmd0aCBsZW5ndGg7Ci0g ICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNMZW5ndGgoKSkKLSAgICAgICAgICAgIGxlbmd0 aCA9IHByaW1pdGl2ZVZhbHVlLT5jb21wdXRlTGVuZ3RoPExlbmd0aD4oc2VsZWN0b3ItPnN0eWxl KCksIHNlbGVjdG9yLT5yb290RWxlbWVudFN0eWxlKCksIHNlbGVjdG9yLT5zdHlsZSgpLT5lZmZl Y3RpdmVab29tKCkpOwotICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNQZXJjZW50 YWdlKCkpCi0gICAgICAgICAgICBsZW5ndGggPSBMZW5ndGgocHJpbWl0aXZlVmFsdWUtPmdldERv dWJsZVZhbHVlKCksIFBlcmNlbnQpOwotCi0gICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRW ZXJ0aWNhbEFsaWduTGVuZ3RoKGxlbmd0aCk7CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5z ZXRWZXJ0aWNhbEFsaWduTGVuZ3RoKHByaW1pdGl2ZVZhbHVlLT5jb252ZXJ0VG9MZW5ndGg8Rml4 ZWRJbnRlZ2VyQ29udmVyc2lvbiB8IFBlcmNlbnRDb252ZXJzaW9uPihzZWxlY3Rvci0+c3R5bGUo KSwgc2VsZWN0b3ItPnJvb3RFbGVtZW50U3R5bGUoKSwgc2VsZWN0b3ItPnN0eWxlKCktPmVmZmVj dGl2ZVpvb20oKSkpOwogICAgIH0KIAogICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRl SGFuZGxlcigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXggOTcx NzhlYTAyOGFmZmFmNjE5YTgyNzNiMDViNDkzMjdhYmY1OGYwZi4uYTBkZGNkNGZiNDIyNmJiZWYw NWUwMzQyYzIxYjM3OWIxYjI0YTYzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcApAQCAtNDE5OSwzNSArNDE5OSwyMiBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1h cEZpbGxTaXplKENTU1Byb3BlcnR5SUQsIEZpbGxMYXllciogbGF5ZXIsIENTU1ZhbHVlKiB2YQog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgUGFpciogcGFpciA9IHByaW1pdGl2ZVZhbHVl LT5nZXRQYWlyVmFsdWUoKTsKLQotICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBmaXJzdCA9IHBhaXIg PyBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHBhaXItPmZpcnN0KCkpIDogcHJpbWl0 aXZlVmFsdWU7Ci0gICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHNlY29uZCA9IHBhaXIgPyBzdGF0aWNf Y2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHBhaXItPnNlY29uZCgpKSA6IDA7Ci0KLSAgICBMZW5n dGggZmlyc3RMZW5ndGgsIHNlY29uZExlbmd0aDsKLQogICAgIGZsb2F0IHpvb21GYWN0b3IgPSBt X3N0eWxlLT5lZmZlY3RpdmVab29tKCk7CiAKLSAgICBpZiAoZmlyc3QtPmdldElkZW50KCkgPT0g Q1NTVmFsdWVBdXRvKQotICAgICAgICBmaXJzdExlbmd0aCA9IExlbmd0aCgpOwotICAgIGVsc2Ug aWYgKGZpcnN0LT5pc0xlbmd0aCgpKQotICAgICAgICBmaXJzdExlbmd0aCA9IGZpcnN0LT5jb21w dXRlTGVuZ3RoPExlbmd0aD4oc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9y KTsKLSAgICBlbHNlIGlmIChmaXJzdC0+aXNQZXJjZW50YWdlKCkpCi0gICAgICAgIGZpcnN0TGVu Z3RoID0gTGVuZ3RoKGZpcnN0LT5nZXREb3VibGVWYWx1ZSgpLCBQZXJjZW50KTsKLSAgICBlbHNl IGlmIChmaXJzdC0+aXNDYWxjdWxhdGVkUGVyY2VudGFnZVdpdGhMZW5ndGgoKSkKLSAgICAgICAg Zmlyc3RMZW5ndGggPSBMZW5ndGgoZmlyc3QtPmNzc0NhbGNWYWx1ZSgpLT50b0NhbGNWYWx1ZShz dHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpKTsKLSAgICBlbHNlCi0gICAg ICAgIHJldHVybjsKKyAgICBMZW5ndGggZmlyc3RMZW5ndGg7CisgICAgTGVuZ3RoIHNlY29uZExl bmd0aDsKIAotICAgIGlmICghc2Vjb25kIHx8IHNlY29uZC0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1 ZUF1dG8pCisgICAgaWYgKFBhaXIqIHBhaXIgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0UGFpclZhbHVl KCkpIHsKKyAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIGZpcnN0ID0gc3RhdGljX2Nhc3Q8Q1NT UHJpbWl0aXZlVmFsdWUqPihwYWlyLT5maXJzdCgpKTsKKyAgICAgICAgQ1NTUHJpbWl0aXZlVmFs dWUqIHNlY29uZCA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4ocGFpci0+c2Vjb25k KCkpOworICAgICAgICBmaXJzdExlbmd0aCA9IGZpcnN0LT5jb252ZXJ0VG9MZW5ndGg8QW55Q29u dmVyc2lvbj4oc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKKyAgICAg ICAgc2Vjb25kTGVuZ3RoID0gc2Vjb25kLT5jb252ZXJ0VG9MZW5ndGg8QW55Q29udmVyc2lvbj4o c3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKKyAgICB9IGVsc2Ugewor ICAgICAgICBmaXJzdExlbmd0aCA9IHByaW1pdGl2ZVZhbHVlLT5jb252ZXJ0VG9MZW5ndGg8QW55 Q29udmVyc2lvbj4oc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKICAg ICAgICAgc2Vjb25kTGVuZ3RoID0gTGVuZ3RoKCk7Ci0gICAgZWxzZSBpZiAoc2Vjb25kLT5pc0xl bmd0aCgpKQotICAgICAgICBzZWNvbmRMZW5ndGggPSBzZWNvbmQtPmNvbXB1dGVMZW5ndGg8TGVu Z3RoPihzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOwotICAgIGVsc2Ug aWYgKHNlY29uZC0+aXNQZXJjZW50YWdlKCkpCi0gICAgICAgIHNlY29uZExlbmd0aCA9IExlbmd0 aChzZWNvbmQtPmdldERvdWJsZVZhbHVlKCksIFBlcmNlbnQpOwotICAgIGVsc2UgaWYgKHNlY29u ZC0+aXNDYWxjdWxhdGVkUGVyY2VudGFnZVdpdGhMZW5ndGgoKSkKLSAgICAgICAgc2Vjb25kTGVu Z3RoID0gTGVuZ3RoKHNlY29uZC0+Y3NzQ2FsY1ZhbHVlKCktPnRvQ2FsY1ZhbHVlKHN0eWxlKCks IG1fcm9vdEVsZW1lbnRTdHlsZSwgem9vbUZhY3RvcikpOwotICAgIGVsc2UKKyAgICB9CisKKyAg ICBpZiAoZmlyc3RMZW5ndGguaXNVbmRlZmluZWQoKSB8fCBzZWNvbmRMZW5ndGguaXNVbmRlZmlu ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYi5zZXRXaWR0aChmaXJzdExlbmd0aCk7Cg==