79421 2012-02-23 16:49:19 -0800 Need a WK1 Mac API to filter which subframes go into WebArchives as they are created 2012-02-24 09:20:12 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac All ASSIGNED InRadar P2 Normal --- 1 beidson beidson commit-queue oldest_to_newest 563685 0 beidson 2012-02-23 16:49:19 -0800 Need a WK1 Mac API to filter which subframes go into WebArchives as they are created This API will use the WebCore code landed as part of https://bugs.webkit.org/show_bug.cgi?id=77766 In radar as <rdar://problem/10805709> 563700 1 128606 beidson 2012-02-23 16:55:09 -0800 Created attachment 128606 Patch v1 563765 2 128606 sam 2012-02-23 17:51:13 -0800 Comment on attachment 128606 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=128606&action=review > Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h:53 > +@interface DOMNode (WebDOMNodeOperationsPrivate) > +- (WebArchive *)webArchiveWithWebArchiveCreationDelegate:(id)webArchiveCreationDelegate; > +@end This should take a block, not an arbitrary object. 563816 3 128631 beidson 2012-02-23 18:47:49 -0800 Created attachment 128631 Patch v2 - Use a block 564130 4 commit-queue 2012-02-24 02:22:16 -0800 Attachment 128631 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/mac/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h:53: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 564359 5 128631 sam 2012-02-24 09:09:47 -0800 Comment on attachment 128631 Patch v2 - Use a block View in context: https://bugs.webkit.org/attachment.cgi?id=128631&action=review Feel free to add an API test as well. > Source/WebKit/mac/DOM/WebDOMOperations.mm:89 > +class WebFrameFilter : public WebCore::FrameFilter { > +public: > + WebFrameFilter(ShouldIncludeSubframeInWebArchiveBlock filterBlock); > + > +private: > + virtual bool shouldIncludeSubframe(Frame*) const OVERRIDE; > + > + ShouldIncludeSubframeInWebArchiveBlock m_filterBlock; > +}; Though perhaps not strictly necessary due to the one place it is used, it seems safer to Block_copy/Block_release this in the c++ class. 564373 6 128631 aroben 2012-02-24 09:19:35 -0800 Comment on attachment 128631 Patch v2 - Use a block View in context: https://bugs.webkit.org/attachment.cgi?id=128631&action=review > Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h:54 > +- (WebArchive *)webArchiveFilteringSubframes:(ShouldIncludeSubframeInWebArchiveBlock)shouldIncludeSubframeInWebArchive; Maybe webArchiveWithSubframeFilter: would be a better name? And the block typedef could be WebArchiveSubframeFilter. (I'm not sure the block typedef needs to include the word "block".) 564374 7 128631 aroben 2012-02-24 09:20:12 -0800 Comment on attachment 128631 Patch v2 - Use a block View in context: https://bugs.webkit.org/attachment.cgi?id=128631&action=review >> Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h:54 >> +- (WebArchive *)webArchiveFilteringSubframes:(ShouldIncludeSubframeInWebArchiveBlock)shouldIncludeSubframeInWebArchive; > > Maybe webArchiveWithSubframeFilter: would be a better name? And the block typedef could be WebArchiveSubframeFilter. (I'm not sure the block typedef needs to include the word "block".) After all, this block is just being used to perform a functional-style filter operation. 128606 2012-02-23 16:55:09 -0800 2012-02-23 18:47:49 -0800 Patch v1 patch.txt text/plain 9733 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZmViOTY1OC4uM2ZlNTkxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxMi0wMi0yMyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzEwODA1NzA5PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5NDIxCisgICAgICAgIE5lZWQgYSBXSzEgTWFjIEFQSSB0byBmaWx0ZXIg d2hpY2ggc3ViZnJhbWVzIGdvIGludG8gV2ViQXJjaGl2ZXMgYXMgdGhleSBhcmUgY3JlYXRlZAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0 Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTItMDItMjAgIEZpbGlwIFBpemxvICA8 ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBKU0Mgc2hvdWxkIGJlIGEgdHJpcGxlLXRpZXIg Vk0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmlu ZGV4IGM4ZGU3NTUuLmVlNTZiMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTA0LDYgKzEwNCw3IEBACiAJCTUxNThGNkVGMTA2RDg2 MkEwMEFGNDU3QyAvKiBXZWJIaXN0b3J5RGVsZWdhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxNThGNkVFMTA2RDg2MkEwMEFGNDU3QyAvKiBXZWJI aXN0b3J5RGVsZWdhdGUuaCAqLzsgfTsKIAkJNTE4NUY2MjYxMDcxMkI4MDAwN0FBMzkzIC8qIFdl Yk5hdmlnYXRpb25EYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA1MTg1RjYyNTEwNzEyQjgwMDA3QUEzOTMgLyogV2ViTmF2aWdhdGlvbkRhdGEuaCAq Lzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk1MTg1RjYy ODEwNzEyQjk3MDA3QUEzOTMgLyogV2ViTmF2aWdhdGlvbkRhdGEubW0gaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTg1RjYyNzEwNzEyQjk3MDA3QUEzOTMg LyogV2ViTmF2aWdhdGlvbkRhdGEubW0gKi87IH07CisJCTUxODhEMTFGMTRGNzA4NTEwMDExMjc3 RiAvKiBXZWJBcmNoaXZlUHJpdmF0ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gNTE4OEQxMUUxNEY3MDg1MTAwMTEyNzdGIC8qIFdlYkFyY2hpdmVQcml2 YXRlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJ NTFBRURFRjEwQ0VDRjQ1NzAwODU0MzI4IC8qIFdlYkRhdGFiYXNlTWFuYWdlckludGVybmFsLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUFFREVGMDBD RUNGNDU3MDA4NTQzMjggLyogV2ViRGF0YWJhc2VNYW5hZ2VySW50ZXJuYWwuaCAqLzsgfTsKIAkJ NTFCMkExMDAwQURCMTVEMDAwMkE5QkVFIC8qIFdlYkljb25EYXRhYmFzZURlbGVnYXRlLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUIyQTBGRjBBREIx NUQwMDAyQTlCRUUgLyogV2ViSWNvbkRhdGFiYXNlRGVsZWdhdGUuaCAqLzsgfTsKIAkJNTFDNzE0 RkIwQjIwRjc5RjAwRTVFMzNDIC8qIFdlYkJhY2tGb3J3YXJkTGlzdEludGVybmFsLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUM3MTRGQTBCMjBGNzlG MDBFNUUzM0MgLyogV2ViQmFja0ZvcndhcmRMaXN0SW50ZXJuYWwuaCAqLzsgfTsKQEAgLTUyMSw2 ICs1MjIsNyBAQAogCQk1MTg1RjYyNTEwNzEyQjgwMDA3QUEzOTMgLyogV2ViTmF2aWdhdGlvbkRh dGEuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViTmF2aWdhdGlvbkRhdGEu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTE4NUY2MjcxMDcxMkI5NzAwN0FBMzkz IC8qIFdlYk5hdmlnYXRpb25EYXRhLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3Bw OyBwYXRoID0gV2ViTmF2aWdhdGlvbkRhdGEubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTUxODYzRUZDMDY1NDE5RUIwMEU5RThERCAvKiBXZWJKYXZhUGx1Z0luLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgaW5kZW50V2lkdGggPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViSmF2YVBsdWdJbi5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsK KwkJNTE4OEQxMUUxNEY3MDg1MTAwMTEyNzdGIC8qIFdlYkFyY2hpdmVQcml2YXRlLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYkFyY2hpdmVQcml2YXRlLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxQThCNTJFMDQyODJCNTkwMENBMkQzQSAvKiBXZWJGcmFt ZVZpZXcuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsg aW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gV2ViRnJhbWVWaWV3Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IHRhYldpZHRoID0gODsg dXNlc1RhYnMgPSAwOyB9OwogCQk1MUE4QjUyRjA0MjgyQjU5MDBDQTJEM0EgLyogV2ViRnJhbWVW aWV3Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMwOyBp bmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3Bw OyBwYXRoID0gV2ViRnJhbWVWaWV3Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0 aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJNTFBOEI1MzIwNDI4MkJEMjAwQ0EyRDNBIC8qIFdl YkZyYW1lVmlld0ludGVybmFsLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gMzA7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IFdlYkZyYW1lVmlld0ludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwpAQCAtMTE2NCw2ICsxMTY2LDcg QEAKIAkJCQk4MzczNDM1QTA2MjRFRTBEMDBGM0IyODkgLyogV2ViQXJjaGl2ZS5oICovLAogCQkJ CTgzNzM0MzVCMDYyNEVFMEQwMEYzQjI4OSAvKiBXZWJBcmNoaXZlLm1tICovLAogCQkJCTQ0QkI4 QjEzMTI0MUEwMjIwMDFFM0EyMiAvKiBXZWJBcmNoaXZlSW50ZXJuYWwuaCAqLywKKwkJCQk1MTg4 RDExRTE0RjcwODUxMDAxMTI3N0YgLyogV2ViQXJjaGl2ZVByaXZhdGUuaCAqLywKIAkJCQk5MzNE NjU5OTAzNDEzRkYyMDA4NjM1Q0UgLyogV2ViQ2xpcFZpZXcuaCAqLywKIAkJCQk5MzNENjU5QTAz NDEzRkYyMDA4NjM1Q0UgLyogV2ViQ2xpcFZpZXcubW0gKi8sCiAJCQkJOTNFMkExQTIxMjNCMEIz QzAwOUZFMTJBIC8qIFdlYkRhc2hib2FyZFJlZ2lvbi5oICovLApAQCAtMTY0Myw2ICsxNjQ2LDcg QEAKIAkJCQk0MUY0NDg0RjEwMzM4RThDMDAzMEU1NUUgLyogV2ViV29ya2Vyc1ByaXZhdGUuaCBp biBIZWFkZXJzICovLAogCQkJCTMxMkUyRkU1MTRFNDgxODIwMDdDQ0ExOCAvKiBXZWJOb3RpZmlj YXRpb24uaCBpbiBIZWFkZXJzICovLAogCQkJCTMxMkUyRkU5MTRFNDgyMTUwMDdDQ0ExOCAvKiBX ZWJOb3RpZmljYXRpb25JbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8sCisJCQkJNTE4OEQxMUYxNEY3 MDg1MTAwMTEyNzdGIC8qIFdlYkFyY2hpdmVQcml2YXRlLmggaW4gSGVhZGVycyAqLywKIAkJCSk7 CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwppbmRleCAyMDg2MzhmLi5kMmZjMmQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjIgQEAKKzIwMTItMDItMjMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgor CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDgwNTcwOT4gYW5kIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTQyMQorICAgICAgICBOZWVkIGEgV0sxIE1hYyBBUEkg dG8gZmlsdGVyIHdoaWNoIHN1YmZyYW1lcyBnbyBpbnRvIFdlYkFyY2hpdmVzIGFzIHRoZXkgYXJl IGNyZWF0ZWQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBXZWJBcmNoaXZlQ3JlYXRpb25EZWxlZ2F0ZSBpbnRlcmZhY2UgZm9yIGNsaWVudHMg dG8gdXNlIGFzIHRoZWlyIGNhbGxiYWNrOgorICAgICAgICAqIFdlYlZpZXcvV2ViQXJjaGl2ZVBy aXZhdGUuaDogQWRkZWQuCisKKyAgICAgICAgQWRkIHdlYkFyY2hpdmVXaXRoV2ViQXJjaGl2ZUNy ZWF0aW9uRGVsZWdhdGUgdGhhdCB0YWtlcyBhIGNyZWF0aW9uIGRlbGVnYXRlIGFyZ3VtZW50OiAK KyAgICAgICAgKiBET00vV2ViRE9NT3BlcmF0aW9uc1ByaXZhdGUuaDoKKworICAgICAgICAqIERP TS9XZWJET01PcGVyYXRpb25zLm1tOgorICAgICAgICAoV2ViRnJhbWVGaWx0ZXIpOiBXZWJLaXRN YWMncyBGcmFtZUZpbHRlciBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKFdlYkZyYW1lRmlsdGVy OjpXZWJGcmFtZUZpbHRlcik6CisgICAgICAgIChXZWJGcmFtZUZpbHRlcjo6c2hvdWxkSW5jbHVk ZVN1YmZyYW1lKTogUGFzcyB0aGUgZGVjaXNpb24gdG8gdGhlIFdlYkFyY2hpdmVDcmVhdGlvbkRl bGVnYXRlLgorICAgICAgICAoLVtET01Ob2RlIHdlYkFyY2hpdmVXaXRoV2ViQXJjaGl2ZUNyZWF0 aW9uRGVsZWdhdGU6XSk6CisKIDIwMTItMDItMjIgIEhhamltZSBNb3JyaXRhICA8bW9ycml0YUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgTk9USUZJQ0FUSU9OUyBzaG91bGQgYmUgaW1wbGVtZW50 ZWQgYXMgUGFnZVN1cHBsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0RPTS9X ZWJET01PcGVyYXRpb25zLm1tIGIvU291cmNlL1dlYktpdC9tYWMvRE9NL1dlYkRPTU9wZXJhdGlv bnMubW0KaW5kZXggNWVhOTk0Ni4uNjM3NWVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9t YWMvRE9NL1dlYkRPTU9wZXJhdGlvbnMubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvRE9NL1dl YkRPTU9wZXJhdGlvbnMubW0KQEAgLTMzLDEyICszMywxNSBAQAogI2ltcG9ydCAiRE9NTm9kZUlu dGVybmFsLmgiCiAjaW1wb3J0ICJET01SYW5nZUludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJBcmNo aXZlSW50ZXJuYWwuaCIKKyNpbXBvcnQgIldlYkFyY2hpdmVQcml2YXRlLmgiCiAjaW1wb3J0ICJX ZWJEYXRhU291cmNlUHJpdmF0ZS5oIgogI2ltcG9ydCAiV2ViRnJhbWVJbnRlcm5hbC5oIgorI2lt cG9ydCAiV2ViRnJhbWVMb2FkZXJDbGllbnQuaCIKICNpbXBvcnQgIldlYkZyYW1lUHJpdmF0ZS5o IgogI2ltcG9ydCAiV2ViS2l0TlNTdHJpbmdFeHRyYXMuaCIKICNpbXBvcnQgPEphdmFTY3JpcHRD b3JlL0FQSUNhc3QuaD4KICNpbXBvcnQgPFdlYkNvcmUvRG9jdW1lbnQuaD4KKyNpbXBvcnQgPFdl YkNvcmUvRnJhbWUuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTElucHV0RWxlbWVudC5oPgogI2lt cG9ydCA8V2ViQ29yZS9IVE1MUGFyc2VySWRpb21zLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0pTRWxl bWVudC5oPgpAQCAtNzYsNiArNzksMzAgQEAgLSAoTlNTdHJpbmcgKilfbWFya2VyVGV4dEZvckxp c3RJdGVtCiAKIEBlbmQKIAorY2xhc3MgV2ViRnJhbWVGaWx0ZXIgOiBwdWJsaWMgV2ViQ29yZTo6 RnJhbWVGaWx0ZXIgeworcHVibGljOgorICAgIFdlYkZyYW1lRmlsdGVyKGlkIGRlbGVnYXRlKTsK KyAgICAgICAgCitwcml2YXRlOgorICAgIHZpcnR1YWwgYm9vbCBzaG91bGRJbmNsdWRlU3ViZnJh bWUoRnJhbWUqKSBjb25zdCBPVkVSUklERTsKKworICAgIFJldGFpblB0cjxpZD4gbV9kZWxlZ2F0 ZTsKK307CisKK1dlYkZyYW1lRmlsdGVyOjpXZWJGcmFtZUZpbHRlcihpZCBkZWxlZ2F0ZSkKKyAg ICA6IG1fZGVsZWdhdGUoZGVsZWdhdGUpCit7Cit9CisKK2Jvb2wgV2ViRnJhbWVGaWx0ZXI6OnNo b3VsZEluY2x1ZGVTdWJmcmFtZShGcmFtZSogZnJhbWUpIGNvbnN0Cit7CisgICAgaWYgKCFtX2Rl bGVnYXRlKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgCisgICAgV2ViRnJhbWUqIHdl YkZyYW1lID0gc3RhdGljX2Nhc3Q8V2ViRnJhbWVMb2FkZXJDbGllbnQqPihmcmFtZS0+bG9hZGVy KCktPmNsaWVudCgpKS0+d2ViRnJhbWUoKTsKKyAgICByZXR1cm4gW21fZGVsZWdhdGUuZ2V0KCkg c2hvdWxkSW5jbHVkZVN1YmZyYW1lSW5XZWJBcmNoaXZlOndlYkZyYW1lXTsKK30KKwogQGltcGxl bWVudGF0aW9uIERPTU5vZGUgKFdlYkRPTU5vZGVPcGVyYXRpb25zKQogCiAtIChXZWJBcmNoaXZl ICopd2ViQXJjaGl2ZQpAQCAtODMsNiArMTEwLDEyIEBAIC0gKFdlYkFyY2hpdmUgKil3ZWJBcmNo aXZlCiAgICAgcmV0dXJuIFtbW1dlYkFyY2hpdmUgYWxsb2NdIF9pbml0V2l0aENvcmVMZWdhY3lX ZWJBcmNoaXZlOkxlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZShjb3JlKHNlbGYpKV0gYXV0b3JlbGVh c2VdOwogfQogCistIChXZWJBcmNoaXZlICopd2ViQXJjaGl2ZVdpdGhXZWJBcmNoaXZlQ3JlYXRp b25EZWxlZ2F0ZTooaWQpd2ViQXJjaGl2ZUNyZWF0aW9uRGVsZWdhdGUKK3sKKyAgICBXZWJGcmFt ZUZpbHRlciBmaWx0ZXIod2ViQXJjaGl2ZUNyZWF0aW9uRGVsZWdhdGUpOworICAgIHJldHVybiBb W1tXZWJBcmNoaXZlIGFsbG9jXSBfaW5pdFdpdGhDb3JlTGVnYWN5V2ViQXJjaGl2ZTpMZWdhY3lX ZWJBcmNoaXZlOjpjcmVhdGUoY29yZShzZWxmKSwgJmZpbHRlcildIGF1dG9yZWxlYXNlXTsKK30K KwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gRE9NTm9kZSAoV2ViRE9NTm9kZU9wZXJhdGlvbnNQ ZW5kaW5nUHVibGljKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvRE9NL1dlYkRPTU9w ZXJhdGlvbnNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9ET00vV2ViRE9NT3BlcmF0aW9u c1ByaXZhdGUuaAppbmRleCBiNTc5YTZmLi5lZWU5YmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9ET00vV2ViRE9NT3BlcmF0aW9uc1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9ET00vV2ViRE9NT3BlcmF0aW9uc1ByaXZhdGUuaApAQCAtNDcsMyArNDcsNyBAQAogLSAo TlNTdHJpbmcgKiltYXJrdXBTdHJpbmc7CiAtIChOU1JlY3QpX3JlbmRlclJlY3Q6KGJvb2wgKilp c1JlcGxhY2VkOwogQGVuZAorCitAaW50ZXJmYWNlIERPTU5vZGUgKFdlYkRPTU5vZGVPcGVyYXRp b25zUHJpdmF0ZSkKKy0gKFdlYkFyY2hpdmUgKil3ZWJBcmNoaXZlV2l0aFdlYkFyY2hpdmVDcmVh dGlvbkRlbGVnYXRlOihpZCl3ZWJBcmNoaXZlQ3JlYXRpb25EZWxlZ2F0ZTsKK0BlbmQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQXJjaGl2ZVByaXZhdGUuaCBiL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQXJjaGl2ZVByaXZhdGUuaApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi40ODhhMTgxCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJBcmNoaXZlUHJpdmF0ZS5oCkBAIC0wLDAgKzEsMzIgQEAK Ky8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KKyAqLworCitAY2xhc3MgV2ViRnJhbWU7CisKK0BpbnRlcmZhY2UgTlNPYmplY3QgKFdl YkFyY2hpdmVDcmVhdGlvbkRlbGVnYXRlKQorCistIChCT09MKXNob3VsZEluY2x1ZGVTdWJmcmFt ZUluV2ViQXJjaGl2ZTooV2ViRnJhbWUqKXN1YmZyYW1lOworCitAZW5kCg== 128631 2012-02-23 18:47:49 -0800 2012-02-24 09:20:12 -0800 Patch v2 - Use a block patch.txt text/plain 3601 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCAyMDg2MzhmLi44ZTNmMmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDItMjMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDgwNTcwOT4gYW5kIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTQyMQorICAgICAgICBOZWVkIGEgV0sxIE1h YyBBUEkgdG8gZmlsdGVyIHdoaWNoIHN1YmZyYW1lcyBnbyBpbnRvIFdlYkFyY2hpdmVzIGFzIHRo ZXkgYXJlIGNyZWF0ZWQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgd2ViQXJjaGl2ZUZpbHRlcmluZ1N1YmZyYW1lczogd2hpY2ggdGFrZXMgYSBj YWxsYmFjayBibG9jazoKKyAgICAgICAgKiBET00vV2ViRE9NT3BlcmF0aW9uc1ByaXZhdGUuaDoK KworICAgICAgICBBZGQgRnJhbWVGaWx0ZXIgdGhhdCBhZGFwdHMgdGhlIGJsb2NrLCBhbmQgdXNl IGl0IHRvIGltcGxlbWVudCB0aGUgbmV3IFNQSToKKyAgICAgICAgKiBET00vV2ViRE9NT3BlcmF0 aW9ucy5tbToKKyAgICAgICAgKFdlYkZyYW1lRmlsdGVyKToKKyAgICAgICAgKFdlYkZyYW1lRmls dGVyOjpXZWJGcmFtZUZpbHRlcik6CisgICAgICAgIChXZWJGcmFtZUZpbHRlcjo6c2hvdWxkSW5j bHVkZVN1YmZyYW1lKToKKyAgICAgICAgKC1bRE9NTm9kZSB3ZWJBcmNoaXZlRmlsdGVyaW5nU3Vi ZnJhbWVzOl0pOgorCiAyMDEyLTAyLTIyICBIYWppbWUgTW9ycml0YSAgPG1vcnJpdGFAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIE5PVElGSUNBVElPTlMgc2hvdWxkIGJlIGltcGxlbWVudGVkIGFz IFBhZ2VTdXBwbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9ET00vV2ViRE9N T3BlcmF0aW9ucy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL0RPTS9XZWJET01PcGVyYXRpb25zLm1t CmluZGV4IDVlYTk5NDYuLmZkMTM3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0RP TS9XZWJET01PcGVyYXRpb25zLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0RPTS9XZWJET01P cGVyYXRpb25zLm1tCkBAIC0zNSwxMCArMzUsMTIgQEAKICNpbXBvcnQgIldlYkFyY2hpdmVJbnRl cm5hbC5oIgogI2ltcG9ydCAiV2ViRGF0YVNvdXJjZVByaXZhdGUuaCIKICNpbXBvcnQgIldlYkZy YW1lSW50ZXJuYWwuaCIKKyNpbXBvcnQgIldlYkZyYW1lTG9hZGVyQ2xpZW50LmgiCiAjaW1wb3J0 ICJXZWJGcmFtZVByaXZhdGUuaCIKICNpbXBvcnQgIldlYktpdE5TU3RyaW5nRXh0cmFzLmgiCiAj aW1wb3J0IDxKYXZhU2NyaXB0Q29yZS9BUElDYXN0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0RvY3Vt ZW50Lmg+CisjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxJ bnB1dEVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTFBhcnNlcklkaW9tcy5oPgogI2lt cG9ydCA8V2ViQ29yZS9KU0VsZW1lbnQuaD4KQEAgLTc2LDYgKzc4LDMwIEBAIC0gKE5TU3RyaW5n ICopX21hcmtlclRleHRGb3JMaXN0SXRlbQogCiBAZW5kCiAKK2NsYXNzIFdlYkZyYW1lRmlsdGVy IDogcHVibGljIFdlYkNvcmU6OkZyYW1lRmlsdGVyIHsKK3B1YmxpYzoKKyAgICBXZWJGcmFtZUZp bHRlcihTaG91bGRJbmNsdWRlU3ViZnJhbWVJbldlYkFyY2hpdmVCbG9jayBmaWx0ZXJCbG9jayk7 CisgICAgICAgIAorcHJpdmF0ZToKKyAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkSW5jbHVkZVN1YmZy YW1lKEZyYW1lKikgY29uc3QgT1ZFUlJJREU7CisKKyAgICBTaG91bGRJbmNsdWRlU3ViZnJhbWVJ bldlYkFyY2hpdmVCbG9jayBtX2ZpbHRlckJsb2NrOworfTsKKworV2ViRnJhbWVGaWx0ZXI6Oldl YkZyYW1lRmlsdGVyKFNob3VsZEluY2x1ZGVTdWJmcmFtZUluV2ViQXJjaGl2ZUJsb2NrIGZpbHRl ckJsb2NrKQorICAgIDogbV9maWx0ZXJCbG9jayhmaWx0ZXJCbG9jaykKK3sKK30KKworYm9vbCBX ZWJGcmFtZUZpbHRlcjo6c2hvdWxkSW5jbHVkZVN1YmZyYW1lKEZyYW1lKiBmcmFtZSkgY29uc3QK K3sKKyAgICBpZiAoIW1fZmlsdGVyQmxvY2spCisgICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICAKKyAgICBXZWJGcmFtZSogd2ViRnJhbWUgPSBzdGF0aWNfY2FzdDxXZWJGcmFtZUxvYWRlckNs aWVudCo+KGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOworICAgIHJldHVy biBtX2ZpbHRlckJsb2NrKHdlYkZyYW1lKTsKK30KKwogQGltcGxlbWVudGF0aW9uIERPTU5vZGUg KFdlYkRPTU5vZGVPcGVyYXRpb25zKQogCiAtIChXZWJBcmNoaXZlICopd2ViQXJjaGl2ZQpAQCAt ODMsNiArMTA5LDEyIEBAIC0gKFdlYkFyY2hpdmUgKil3ZWJBcmNoaXZlCiAgICAgcmV0dXJuIFtb W1dlYkFyY2hpdmUgYWxsb2NdIF9pbml0V2l0aENvcmVMZWdhY3lXZWJBcmNoaXZlOkxlZ2FjeVdl YkFyY2hpdmU6OmNyZWF0ZShjb3JlKHNlbGYpKV0gYXV0b3JlbGVhc2VdOwogfQogCistIChXZWJB cmNoaXZlICopd2ViQXJjaGl2ZUZpbHRlcmluZ1N1YmZyYW1lczooU2hvdWxkSW5jbHVkZVN1YmZy YW1lSW5XZWJBcmNoaXZlQmxvY2spc2hvdWxkSW5jbHVkZVN1YmZyYW1lSW5XZWJBcmNoaXZlCit7 CisgICAgV2ViRnJhbWVGaWx0ZXIgZmlsdGVyKHNob3VsZEluY2x1ZGVTdWJmcmFtZUluV2ViQXJj aGl2ZSk7CisgICAgcmV0dXJuIFtbW1dlYkFyY2hpdmUgYWxsb2NdIF9pbml0V2l0aENvcmVMZWdh Y3lXZWJBcmNoaXZlOkxlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZShjb3JlKHNlbGYpLCAmZmlsdGVy KV0gYXV0b3JlbGVhc2VdOworfQorCiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBET01Ob2RlIChX ZWJET01Ob2RlT3BlcmF0aW9uc1BlbmRpbmdQdWJsaWMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9ET00vV2ViRE9NT3BlcmF0aW9uc1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvbWFj L0RPTS9XZWJET01PcGVyYXRpb25zUHJpdmF0ZS5oCmluZGV4IGI1NzlhNmYuLjY3NDg0NTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0RPTS9XZWJET01PcGVyYXRpb25zUHJpdmF0ZS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0RPTS9XZWJET01PcGVyYXRpb25zUHJpdmF0ZS5oCkBA IC00NywzICs0Nyw5IEBACiAtIChOU1N0cmluZyAqKW1hcmt1cFN0cmluZzsKIC0gKE5TUmVjdClf cmVuZGVyUmVjdDooYm9vbCAqKWlzUmVwbGFjZWQ7CiBAZW5kCisKK3R5cGVkZWYgQk9PTCAoXlNo b3VsZEluY2x1ZGVTdWJmcmFtZUluV2ViQXJjaGl2ZUJsb2NrKShXZWJGcmFtZSogc3ViZnJhbWUp OworCitAaW50ZXJmYWNlIERPTU5vZGUgKFdlYkRPTU5vZGVPcGVyYXRpb25zUHJpdmF0ZSkKKy0g KFdlYkFyY2hpdmUgKil3ZWJBcmNoaXZlRmlsdGVyaW5nU3ViZnJhbWVzOihTaG91bGRJbmNsdWRl U3ViZnJhbWVJbldlYkFyY2hpdmVCbG9jaylzaG91bGRJbmNsdWRlU3ViZnJhbWVJbldlYkFyY2hp dmU7CitAZW5kCg==