85541 2012-05-03 14:01:11 -0700 Chromium should include MenuListPopups' and MenuListOptions' within the ax tree. 2012-05-04 10:46:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dtseng dtseng cfleizach dmazzoni webkit.review.bot oldest_to_newest 615589 0 dtseng 2012-05-03 14:01:11 -0700 Chromium should include MenuListPopups' and MenuListOptions' within the ax tree. 615591 1 140085 dtseng 2012-05-03 14:01:51 -0700 Created attachment 140085 Patch 615613 2 140085 cfleizach 2012-05-03 14:10:52 -0700 Comment on attachment 140085 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140085&action=review > Source/WebCore/accessibility/AccessibilityMockObject.h:42 > + virtual bool accessibilityIsIgnored() const { return accessibilityPlatformIncludesObject() == DefaultBehavior || accessibilityPlatformIncludesObject() == IgnoreObject; } i don't think mock objects should be ignored if the platform says default behavior > Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp:40 > + return IncludeObject; you can probably just remove this block all together. my guess is the default behavior will include these 615640 3 dtseng 2012-05-03 14:37:34 -0700 (In reply to comment #2) > (From update of attachment 140085 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140085&action=review > > > Source/WebCore/accessibility/AccessibilityMockObject.h:42 > > + virtual bool accessibilityIsIgnored() const { return accessibilityPlatformIncludesObject() == DefaultBehavior || accessibilityPlatformIncludesObject() == IgnoreObject; } > > i don't think mock objects should be ignored if the platform says default behavior AccessibilityObject currently returns true for accessibilityIsIgnored. As the immediate subclass, AccessibilityMockObject defaults currently to this behavior. Would you prefer != IncludeObject or == IncludeObject? > > > Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp:40 > > + return IncludeObject; > > you can probably just remove this block all together. my guess is the default behavior will include these See above; currently, AccessibilityMockObject doesn't ask the platform for its preference on ignoring an object and defaults to ignore. 615648 4 cfleizach 2012-05-03 14:43:43 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 140085 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=140085&action=review > > > > > Source/WebCore/accessibility/AccessibilityMockObject.h:42 > > > + virtual bool accessibilityIsIgnored() const { return accessibilityPlatformIncludesObject() == DefaultBehavior || accessibilityPlatformIncludesObject() == IgnoreObject; } > > > > i don't think mock objects should be ignored if the platform says default behavior > > AccessibilityObject currently returns true for accessibilityIsIgnored. As the immediate subclass, AccessibilityMockObject defaults currently to this behavior. > Hmm. Yes, mock object is really meant to be subclassed. I don't think there should be any instances of just mock object. Same goes for AccessibilityObject as well. it seem like this logic could probably move into AccessibilityObject itself (i assume something similar is already in AXRenderObject... which could be removed). we could probably write this as accessibilityPlatformIncludes() != IncludeObject > Would you prefer != IncludeObject or == IncludeObject? > > > > > > Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp:40 > > > + return IncludeObject; > > > > you can probably just remove this block all together. my guess is the default behavior will include these > > See above; currently, AccessibilityMockObject doesn't ask the platform for its preference on ignoring an object and defaults to ignore. Are menu list elements MockObjects? if so, aren't they subclassed in some way? 615684 5 dtseng 2012-05-03 15:14:06 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > (From update of attachment 140085 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=140085&action=review > > > > > > > Source/WebCore/accessibility/AccessibilityMockObject.h:42 > > > > + virtual bool accessibilityIsIgnored() const { return accessibilityPlatformIncludesObject() == DefaultBehavior || accessibilityPlatformIncludesObject() == IgnoreObject; } > > > > > > i don't think mock objects should be ignored if the platform says default behavior > > > > AccessibilityObject currently returns true for accessibilityIsIgnored. As the immediate subclass, AccessibilityMockObject defaults currently to this behavior. > > > > Hmm. Yes, mock object is really meant to be subclassed. I don't think there should be any instances of just mock object. Same goes for AccessibilityObject as well. > > it seem like this logic could probably move into AccessibilityObject itself (i assume something similar is already in AXRenderObject... which could be removed). > > we could probably write this as > > accessibilityPlatformIncludes() != IncludeObject > > > Would you prefer != IncludeObject or == IncludeObject? > > There's a bit more going on in AccessibilityRenderObject which would make bubbling up to AccessibilityObject difficult. > > > > > > > Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp:40 > > > > + return IncludeObject; > > > > > > you can probably just remove this block all together. my guess is the default behavior will include these > > > > See above; currently, AccessibilityMockObject doesn't ask the platform for its preference on ignoring an object and defaults to ignore. > > Are menu list elements MockObjects? if so, aren't they subclassed in some way? Yes, there are AccessibilityMenuPopupList's and AccessibilityMenuListOption's both of which are subclassing AccessibilityMockObject. Neither, however, overrides accessibilityIsIgnored so both default to ignored as well. 615694 6 cfleizach 2012-05-03 15:24:18 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > (In reply to comment #2) > > > > (From update of attachment 140085 [details] [details] [details] [details]) > > > > View in context: https://bugs.webkit.org/attachment.cgi?id=140085&action=review > > > > > > > > > Source/WebCore/accessibility/AccessibilityMockObject.h:42 > > > > > + virtual bool accessibilityIsIgnored() const { return accessibilityPlatformIncludesObject() == DefaultBehavior || accessibilityPlatformIncludesObject() == IgnoreObject; } > > > > > > > > i don't think mock objects should be ignored if the platform says default behavior > > > > > > AccessibilityObject currently returns true for accessibilityIsIgnored. As the immediate subclass, AccessibilityMockObject defaults currently to this behavior. > > > > > > > Hmm. Yes, mock object is really meant to be subclassed. I don't think there should be any instances of just mock object. Same goes for AccessibilityObject as well. > > > > it seem like this logic could probably move into AccessibilityObject itself (i assume something similar is already in AXRenderObject... which could be removed). > > > > we could probably write this as > > > > accessibilityPlatformIncludes() != IncludeObject > > > > > Would you prefer != IncludeObject or == IncludeObject? > > > > > There's a bit more going on in AccessibilityRenderObject which would make bubbling up to AccessibilityObject difficult. > > > > > > > > > > Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp:40 > > > > > + return IncludeObject; > > > > > > > > you can probably just remove this block all together. my guess is the default behavior will include these > > > > > > See above; currently, AccessibilityMockObject doesn't ask the platform for its preference on ignoring an object and defaults to ignore. > > > > Are menu list elements MockObjects? if so, aren't they subclassed in some way? > > Yes, there are AccessibilityMenuPopupList's and AccessibilityMenuListOption's both of which are subclassing AccessibilityMockObject. Neither, however, overrides accessibilityIsIgnored so both default to ignored as well. Maybe just those mock object subclasses should be modified in this case. 616262 7 140243 dtseng 2012-05-04 08:47:30 -0700 Created attachment 140243 Patch 616264 8 webkit.review.bot 2012-05-04 08:50:34 -0700 Attachment 140243 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/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 616267 9 140243 cfleizach 2012-05-04 08:51:52 -0700 Comment on attachment 140243 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140243&action=review > Source/WebCore/accessibility/AccessibilityMenuListPopup.h:44 > + virtual bool accessibilityIsIgnored() const { return accessibilityPlatformIncludesObject() == DefaultBehavior || accessibilityPlatformIncludesObject() == IgnoreObject; } Since there's a bit of logic here i would move the function in the .cpp file instead of the header Also, I think accessibilityPlatformIncludesObject() != IncludeBehavior is a better way of writing since a) it only calls accessibilityPlatformIncludesObject() one time b) it's a little more clear than reference DefaultBehavior 616301 10 140253 dtseng 2012-05-04 09:30:46 -0700 Created attachment 140253 Patch 616302 11 webkit.review.bot 2012-05-04 09:32:17 -0700 Attachment 140253 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/accessibility/AccessibilityMenuListPopup.cpp:65: Place brace on its own line for function definitions. [whitespace/braces] [4] Source/WebCore/accessibility/AccessibilityMenuListOption.cpp:99: Place brace on its own line for function definitions. [whitespace/braces] [4] Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 3 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 616308 12 140254 dtseng 2012-05-04 09:35:10 -0700 Created attachment 140254 Patch 616311 13 webkit.review.bot 2012-05-04 09:37:48 -0700 Attachment 140254 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/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 616313 14 140254 cfleizach 2012-05-04 09:38:18 -0700 Comment on attachment 140254 Patch looks good, just fix the style issues 616325 15 140258 dtseng 2012-05-04 09:49:13 -0700 Created attachment 140258 Patch 616340 16 140258 webkit.review.bot 2012-05-04 10:07:43 -0700 Comment on attachment 140258 Patch Rejecting attachment 140258 from review queue. dtseng@google.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 616341 17 140258 webkit.review.bot 2012-05-04 10:08:28 -0700 Comment on attachment 140258 Patch Rejecting attachment 140258 from commit-queue. dtseng@google.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 616350 18 140258 cfleizach 2012-05-04 10:12:53 -0700 Comment on attachment 140258 Patch you can't review your own patches yet. i assume you wanted CQ+ so i'm doing that for you 616404 19 140258 webkit.review.bot 2012-05-04 10:46:52 -0700 Comment on attachment 140258 Patch Clearing flags on attachment: 140258 Committed r116125: <http://trac.webkit.org/changeset/116125> 616406 20 webkit.review.bot 2012-05-04 10:46:57 -0700 All reviewed patches have been landed. Closing bug. 140085 2012-05-03 14:01:51 -0700 2012-05-04 08:47:26 -0700 Patch bug-85541-20120503140114.patch text/plain 2192 dtseng SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjAwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAzICBEYXZpZCBU c2VuZyAgPGR0c2VuZ0Bnb29nbGUuY29tPgorCisgICAgICAgIENocm9taXVtIHNob3VsZCBpbmNs dWRlIE1lbnVMaXN0UG9wdXBzJyBhbmQgTWVudUxpc3RPcHRpb25zJyB3aXRoaW4gdGhlIGF4IHRy ZWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTU0 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 TW9ja09iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1vY2tPYmplY3Q6 OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvY2hyb21p dW0vQWNjZXNzaWJpbGl0eU9iamVjdENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToK KwogMjAxMi0wNS0wMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgcmVwYWludCBjb3VudGVyIGRyYXdpbmcgY29kZSBvdXQgaW50byBhIHNlcGFy YXRlIGZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlNb2NrT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5TW9ja09iamVjdC5oCShyZXZpc2lvbiAxMTU5OTYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNb2NrT2JqZWN0LmgJKHdvcmtp bmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAgcHVibGljOgogICAgIAogICAgIHZpcnR1YWwgQWNj ZXNzaWJpbGl0eU9iamVjdCogcGFyZW50T2JqZWN0KCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnQ7 IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0UGFyZW50KEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVu dCkgeyBtX3BhcmVudCA9IHBhcmVudDsgfTsKKyAgICB2aXJ0dWFsIGJvb2wgYWNjZXNzaWJpbGl0 eUlzSWdub3JlZCgpIGNvbnN0ICB7IHJldHVybiBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRl c09iamVjdCgpID09IERlZmF1bHRCZWhhdmlvciB8fCBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNs dWRlc09iamVjdCgpID09IElnbm9yZU9iamVjdDsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgQWNjZXNz aWJpbGl0eU9iamVjdCogbV9wYXJlbnQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2Nocm9taXVtL0FjY2Vzc2liaWxpdHlPYmplY3RDaHJvbWl1bS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2Jq ZWN0Q2hyb21pdW0uY3BwCShyZXZpc2lvbiAxMTU5OTYpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2Nocm9taXVtL0FjY2Vzc2liaWxpdHlPYmplY3RDaHJvbWl1bS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nl c3NpYmlsaXR5SQogQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2Jq ZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpIGNvbnN0CiB7CiAgICAg aWYgKGlzTWVudUxpc3RQb3B1cCgpIHx8IGlzTWVudUxpc3RPcHRpb24oKSkKLSAgICAgICAgcmV0 dXJuIElnbm9yZU9iamVjdDsKKyAgICAgICAgcmV0dXJuIEluY2x1ZGVPYmplY3Q7CiAKICAgICBy ZXR1cm4gRGVmYXVsdEJlaGF2aW9yOwogfQo= 140243 2012-05-04 08:47:30 -0700 2012-05-04 09:30:43 -0700 Patch bug-85541-20120504084651.patch text/plain 2874 dtseng SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjAwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAzICBEYXZpZCBU c2VuZyAgPGR0c2VuZ0Bnb29nbGUuY29tPgorCisgICAgICAgIENocm9taXVtIHNob3VsZCBpbmNs dWRlIE1lbnVMaXN0UG9wdXBzJyBhbmQgTWVudUxpc3RPcHRpb25zJyB3aXRoaW4gdGhlIGF4IHRy ZWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTU0 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 TW9ja09iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1vY2tPYmplY3Q6 OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvY2hyb21p dW0vQWNjZXNzaWJpbGl0eU9iamVjdENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToK KwogMjAxMi0wNS0wMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgcmVwYWludCBjb3VudGVyIGRyYXdpbmcgY29kZSBvdXQgaW50byBhIHNlcGFy YXRlIGZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlNZW51TGlzdE9wdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uLmgJKHJldmlzaW9uIDExNTk5NikK KysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0 aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDggQEAgY2xhc3MgQWNjZXNzaWJpbGl0 eU1lbnVMaXN0T3B0aW9uIDogcHVibAogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEFj Y2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbj4gY3JlYXRlKCkgeyByZXR1cm4gYWRvcHRSZWYobmV3 IEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbik7IH0KIAorICAgIHZpcnR1YWwgYm9vbCBhY2Nl c3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3QgIHsgcmV0dXJuIGFjY2Vzc2liaWxpdHlQbGF0Zm9y bUluY2x1ZGVzT2JqZWN0KCkgPT0gRGVmYXVsdEJlaGF2aW9yIHx8IGFjY2Vzc2liaWxpdHlQbGF0 Zm9ybUluY2x1ZGVzT2JqZWN0KCkgPT0gSWdub3JlT2JqZWN0OyB9CisKICAgICB2b2lkIHNldEVs ZW1lbnQoSFRNTEVsZW1lbnQqKTsKIAogcHJpdmF0ZToKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmgJ KHJldmlzaW9uIDExNTk5NikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU1lbnVMaXN0UG9wdXAuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsOSArNDEsMTEgQEAg cHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGlzRW5hYmxlZCgpIGNvbnN0OwogICAgIHZpcnR1 YWwgYm9vbCBpc09mZlNjcmVlbigpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBhY2Nlc3NpYmls aXR5SXNJZ25vcmVkKCkgY29uc3QgIHsgcmV0dXJuIGFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1 ZGVzT2JqZWN0KCkgPT0gRGVmYXVsdEJlaGF2aW9yIHx8IGFjY2Vzc2liaWxpdHlQbGF0Zm9ybUlu Y2x1ZGVzT2JqZWN0KCkgPT0gSWdub3JlT2JqZWN0OyB9CiAKICAgICB2b2lkIGRpZFVwZGF0ZUFj dGl2ZU9wdGlvbihpbnQgb3B0aW9uSW5kZXgpOwogCisKIHByaXZhdGU6CiAgICAgQWNjZXNzaWJp bGl0eU1lbnVMaXN0UG9wdXAoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY2hyb21pdW0vQWNjZXNzaWJpbGl0eU9iamVj dENocm9taXVtLmNwcAkocmV2aXNpb24gMTE1OTk2KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zNyw3ICszNyw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNz aWJpbGl0eUkKIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVj dDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKSBjb25zdAogewogICAgIGlm IChpc01lbnVMaXN0UG9wdXAoKSB8fCBpc01lbnVMaXN0T3B0aW9uKCkpCi0gICAgICAgIHJldHVy biBJZ25vcmVPYmplY3Q7CisgICAgICAgIHJldHVybiBJbmNsdWRlT2JqZWN0OwogCiAgICAgcmV0 dXJuIERlZmF1bHRCZWhhdmlvcjsKIH0K 140253 2012-05-04 09:30:46 -0700 2012-05-04 09:35:06 -0700 Patch bug-85541-20120504093008.patch text/plain 3978 dtseng SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjAwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAzICBEYXZpZCBU c2VuZyAgPGR0c2VuZ0Bnb29nbGUuY29tPgorCisgICAgICAgIENocm9taXVtIHNob3VsZCBpbmNs dWRlIE1lbnVMaXN0UG9wdXBzJyBhbmQgTWVudUxpc3RPcHRpb25zJyB3aXRoaW4gdGhlIGF4IHRy ZWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTU0 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 TW9ja09iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1vY2tPYmplY3Q6 OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvY2hyb21p dW0vQWNjZXNzaWJpbGl0eU9iamVjdENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToK KwogMjAxMi0wNS0wMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgcmVwYWludCBjb3VudGVyIGRyYXdpbmcgY29kZSBvdXQgaW50byBhIHNlcGFy YXRlIGZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlNZW51TGlzdE9wdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24uY3BwCShyZXZpc2lvbiAxMTU5 OTYpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlz dE9wdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk2LDYgKzk2LDEwIEBAIGJvb2wgQWNjZXNz aWJpbGl0eU1lbnVMaXN0T3B0aW9uOjpjYW5TZXQKICAgICByZXR1cm4gaXNFbmFibGVkKCk7CiB9 CiAKK2Jvb2wgQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uOjphY2Nlc3NpYmlsaXR5SXNJZ25v cmVkKCkgY29uc3QgeworICAgIHJldHVybiBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09i amVjdCgpICE9IElnbm9yZU9iamVjdDsKK30KKwogTGF5b3V0UmVjdCBBY2Nlc3NpYmlsaXR5TWVu dUxpc3RPcHRpb246OmVsZW1lbnRSZWN0KCkgY29uc3QKIHsKICAgICBBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBwYXJlbnQgPSBwYXJlbnRPYmplY3QoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24uaAko cmV2aXNpb24gMTE1OTk2KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5TWVudUxpc3RPcHRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsOCBAQCBj bGFzcyBBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24gOiBwdWJsCiBwdWJsaWM6CiAgICAgc3Rh dGljIFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uPiBjcmVhdGUoKSB7IHJl dHVybiBhZG9wdFJlZihuZXcgQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uKTsgfQogCisgICAg dmlydHVhbCBib29sIGFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSBjb25zdDsKKwogICAgIHZvaWQg c2V0RWxlbWVudChIVE1MRWxlbWVudCopOwogCiBwcml2YXRlOgpJbmRleDogU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RQ b3B1cC5jcHAJKHJldmlzaW9uIDExNTk5NikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Miw2 ICs2MiwxMCBAQCBib29sIEFjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwOjppc0VuYWJsCiAgICAg cmV0dXJuIG1fcGFyZW50LT5pc0VuYWJsZWQoKTsKIH0KIAorYm9vbCBBY2Nlc3NpYmlsaXR5TWVu dUxpc3RQb3B1cDo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0IHsKKyAgICByZXR1cm4g YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKSAhPSBJZ25vcmVPYmplY3Q7Cit9 CisKIEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbiogQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9w dXA6Om1lbnVMaXN0T3B0aW9uQWNjZXNzaWJpbGl0eU9iamVjdChIVE1MRWxlbWVudCogZWxlbWVu dCkgY29uc3QKIHsKICAgICBpZiAoIWVsZW1lbnQgfHwgIWVsZW1lbnQtPmhhc1RhZ05hbWUob3B0 aW9uVGFnKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eU1lbnVMaXN0UG9wdXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmgJKHJldmlzaW9uIDExNTk5NikKKysrIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaAko d29ya2luZyBjb3B5KQpAQCAtNDEsOSArNDEsMTEgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBi b29sIGlzRW5hYmxlZCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpc09mZlNjcmVlbigpIGNv bnN0OworICAgIHZpcnR1YWwgYm9vbCBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3Q7CiAK ICAgICB2b2lkIGRpZFVwZGF0ZUFjdGl2ZU9wdGlvbihpbnQgb3B0aW9uSW5kZXgpOwogCisKIHBy aXZhdGU6CiAgICAgQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAoKTsKIApJbmRleDogU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21p dW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY2hyb21p dW0vQWNjZXNzaWJpbGl0eU9iamVjdENocm9taXVtLmNwcAkocmV2aXNpb24gMTE1OTk2KQorKysg U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0 Q2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw3IEBAIGJvb2wgQWNjZXNz aWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eUkKIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNp b24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmpl Y3QoKSBjb25zdAogewogICAgIGlmIChpc01lbnVMaXN0UG9wdXAoKSB8fCBpc01lbnVMaXN0T3B0 aW9uKCkpCi0gICAgICAgIHJldHVybiBJZ25vcmVPYmplY3Q7CisgICAgICAgIHJldHVybiBJbmNs dWRlT2JqZWN0OwogCiAgICAgcmV0dXJuIERlZmF1bHRCZWhhdmlvcjsKIH0K 140254 2012-05-04 09:35:10 -0700 2012-05-04 09:49:09 -0700 Patch bug-85541-20120504093432.patch text/plain 3980 dtseng SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjAwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAzICBEYXZpZCBU c2VuZyAgPGR0c2VuZ0Bnb29nbGUuY29tPgorCisgICAgICAgIENocm9taXVtIHNob3VsZCBpbmNs dWRlIE1lbnVMaXN0UG9wdXBzJyBhbmQgTWVudUxpc3RPcHRpb25zJyB3aXRoaW4gdGhlIGF4IHRy ZWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTU0 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 TW9ja09iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1vY2tPYmplY3Q6 OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvY2hyb21p dW0vQWNjZXNzaWJpbGl0eU9iamVjdENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToK KwogMjAxMi0wNS0wMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgcmVwYWludCBjb3VudGVyIGRyYXdpbmcgY29kZSBvdXQgaW50byBhIHNlcGFy YXRlIGZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlNZW51TGlzdE9wdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24uY3BwCShyZXZpc2lvbiAxMTU5 OTYpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlz dE9wdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk2LDYgKzk2LDExIEBAIGJvb2wgQWNjZXNz aWJpbGl0eU1lbnVMaXN0T3B0aW9uOjpjYW5TZXQKICAgICByZXR1cm4gaXNFbmFibGVkKCk7CiB9 CiAKK2Jvb2wgQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uOjphY2Nlc3NpYmlsaXR5SXNJZ25v cmVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gYWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNP YmplY3QoKSAhPSBJZ25vcmVPYmplY3Q7Cit9CisKIExheW91dFJlY3QgQWNjZXNzaWJpbGl0eU1l bnVMaXN0T3B0aW9uOjplbGVtZW50UmVjdCgpIGNvbnN0CiB7CiAgICAgQWNjZXNzaWJpbGl0eU9i amVjdCogcGFyZW50ID0gcGFyZW50T2JqZWN0KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uLmgJ KHJldmlzaW9uIDExNTk5NikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU1lbnVMaXN0T3B0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDggQEAg Y2xhc3MgQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uIDogcHVibAogcHVibGljOgogICAgIHN0 YXRpYyBQYXNzUmVmUHRyPEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbj4gY3JlYXRlKCkgeyBy ZXR1cm4gYWRvcHRSZWYobmV3IEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbik7IH0KIAorICAg IHZpcnR1YWwgYm9vbCBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3Q7CisKICAgICB2b2lk IHNldEVsZW1lbnQoSFRNTEVsZW1lbnQqKTsKIAogcHJpdmF0ZToKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0 UG9wdXAuY3BwCShyZXZpc2lvbiAxMTU5OTYpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIs NiArNjIsMTEgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cDo6aXNFbmFibAogICAg IHJldHVybiBtX3BhcmVudC0+aXNFbmFibGVkKCk7CiB9CiAKK2Jvb2wgQWNjZXNzaWJpbGl0eU1l bnVMaXN0UG9wdXA6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSBjb25zdAoreworICAgIHJldHVy biBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpICE9IElnbm9yZU9iamVjdDsK K30KKwogQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uKiBBY2Nlc3NpYmlsaXR5TWVudUxpc3RQ b3B1cDo6bWVudUxpc3RPcHRpb25BY2Nlc3NpYmlsaXR5T2JqZWN0KEhUTUxFbGVtZW50KiBlbGVt ZW50KSBjb25zdAogewogICAgIGlmICghZWxlbWVudCB8fCAhZWxlbWVudC0+aGFzVGFnTmFtZShv cHRpb25UYWcpKQpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5TWVudUxpc3RQb3B1cC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaAkocmV2aXNpb24gMTE1OTk2KQorKysg U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cC5o CSh3b3JraW5nIGNvcHkpCkBAIC00MSw5ICs0MSwxMSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFs IGJvb2wgaXNFbmFibGVkKCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGlzT2ZmU2NyZWVuKCkg Y29uc3Q7CisgICAgdmlydHVhbCBib29sIGFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSBjb25zdDsK IAogICAgIHZvaWQgZGlkVXBkYXRlQWN0aXZlT3B0aW9uKGludCBvcHRpb25JbmRleCk7CiAKKwog cHJpdmF0ZToKICAgICBBY2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cCgpOwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2Nocm9taXVtL0FjY2Vzc2liaWxpdHlPYmplY3RDaHJv bWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJv bWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3BwCShyZXZpc2lvbiAxMTU5OTYpCisr KyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2Nocm9taXVtL0FjY2Vzc2liaWxpdHlPYmpl Y3RDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAgYm9vbCBBY2Nl c3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5SQogQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1 c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09i amVjdCgpIGNvbnN0CiB7CiAgICAgaWYgKGlzTWVudUxpc3RQb3B1cCgpIHx8IGlzTWVudUxpc3RP cHRpb24oKSkKLSAgICAgICAgcmV0dXJuIElnbm9yZU9iamVjdDsKKyAgICAgICAgcmV0dXJuIElu Y2x1ZGVPYmplY3Q7CiAKICAgICByZXR1cm4gRGVmYXVsdEJlaGF2aW9yOwogfQo= 140258 2012-05-04 09:49:13 -0700 2012-05-04 10:46:52 -0700 Patch bug-85541-20120504094835.patch text/plain 4062 dtseng SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjAwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA1LTAzICBEYXZpZCBU c2VuZyAgPGR0c2VuZ0Bnb29nbGUuY29tPgorCisgICAgICAgIENocm9taXVtIHNob3VsZCBpbmNs dWRlIE1lbnVMaXN0UG9wdXBzJyBhbmQgTWVudUxpc3RPcHRpb25zJyB3aXRoaW4gdGhlIGF4IHRy ZWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTU0 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVy ZWQgYnkgZXhpc3RpbmcgdGVzdHMuIAorICAgICAgICBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5 L21lbnUtbGlzdC1zZW5kcy1jaGFuZ2Utbm90aWZpY2F0aW9uLmh0bWwKKworICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1vY2tPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlNb2NrT2JqZWN0OjphY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKToKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2Nocm9taXVtL0FjY2Vzc2liaWxpdHlPYmplY3RDaHJvbWl1bS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5 UGxhdGZvcm1JbmNsdWRlc09iamVjdCk6CisKIDIwMTItMDUtMDMgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHJlcGFpbnQgY291bnRlciBkcmF3 aW5nIGNvZGUgb3V0IGludG8gYSBzZXBhcmF0ZSBmdW5jdGlvbgpJbmRleDogU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0 T3B0aW9uLmNwcAkocmV2aXNpb24gMTE1OTk2KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 Niw2ICs5NiwxMSBAQCBib29sIEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbjo6Y2FuU2V0CiAg ICAgcmV0dXJuIGlzRW5hYmxlZCgpOwogfQogCitib29sIEFjY2Vzc2liaWxpdHlNZW51TGlzdE9w dGlvbjo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGFjY2Vz c2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KCkgIT0gSWdub3JlT2JqZWN0OworfQorCiBM YXlvdXRSZWN0IEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbjo6ZWxlbWVudFJlY3QoKSBjb25z dAogewogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVudCA9IHBhcmVudE9iamVjdCgpOwpJ bmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RP cHRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlNZW51TGlzdE9wdGlvbi5oCShyZXZpc2lvbiAxMTU5OTYpCisrKyBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNyw2ICszNyw4IEBAIGNsYXNzIEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlv biA6IHB1YmwKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5TWVu dUxpc3RPcHRpb24+IGNyZWF0ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBBY2Nlc3NpYmlsaXR5 TWVudUxpc3RPcHRpb24pOyB9CiAKKyAgICB2aXJ0dWFsIGJvb2wgYWNjZXNzaWJpbGl0eUlzSWdu b3JlZCgpIGNvbnN0OworCiAgICAgdm9pZCBzZXRFbGVtZW50KEhUTUxFbGVtZW50Kik7CiAKIHBy aXZhdGU6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlN ZW51TGlzdFBvcHVwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmNwcAkocmV2aXNpb24gMTE1OTk2KQorKysg U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTYyLDYgKzYyLDExIEBAIGJvb2wgQWNjZXNzaWJpbGl0eU1l bnVMaXN0UG9wdXA6OmlzRW5hYmwKICAgICByZXR1cm4gbV9wYXJlbnQtPmlzRW5hYmxlZCgpOwog fQogCitib29sIEFjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwOjphY2Nlc3NpYmlsaXR5SXNJZ25v cmVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gYWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNP YmplY3QoKSAhPSBJZ25vcmVPYmplY3Q7Cit9CisKIEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlv biogQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXA6Om1lbnVMaXN0T3B0aW9uQWNjZXNzaWJpbGl0 eU9iamVjdChIVE1MRWxlbWVudCogZWxlbWVudCkgY29uc3QKIHsKICAgICBpZiAoIWVsZW1lbnQg fHwgIWVsZW1lbnQtPmhhc1RhZ05hbWUob3B0aW9uVGFnKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVw LmgJKHJldmlzaW9uIDExNTk5NikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsOSArNDEsMTEg QEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGlzRW5hYmxlZCgpIGNvbnN0OwogICAgIHZp cnR1YWwgYm9vbCBpc09mZlNjcmVlbigpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBhY2Nlc3Np YmlsaXR5SXNJZ25vcmVkKCkgY29uc3Q7CiAKICAgICB2b2lkIGRpZFVwZGF0ZUFjdGl2ZU9wdGlv bihpbnQgb3B0aW9uSW5kZXgpOwogCisKIHByaXZhdGU6CiAgICAgQWNjZXNzaWJpbGl0eU1lbnVM aXN0UG9wdXAoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJvbWl1 bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvY2hyb21pdW0vQWNjZXNzaWJpbGl0eU9iamVjdENocm9taXVt LmNwcAkocmV2aXNpb24gMTE1OTk2KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9j aHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNyw3ICszNyw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eUkK IEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNz aWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKSBjb25zdAogewogICAgIGlmIChpc01lbnVM aXN0UG9wdXAoKSB8fCBpc01lbnVMaXN0T3B0aW9uKCkpCi0gICAgICAgIHJldHVybiBJZ25vcmVP YmplY3Q7CisgICAgICAgIHJldHVybiBJbmNsdWRlT2JqZWN0OwogCiAgICAgcmV0dXJuIERlZmF1 bHRCZWhhdmlvcjsKIH0K