87635 2012-05-28 01:30:15 -0700 Web Inspector: Add InspectorFileSystemAgent::FrontendProvider 2012-05-29 09:00:56 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 68203 87724 0 tzik tzik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 634986 0 tzik 2012-05-28 01:30:15 -0700 InspectorFileSystemAgent needs weak reference to its frontend to perform asynchronous operation. 634989 1 144302 tzik 2012-05-28 01:33:20 -0700 Created attachment 144302 Patch 635010 2 144307 tzik 2012-05-28 01:56:48 -0700 Created attachment 144307 Patch 635096 3 144307 yurys 2012-05-28 03:32:19 -0700 Comment on attachment 144307 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144307&action=review > Source/WebCore/inspector/InspectorFileSystemAgent.cpp:54 > + InspectorFrontend::FileSystem* getFrontend() const style nit: we don't use get prefixes in WebKit, simply frontend() > Source/WebCore/inspector/InspectorFileSystemAgent.cpp:102 > + m_frontendProvider->enable(); You could store a pointer to the agent itself, that way you wouldn't need to propagate enable/disable calls to the FrontendProvider, the getFrontend() method would look like if (m_agent && m_agent->m_enabled) return m_agent->mfrontend; return 0; 635123 4 144331 tzik 2012-05-28 04:25:44 -0700 Created attachment 144331 Patch 635126 5 144307 tzik 2012-05-28 04:28:10 -0700 Comment on attachment 144307 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144307&action=review >> Source/WebCore/inspector/InspectorFileSystemAgent.cpp:54 >> + InspectorFrontend::FileSystem* getFrontend() const > > style nit: we don't use get prefixes in WebKit, simply frontend() Done >> Source/WebCore/inspector/InspectorFileSystemAgent.cpp:102 >> + m_frontendProvider->enable(); > > You could store a pointer to the agent itself, that way you wouldn't need to propagate enable/disable calls to the FrontendProvider, the getFrontend() method would look like > > if (m_agent && m_agent->m_enabled) > return m_agent->mfrontend; > return 0; Done Looks cleaner. Thanks! 635142 6 144331 yurys 2012-05-28 05:13:59 -0700 Comment on attachment 144331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144331&action=review > Source/WebCore/inspector/InspectorFileSystemAgent.cpp:82 > + if (m_frontendProvider.get()) No need for .get(), if (m_frontendProvider) should work > Source/WebCore/inspector/InspectorFileSystemAgent.cpp:111 > + if (m_frontendProvider.get()) { if (m_frontendProvider.get()) { -> if (m_frontendProvider) { 635145 7 144337 tzik 2012-05-28 05:21:27 -0700 Created attachment 144337 Patch 635146 8 144331 tzik 2012-05-28 05:22:25 -0700 Comment on attachment 144331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144331&action=review >> Source/WebCore/inspector/InspectorFileSystemAgent.cpp:82 >> + if (m_frontendProvider.get()) > > No need for .get(), if (m_frontendProvider) should work Done >> Source/WebCore/inspector/InspectorFileSystemAgent.cpp:111 >> + if (m_frontendProvider.get()) { > > if (m_frontendProvider.get()) { -> if (m_frontendProvider) { Done 635562 9 144337 kinuko 2012-05-28 21:44:57 -0700 Comment on attachment 144337 Patch Drive-by comments. View in context: https://bugs.webkit.org/attachment.cgi?id=144337&action=review > Source/WebCore/inspector/InspectorFileSystemAgent.cpp:68 > + FrontendProvider(InspectorFileSystemAgent* agent, InspectorFrontend::FileSystem* frontend) : m_agent(agent), m_frontend(frontend) { } style-nit: each initializer should be on a separate line > Source/WebCore/inspector/InspectorFileSystemAgent.cpp:125 > : InspectorBaseAgent<InspectorFileSystemAgent>("FileSystem", instrumentingAgents, state), style-nit: constructor style looks different from the style guide? MyClass::MyClass(...) : m_member1(...) , m_member2(...) , ... 635599 10 144451 tzik 2012-05-28 23:12:55 -0700 Created attachment 144451 Patch 635601 11 144337 tzik 2012-05-28 23:15:29 -0700 Comment on attachment 144337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144337&action=review >> Source/WebCore/inspector/InspectorFileSystemAgent.cpp:68 >> + FrontendProvider(InspectorFileSystemAgent* agent, InspectorFrontend::FileSystem* frontend) : m_agent(agent), m_frontend(frontend) { } > > style-nit: each initializer should be on a separate line Done >> Source/WebCore/inspector/InspectorFileSystemAgent.cpp:125 >> : InspectorBaseAgent<InspectorFileSystemAgent>("FileSystem", instrumentingAgents, state), > > style-nit: constructor style looks different from the style guide? > > MyClass::MyClass(...) > : m_member1(...) > , m_member2(...) > , ... Done 636081 12 144451 webkit.review.bot 2012-05-29 09:00:51 -0700 Comment on attachment 144451 Patch Clearing flags on attachment: 144451 Committed r118783: <http://trac.webkit.org/changeset/118783> 636082 13 webkit.review.bot 2012-05-29 09:00:56 -0700 All reviewed patches have been landed. Closing bug. 144302 2012-05-28 01:33:20 -0700 2012-05-28 01:56:42 -0700 Patch bug-87635-20120528173319.patch text/plain 5848 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEyZTA1MzkxYjA4ZTVi OGM5YTVlYTJmMWQ5MjBjYzc5MDI5MmUzMy4uZTllMmJhZWIzMjdiZmNkOWQwYWU0ZDRlM2NjNjNk ZDdmYTcwZThmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA1LTI4ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgSW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50OjpGcm9udGVuZFByb3ZpZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzYzNQorCisgICAgICAgIEluc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudCBuZWVkcyB3ZWFrIHJlZmVyZW5jZSB0byBpdHMgZnJvbnRlbmQgdG8gcGVyZm9ybQor ICAgICAgICBhc3luY2hyb25vdXMgb3BlcmF0aW9uLgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBk ZXNjcmlwdGlvbiBhbmQgYnVnIFVSTCAoT09QUyEpCisKKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwOgorICAgICAgICAoSW5zcGVjdG9yRmlsZVN5c3Rl bUFnZW50OjpGcm9udGVuZFByb3ZpZGVyKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50Ojp+SW5zcGVjdG9yRmlsZVN5c3RlbUFn ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6ZW5hYmxl KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6ZGlzYWJsZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OnNldEZyb250ZW5k KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6Y2xlYXJGcm9u dGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OnJlc3Rv cmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpJbnNwZWN0 b3JGaWxlU3lzdGVtQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQuaDoKKyAgICAgICAgKEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCk6CisKIDIwMTIt MDUtMjcgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgogCiAgICAgICAgIFtCbGFj a0JlcnJ5XSBVcGRhdGUgY29sb3IgZm9yIHRhcCBoaWdobGlnaHQgYW5kIHNlbGVjdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2Vu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50 LmNwcAppbmRleCBkM2ZmZjViN2RjODNiYTBlY2VlM2ZiNjVlNmYxN2I1M2MxZmU2MjE5Li5iNzVm ODBhM2U2MDMyNjFkMzZkZDViODRmMDhlZGNiYzQwMGViNTAwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcApAQCAtNDQs NiArNDQsNDEgQEAgbmFtZXNwYWNlIEZpbGVTeXN0ZW1BZ2VudFN0YXRlIHsKIHN0YXRpYyBjb25z dCBjaGFyIGZpbGVTeXN0ZW1BZ2VudEVuYWJsZWRbXSA9ICJmaWxlU3lzdGVtQWdlbnRFbmFibGVk IjsKIH0KIAorY2xhc3MgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpGcm9udGVuZFByb3ZpZGVy IDogcHVibGljIFJlZkNvdW50ZWQ8RnJvbnRlbmRQcm92aWRlcj4geworICBwdWJsaWM6CisgICAg c3RhdGljIFBhc3NSZWZQdHI8RnJvbnRlbmRQcm92aWRlcj4gY3JlYXRlKEluc3BlY3RvckZyb250 ZW5kOjpGaWxlU3lzdGVtKiBmcm9udGVuZCwgYm9vbCBlbmFibGVkKQorICAgIHsKKyAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBGcm9udGVuZFByb3ZpZGVyKGZyb250ZW5kLCBlbmFibGVkKSk7 CisgICAgfQorCisgICAgSW5zcGVjdG9yRnJvbnRlbmQ6OkZpbGVTeXN0ZW0qIGdldEZyb250ZW5k KCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiBtX2VuYWJsZWQgPyBtX2Zyb250ZW5kIDog MDsKKyAgICB9CisKKyAgICB2b2lkIGVuYWJsZSgpCisgICAgeworICAgICAgICBtX2VuYWJsZWQg PSB0cnVlOworICAgIH0KKworICAgIHZvaWQgZGlzYWJsZSgpCisgICAgeworICAgICAgICBtX2Vu YWJsZWQgPSBmYWxzZTsKKyAgICB9CisKKyAgICB2b2lkIGNsZWFyKCkKKyAgICB7CisgICAgICAg IG1fZW5hYmxlZCA9IGZhbHNlOworICAgICAgICBtX2Zyb250ZW5kID0gMDsKKyAgICB9CisKKyAg cHJpdmF0ZToKKyAgICBGcm9udGVuZFByb3ZpZGVyKEluc3BlY3RvckZyb250ZW5kOjpGaWxlU3lz dGVtKiBmcm9udGVuZCwgYm9vbCBlbmFibGVkKSA6IG1fZnJvbnRlbmQoZnJvbnRlbmQpLCBtX2Vu YWJsZWQoZW5hYmxlZCkgeyB9CisKKyAgICBJbnNwZWN0b3JGcm9udGVuZDo6RmlsZVN5c3RlbSog bV9mcm9udGVuZDsKKyAgICBib29sIG1fZW5hYmxlZDsKK307CisKIC8vIHN0YXRpYwogUGFzc093 blB0cjxJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ+IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6 Y3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3Rv clN0YXRlKiBzdGF0ZSkKIHsKQEAgLTUyLDYgKzg3LDggQEAgUGFzc093blB0cjxJbnNwZWN0b3JG aWxlU3lzdGVtQWdlbnQ+IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6Y3JlYXRlKEluc3RydW1l bnQKIAogSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50Ojp+SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50 KCkKIHsKKyAgICBpZiAobV9mcm9udGVuZFByb3ZpZGVyLmdldCgpKQorICAgICAgICBtX2Zyb250 ZW5kUHJvdmlkZXItPmNsZWFyKCk7CiAgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQoMCk7CiB9CiAKQEAgLTYxLDYgKzk4LDggQEAgdm9pZCBJbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OmVuYWJsZShFcnJvclN0cmluZyopCiAgICAgICAgIHJldHVy bjsKICAgICBtX2VuYWJsZWQgPSB0cnVlOwogICAgIG1fc3RhdGUtPnNldEJvb2xlYW4oRmlsZVN5 c3RlbUFnZW50U3RhdGU6OmZpbGVTeXN0ZW1BZ2VudEVuYWJsZWQsIG1fZW5hYmxlZCk7CisgICAg aWYgKG1fZnJvbnRlbmRQcm92aWRlci5nZXQoKSkKKyAgICAgICAgbV9mcm9udGVuZFByb3ZpZGVy LT5lbmFibGUoKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OmRpc2FibGUo RXJyb3JTdHJpbmcqKQpAQCAtNjksMTcgKzEwOCwyMiBAQCB2b2lkIEluc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudDo6ZGlzYWJsZShFcnJvclN0cmluZyopCiAgICAgICAgIHJldHVybjsKICAgICBtX2Vu YWJsZWQgPSBmYWxzZTsKICAgICBtX3N0YXRlLT5zZXRCb29sZWFuKEZpbGVTeXN0ZW1BZ2VudFN0 YXRlOjpmaWxlU3lzdGVtQWdlbnRFbmFibGVkLCBtX2VuYWJsZWQpOworICAgIGlmIChtX2Zyb250 ZW5kUHJvdmlkZXIuZ2V0KCkpCisgICAgICAgIG1fZnJvbnRlbmRQcm92aWRlci0+ZGlzYWJsZSgp OwogfQogCiB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVj dG9yRnJvbnRlbmQqIGZyb250ZW5kKQogewogICAgIEFTU0VSVChmcm9udGVuZCk7Ci0gICAgbV9m cm9udGVuZCA9IGZyb250ZW5kLT5maWxlc3lzdGVtKCk7CisgICAgbV9mcm9udGVuZFByb3ZpZGVy ID0gRnJvbnRlbmRQcm92aWRlcjo6Y3JlYXRlKGZyb250ZW5kLT5maWxlc3lzdGVtKCksIG1fZW5h YmxlZCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjbGVhckZyb250ZW5k KCkKIHsKLSAgICBtX2Zyb250ZW5kID0gMDsKKyAgICBpZiAobV9mcm9udGVuZFByb3ZpZGVyLmdl dCgpKSB7CisgICAgICAgIG1fZnJvbnRlbmRQcm92aWRlci0+Y2xlYXIoKTsKKyAgICAgICAgbV9m cm9udGVuZFByb3ZpZGVyID0gMDsKKyAgICB9CiAgICAgbV9lbmFibGVkID0gZmFsc2U7CiAgICAg bV9zdGF0ZS0+c2V0Qm9vbGVhbihGaWxlU3lzdGVtQWdlbnRTdGF0ZTo6ZmlsZVN5c3RlbUFnZW50 RW5hYmxlZCwgbV9lbmFibGVkKTsKIH0KQEAgLTg3LDExICsxMzEsMTYgQEAgdm9pZCBJbnNwZWN0 b3JGaWxlU3lzdGVtQWdlbnQ6OmNsZWFyRnJvbnRlbmQoKQogdm9pZCBJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQ6OnJlc3RvcmUoKQogewogICAgIG1fZW5hYmxlZCA9IG1fc3RhdGUtPmdldEJvb2xl YW4oRmlsZVN5c3RlbUFnZW50U3RhdGU6OmZpbGVTeXN0ZW1BZ2VudEVuYWJsZWQpOworICAgIGlm IChtX2Zyb250ZW5kUHJvdmlkZXIuZ2V0KCkpIHsKKyAgICAgICAgaWYgKG1fZW5hYmxlZCkKKyAg ICAgICAgICAgIG1fZnJvbnRlbmRQcm92aWRlci0+ZW5hYmxlKCk7CisgICAgICAgIGVsc2UKKyAg ICAgICAgICAgIG1fZnJvbnRlbmRQcm92aWRlci0+ZGlzYWJsZSgpOworICAgIH0KIH0KIAogSW5z cGVjdG9yRmlsZVN5c3RlbUFnZW50OjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQoSW5zdHJ1bWVu dGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgSW5zcGVjdG9yU3RhdGUqIHN0YXRlKQog ICAgIDogSW5zcGVjdG9yQmFzZUFnZW50PEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudD4oIkZpbGVT eXN0ZW0iLCBpbnN0cnVtZW50aW5nQWdlbnRzLCBzdGF0ZSksCi0gICAgICBtX2Zyb250ZW5kKDAp LAogICAgICAgbV9lbmFibGVkKGZhbHNlKQogewogICAgIEFTU0VSVChpbnN0cnVtZW50aW5nQWdl bnRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQuaAppbmRleCAyOGE5NzlhYWQyMDE5ODRiMzVjZDVlMGUzYTMwZjZiZjVlZjg2MTlk Li5hNjM3ZmEwZTk3MmIxYWU3OGZkZDlhNDA5MmRmZTFhMWYxYmRiMTZlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oCkBAIC00 Nyw2ICs0Nyw4IEBAIGNsYXNzIEluc3RydW1lbnRpbmdBZ2VudHM7CiAKIGNsYXNzIEluc3BlY3Rv ckZpbGVTeXN0ZW1BZ2VudCA6IHB1YmxpYyBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50PiwgcHVibGljIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpGaWxlU3lz dGVtQ29tbWFuZEhhbmRsZXIgewogcHVibGljOgorICAgIGNsYXNzIEZyb250ZW5kUHJvdmlkZXI7 CisKICAgICBzdGF0aWMgUGFzc093blB0cjxJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ+IGNyZWF0 ZShJbnN0cnVtZW50aW5nQWdlbnRzKiwgSW5zcGVjdG9yU3RhdGUqKTsKICAgICB2aXJ0dWFsIH5J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQoKTsKIApAQCAtNTksNyArNjEsNyBAQCBwdWJsaWM6CiBw cml2YXRlOgogICAgIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudChJbnN0cnVtZW50aW5nQWdlbnRz KiwgSW5zcGVjdG9yU3RhdGUqKTsKIAotICAgIEluc3BlY3RvckZyb250ZW5kOjpGaWxlU3lzdGVt KiBtX2Zyb250ZW5kOworICAgIFJlZlB0cjxGcm9udGVuZFByb3ZpZGVyPiBtX2Zyb250ZW5kUHJv dmlkZXI7CiAgICAgYm9vbCBtX2VuYWJsZWQ7CiB9OwogCg== 144307 2012-05-28 01:56:48 -0700 2012-05-28 05:15:43 -0700 Patch bug-87635-20120528175646.patch text/plain 5829 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEyZTA1MzkxYjA4ZTVi OGM5YTVlYTJmMWQ5MjBjYzc5MDI5MmUzMy4uYjFjMTA5ODA3Mzk0NGFlNGMzMjA5NGMzZmVmY2Q1 MDdmNDcxZDViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTI4ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgSW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50OjpGcm9udGVuZFByb3ZpZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzYzNQorCisgICAgICAgIEluc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudCBuZWVkcyB3ZWFrIHJlZmVyZW5jZSB0byBpdHMgZnJvbnRlbmQgdG8gcGVyZm9ybQor ICAgICAgICBhc3luY2hyb25vdXMgb3BlcmF0aW9uLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1B Z2VudC5jcHA6CisgICAgICAgIChJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5kUHJv dmlkZXIpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JG aWxlU3lzdGVtQWdlbnQ6On5JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjplbmFibGUpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkaXNhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjbGVhckZyb250ZW5kKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVzdG9yZSk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oOgorICAgICAg ICAoSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KToKKwogMjAxMi0wNS0yNyAgQXJ2aWQgTmlsc3Nv biAgPGFuaWxzc29uQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFVwZGF0ZSBjb2xv ciBmb3IgdGFwIGhpZ2hsaWdodCBhbmQgc2VsZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCmluZGV4IGQzZmZmNWI3 ZGM4M2JhMGVjZWUzZmI2NWU2ZjE3YjUzYzFmZTYyMTkuLmI3NWY4MGEzZTYwMzI2MWQzNmRkNWI4 NGYwOGVkY2JjNDAwZWI1MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCkBAIC00NCw2ICs0NCw0MSBAQCBuYW1lc3Bh Y2UgRmlsZVN5c3RlbUFnZW50U3RhdGUgewogc3RhdGljIGNvbnN0IGNoYXIgZmlsZVN5c3RlbUFn ZW50RW5hYmxlZFtdID0gImZpbGVTeXN0ZW1BZ2VudEVuYWJsZWQiOwogfQogCitjbGFzcyBJbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5kUHJvdmlkZXIgOiBwdWJsaWMgUmVmQ291bnRl ZDxGcm9udGVuZFByb3ZpZGVyPiB7CisgIHB1YmxpYzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxG cm9udGVuZFByb3ZpZGVyPiBjcmVhdGUoSW5zcGVjdG9yRnJvbnRlbmQ6OkZpbGVTeXN0ZW0qIGZy b250ZW5kLCBib29sIGVuYWJsZWQpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IEZyb250ZW5kUHJvdmlkZXIoZnJvbnRlbmQsIGVuYWJsZWQpKTsKKyAgICB9CisKKyAgICBJbnNw ZWN0b3JGcm9udGVuZDo6RmlsZVN5c3RlbSogZ2V0RnJvbnRlbmQoKSBjb25zdAorICAgIHsKKyAg ICAgICAgcmV0dXJuIG1fZW5hYmxlZCA/IG1fZnJvbnRlbmQgOiAwOworICAgIH0KKworICAgIHZv aWQgZW5hYmxlKCkKKyAgICB7CisgICAgICAgIG1fZW5hYmxlZCA9IHRydWU7CisgICAgfQorCisg ICAgdm9pZCBkaXNhYmxlKCkKKyAgICB7CisgICAgICAgIG1fZW5hYmxlZCA9IGZhbHNlOworICAg IH0KKworICAgIHZvaWQgY2xlYXIoKQorICAgIHsKKyAgICAgICAgbV9lbmFibGVkID0gZmFsc2U7 CisgICAgICAgIG1fZnJvbnRlbmQgPSAwOworICAgIH0KKworICBwcml2YXRlOgorICAgIEZyb250 ZW5kUHJvdmlkZXIoSW5zcGVjdG9yRnJvbnRlbmQ6OkZpbGVTeXN0ZW0qIGZyb250ZW5kLCBib29s IGVuYWJsZWQpIDogbV9mcm9udGVuZChmcm9udGVuZCksIG1fZW5hYmxlZChlbmFibGVkKSB7IH0K KworICAgIEluc3BlY3RvckZyb250ZW5kOjpGaWxlU3lzdGVtKiBtX2Zyb250ZW5kOworICAgIGJv b2wgbV9lbmFibGVkOworfTsKKwogLy8gc3RhdGljCiBQYXNzT3duUHRyPEluc3BlY3RvckZpbGVT eXN0ZW1BZ2VudD4gSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjcmVhdGUoSW5zdHJ1bWVudGlu Z0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgSW5zcGVjdG9yU3RhdGUqIHN0YXRlKQogewpA QCAtNTIsNiArODcsOCBAQCBQYXNzT3duUHRyPEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudD4gSW5z cGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjcmVhdGUoSW5zdHJ1bWVudAogCiBJbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQ6On5JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQoKQogeworICAgIGlmIChtX2Zy b250ZW5kUHJvdmlkZXIuZ2V0KCkpCisgICAgICAgIG1fZnJvbnRlbmRQcm92aWRlci0+Y2xlYXIo KTsKICAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvckZpbGVTeXN0ZW1BZ2Vu dCgwKTsKIH0KIApAQCAtNjEsNiArOTgsOCBAQCB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2Vu dDo6ZW5hYmxlKEVycm9yU3RyaW5nKikKICAgICAgICAgcmV0dXJuOwogICAgIG1fZW5hYmxlZCA9 IHRydWU7CiAgICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihGaWxlU3lzdGVtQWdlbnRTdGF0ZTo6Zmls ZVN5c3RlbUFnZW50RW5hYmxlZCwgbV9lbmFibGVkKTsKKyAgICBpZiAobV9mcm9udGVuZFByb3Zp ZGVyLmdldCgpKQorICAgICAgICBtX2Zyb250ZW5kUHJvdmlkZXItPmVuYWJsZSgpOwogfQogCiB2 b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6ZGlzYWJsZShFcnJvclN0cmluZyopCkBAIC02 OSwxNyArMTA4LDIyIEBAIHZvaWQgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkaXNhYmxlKEVy cm9yU3RyaW5nKikKICAgICAgICAgcmV0dXJuOwogICAgIG1fZW5hYmxlZCA9IGZhbHNlOwogICAg IG1fc3RhdGUtPnNldEJvb2xlYW4oRmlsZVN5c3RlbUFnZW50U3RhdGU6OmZpbGVTeXN0ZW1BZ2Vu dEVuYWJsZWQsIG1fZW5hYmxlZCk7CisgICAgaWYgKG1fZnJvbnRlbmRQcm92aWRlci5nZXQoKSkK KyAgICAgICAgbV9mcm9udGVuZFByb3ZpZGVyLT5kaXNhYmxlKCk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yRmlsZVN5c3RlbUFnZW50OjpzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRl bmQpCiB7CiAgICAgQVNTRVJUKGZyb250ZW5kKTsKLSAgICBtX2Zyb250ZW5kID0gZnJvbnRlbmQt PmZpbGVzeXN0ZW0oKTsKKyAgICBtX2Zyb250ZW5kUHJvdmlkZXIgPSBGcm9udGVuZFByb3ZpZGVy OjpjcmVhdGUoZnJvbnRlbmQtPmZpbGVzeXN0ZW0oKSwgbV9lbmFibGVkKTsKIH0KIAogdm9pZCBJ bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OmNsZWFyRnJvbnRlbmQoKQogewotICAgIG1fZnJvbnRl bmQgPSAwOworICAgIGlmIChtX2Zyb250ZW5kUHJvdmlkZXIuZ2V0KCkpIHsKKyAgICAgICAgbV9m cm9udGVuZFByb3ZpZGVyLT5jbGVhcigpOworICAgICAgICBtX2Zyb250ZW5kUHJvdmlkZXIgPSAw OworICAgIH0KICAgICBtX2VuYWJsZWQgPSBmYWxzZTsKICAgICBtX3N0YXRlLT5zZXRCb29sZWFu KEZpbGVTeXN0ZW1BZ2VudFN0YXRlOjpmaWxlU3lzdGVtQWdlbnRFbmFibGVkLCBtX2VuYWJsZWQp OwogfQpAQCAtODcsMTEgKzEzMSwxNiBAQCB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6 Y2xlYXJGcm9udGVuZCgpCiB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVzdG9yZSgp CiB7CiAgICAgbV9lbmFibGVkID0gbV9zdGF0ZS0+Z2V0Qm9vbGVhbihGaWxlU3lzdGVtQWdlbnRT dGF0ZTo6ZmlsZVN5c3RlbUFnZW50RW5hYmxlZCk7CisgICAgaWYgKG1fZnJvbnRlbmRQcm92aWRl ci5nZXQoKSkgeworICAgICAgICBpZiAobV9lbmFibGVkKQorICAgICAgICAgICAgbV9mcm9udGVu ZFByb3ZpZGVyLT5lbmFibGUoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV9mcm9udGVu ZFByb3ZpZGVyLT5kaXNhYmxlKCk7CisgICAgfQogfQogCiBJbnNwZWN0b3JGaWxlU3lzdGVtQWdl bnQ6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVt ZW50aW5nQWdlbnRzLCBJbnNwZWN0b3JTdGF0ZSogc3RhdGUpCiAgICAgOiBJbnNwZWN0b3JCYXNl QWdlbnQ8SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50PigiRmlsZVN5c3RlbSIsIGluc3RydW1lbnRp bmdBZ2VudHMsIHN0YXRlKSwKLSAgICAgIG1fZnJvbnRlbmQoMCksCiAgICAgICBtX2VuYWJsZWQo ZmFsc2UpCiB7CiAgICAgQVNTRVJUKGluc3RydW1lbnRpbmdBZ2VudHMpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oCmluZGV4IDI4 YTk3OWFhZDIwMTk4NGIzNWNkNWUwZTNhMzBmNmJmNWVmODYxOWQuLmE2MzdmYTBlOTcyYjFhZTc4 ZmRkOWE0MDkyZGZlMWExZjFiZGIxNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmgKQEAgLTQ3LDYgKzQ3LDggQEAgY2xhc3Mg SW5zdHJ1bWVudGluZ0FnZW50czsKIAogY2xhc3MgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50IDog cHVibGljIEluc3BlY3RvckJhc2VBZ2VudDxJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ+LCBwdWJs aWMgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OkZpbGVTeXN0ZW1Db21tYW5kSGFuZGxlciB7 CiBwdWJsaWM6CisgICAgY2xhc3MgRnJvbnRlbmRQcm92aWRlcjsKKwogICAgIHN0YXRpYyBQYXNz T3duUHRyPEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudD4gY3JlYXRlKEluc3RydW1lbnRpbmdBZ2Vu dHMqLCBJbnNwZWN0b3JTdGF0ZSopOwogICAgIHZpcnR1YWwgfkluc3BlY3RvckZpbGVTeXN0ZW1B Z2VudCgpOwogCkBAIC01OSw3ICs2MSw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSW5zcGVj dG9yRmlsZVN5c3RlbUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JTdGF0ZSop OwogCi0gICAgSW5zcGVjdG9yRnJvbnRlbmQ6OkZpbGVTeXN0ZW0qIG1fZnJvbnRlbmQ7CisgICAg UmVmUHRyPEZyb250ZW5kUHJvdmlkZXI+IG1fZnJvbnRlbmRQcm92aWRlcjsKICAgICBib29sIG1f ZW5hYmxlZDsKIH07CiAK 144331 2012-05-28 04:25:44 -0700 2012-05-28 06:53:53 -0700 Patch bug-87635-20120528202542.patch text/plain 4952 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEyZTA1MzkxYjA4ZTVi OGM5YTVlYTJmMWQ5MjBjYzc5MDI5MmUzMy4uYjFjMTA5ODA3Mzk0NGFlNGMzMjA5NGMzZmVmY2Q1 MDdmNDcxZDViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTI4ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgSW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50OjpGcm9udGVuZFByb3ZpZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzYzNQorCisgICAgICAgIEluc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudCBuZWVkcyB3ZWFrIHJlZmVyZW5jZSB0byBpdHMgZnJvbnRlbmQgdG8gcGVyZm9ybQor ICAgICAgICBhc3luY2hyb25vdXMgb3BlcmF0aW9uLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1B Z2VudC5jcHA6CisgICAgICAgIChJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5kUHJv dmlkZXIpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JG aWxlU3lzdGVtQWdlbnQ6On5JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjplbmFibGUpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkaXNhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjbGVhckZyb250ZW5kKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVzdG9yZSk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oOgorICAgICAg ICAoSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KToKKwogMjAxMi0wNS0yNyAgQXJ2aWQgTmlsc3Nv biAgPGFuaWxzc29uQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFVwZGF0ZSBjb2xv ciBmb3IgdGFwIGhpZ2hsaWdodCBhbmQgc2VsZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCmluZGV4IGQzZmZmNWI3 ZGM4M2JhMGVjZWUzZmI2NWU2ZjE3YjUzYzFmZTYyMTkuLjBlMzY0NTU5MTVkZTQ1M2M5MDU0ODNh ZjAzNTg3MGYyZTNhNzFhN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCkBAIC00NCw2ICs0NCwzMyBAQCBuYW1lc3Bh Y2UgRmlsZVN5c3RlbUFnZW50U3RhdGUgewogc3RhdGljIGNvbnN0IGNoYXIgZmlsZVN5c3RlbUFn ZW50RW5hYmxlZFtdID0gImZpbGVTeXN0ZW1BZ2VudEVuYWJsZWQiOwogfQogCitjbGFzcyBJbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5kUHJvdmlkZXIgOiBwdWJsaWMgUmVmQ291bnRl ZDxGcm9udGVuZFByb3ZpZGVyPiB7CisgIHB1YmxpYzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxG cm9udGVuZFByb3ZpZGVyPiBjcmVhdGUoSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KiBhZ2VudCwg SW5zcGVjdG9yRnJvbnRlbmQ6OkZpbGVTeXN0ZW0qIGZyb250ZW5kKQorICAgIHsKKyAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBGcm9udGVuZFByb3ZpZGVyKGFnZW50LCBmcm9udGVuZCkpOwor ICAgIH0KKworICAgIEluc3BlY3RvckZyb250ZW5kOjpGaWxlU3lzdGVtKiBmcm9udGVuZCgpIGNv bnN0CisgICAgeworICAgICAgICBpZiAobV9hZ2VudCAmJiBtX2FnZW50LT5tX2VuYWJsZWQpCisg ICAgICAgICAgICByZXR1cm4gbV9mcm9udGVuZDsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQor CisgICAgdm9pZCBjbGVhcigpCisgICAgeworICAgICAgICBtX2FnZW50ID0gMDsKKyAgICAgICAg bV9mcm9udGVuZCA9IDA7CisgICAgfQorCisgIHByaXZhdGU6CisgICAgRnJvbnRlbmRQcm92aWRl cihJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQqIGFnZW50LCBJbnNwZWN0b3JGcm9udGVuZDo6Rmls ZVN5c3RlbSogZnJvbnRlbmQpIDogbV9hZ2VudChhZ2VudCksIG1fZnJvbnRlbmQoZnJvbnRlbmQp IHsgfQorCisgICAgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KiBtX2FnZW50OworICAgIEluc3Bl Y3RvckZyb250ZW5kOjpGaWxlU3lzdGVtKiBtX2Zyb250ZW5kOworfTsKKwogLy8gc3RhdGljCiBQ YXNzT3duUHRyPEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudD4gSW5zcGVjdG9yRmlsZVN5c3RlbUFn ZW50OjpjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgSW5z cGVjdG9yU3RhdGUqIHN0YXRlKQogewpAQCAtNTIsNiArNzksOCBAQCBQYXNzT3duUHRyPEluc3Bl Y3RvckZpbGVTeXN0ZW1BZ2VudD4gSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjcmVhdGUoSW5z dHJ1bWVudAogCiBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6On5JbnNwZWN0b3JGaWxlU3lzdGVt QWdlbnQoKQogeworICAgIGlmIChtX2Zyb250ZW5kUHJvdmlkZXIuZ2V0KCkpCisgICAgICAgIG1f ZnJvbnRlbmRQcm92aWRlci0+Y2xlYXIoKTsKICAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNl dEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCgwKTsKIH0KIApAQCAtNzQsMTIgKzEwMywxNSBAQCB2 b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6ZGlzYWJsZShFcnJvclN0cmluZyopCiB2b2lk IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQq IGZyb250ZW5kKQogewogICAgIEFTU0VSVChmcm9udGVuZCk7Ci0gICAgbV9mcm9udGVuZCA9IGZy b250ZW5kLT5maWxlc3lzdGVtKCk7CisgICAgbV9mcm9udGVuZFByb3ZpZGVyID0gRnJvbnRlbmRQ cm92aWRlcjo6Y3JlYXRlKHRoaXMsIGZyb250ZW5kLT5maWxlc3lzdGVtKCkpOwogfQogCiB2b2lk IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6Y2xlYXJGcm9udGVuZCgpCiB7Ci0gICAgbV9mcm9u dGVuZCA9IDA7CisgICAgaWYgKG1fZnJvbnRlbmRQcm92aWRlci5nZXQoKSkgeworICAgICAgICBt X2Zyb250ZW5kUHJvdmlkZXItPmNsZWFyKCk7CisgICAgICAgIG1fZnJvbnRlbmRQcm92aWRlciA9 IDA7CisgICAgfQogICAgIG1fZW5hYmxlZCA9IGZhbHNlOwogICAgIG1fc3RhdGUtPnNldEJvb2xl YW4oRmlsZVN5c3RlbUFnZW50U3RhdGU6OmZpbGVTeXN0ZW1BZ2VudEVuYWJsZWQsIG1fZW5hYmxl ZCk7CiB9CkBAIC05MSw3ICsxMjMsNiBAQCB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6 cmVzdG9yZSgpCiAKIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6SW5zcGVjdG9yRmlsZVN5c3Rl bUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3Rv clN0YXRlKiBzdGF0ZSkKICAgICA6IEluc3BlY3RvckJhc2VBZ2VudDxJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQ+KCJGaWxlU3lzdGVtIiwgaW5zdHJ1bWVudGluZ0FnZW50cywgc3RhdGUpLAotICAg ICAgbV9mcm9udGVuZCgwKSwKICAgICAgIG1fZW5hYmxlZChmYWxzZSkKIHsKICAgICBBU1NFUlQo aW5zdHJ1bWVudGluZ0FnZW50cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmgKaW5kZXggMjhhOTc5YWFkMjAxOTg0YjM1Y2Q1ZTBl M2EzMGY2YmY1ZWY4NjE5ZC4uYTYzN2ZhMGU5NzJiMWFlNzhmZGQ5YTQwOTJkZmUxYTFmMWJkYjE2 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQuaApAQCAtNDcsNiArNDcsOCBAQCBjbGFzcyBJbnN0cnVtZW50aW5nQWdlbnRzOwog CiBjbGFzcyBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQgOiBwdWJsaWMgSW5zcGVjdG9yQmFzZUFn ZW50PEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudD4sIHB1YmxpYyBJbnNwZWN0b3JCYWNrZW5kRGlz cGF0Y2hlcjo6RmlsZVN5c3RlbUNvbW1hbmRIYW5kbGVyIHsKIHB1YmxpYzoKKyAgICBjbGFzcyBG cm9udGVuZFByb3ZpZGVyOworCiAgICAgc3RhdGljIFBhc3NPd25QdHI8SW5zcGVjdG9yRmlsZVN5 c3RlbUFnZW50PiBjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvclN0YXRlKik7 CiAgICAgdmlydHVhbCB+SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KCk7CiAKQEAgLTU5LDcgKzYx LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQoSW5z dHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvclN0YXRlKik7CiAKLSAgICBJbnNwZWN0b3JGcm9u dGVuZDo6RmlsZVN5c3RlbSogbV9mcm9udGVuZDsKKyAgICBSZWZQdHI8RnJvbnRlbmRQcm92aWRl cj4gbV9mcm9udGVuZFByb3ZpZGVyOwogICAgIGJvb2wgbV9lbmFibGVkOwogfTsKIAo= 144337 2012-05-28 05:21:27 -0700 2012-05-28 23:15:29 -0700 Patch bug-87635-20120528212126.patch text/plain 4940 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEyZTA1MzkxYjA4ZTVi OGM5YTVlYTJmMWQ5MjBjYzc5MDI5MmUzMy4uYjFjMTA5ODA3Mzk0NGFlNGMzMjA5NGMzZmVmY2Q1 MDdmNDcxZDViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTI4ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgSW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50OjpGcm9udGVuZFByb3ZpZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzYzNQorCisgICAgICAgIEluc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudCBuZWVkcyB3ZWFrIHJlZmVyZW5jZSB0byBpdHMgZnJvbnRlbmQgdG8gcGVyZm9ybQor ICAgICAgICBhc3luY2hyb25vdXMgb3BlcmF0aW9uLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1B Z2VudC5jcHA6CisgICAgICAgIChJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5kUHJv dmlkZXIpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JG aWxlU3lzdGVtQWdlbnQ6On5JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjplbmFibGUpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkaXNhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjbGVhckZyb250ZW5kKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVzdG9yZSk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oOgorICAgICAg ICAoSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KToKKwogMjAxMi0wNS0yNyAgQXJ2aWQgTmlsc3Nv biAgPGFuaWxzc29uQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFVwZGF0ZSBjb2xv ciBmb3IgdGFwIGhpZ2hsaWdodCBhbmQgc2VsZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCmluZGV4IGQzZmZmNWI3 ZGM4M2JhMGVjZWUzZmI2NWU2ZjE3YjUzYzFmZTYyMTkuLjYwOTBkNTIyMDVkYjBmNzJhOGQ4YmIx MzQ3NWFhMTY5Y2RiNmNlZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCkBAIC00NCw2ICs0NCwzMyBAQCBuYW1lc3Bh Y2UgRmlsZVN5c3RlbUFnZW50U3RhdGUgewogc3RhdGljIGNvbnN0IGNoYXIgZmlsZVN5c3RlbUFn ZW50RW5hYmxlZFtdID0gImZpbGVTeXN0ZW1BZ2VudEVuYWJsZWQiOwogfQogCitjbGFzcyBJbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5kUHJvdmlkZXIgOiBwdWJsaWMgUmVmQ291bnRl ZDxGcm9udGVuZFByb3ZpZGVyPiB7CisgIHB1YmxpYzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxG cm9udGVuZFByb3ZpZGVyPiBjcmVhdGUoSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KiBhZ2VudCwg SW5zcGVjdG9yRnJvbnRlbmQ6OkZpbGVTeXN0ZW0qIGZyb250ZW5kKQorICAgIHsKKyAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBGcm9udGVuZFByb3ZpZGVyKGFnZW50LCBmcm9udGVuZCkpOwor ICAgIH0KKworICAgIEluc3BlY3RvckZyb250ZW5kOjpGaWxlU3lzdGVtKiBmcm9udGVuZCgpIGNv bnN0CisgICAgeworICAgICAgICBpZiAobV9hZ2VudCAmJiBtX2FnZW50LT5tX2VuYWJsZWQpCisg ICAgICAgICAgICByZXR1cm4gbV9mcm9udGVuZDsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQor CisgICAgdm9pZCBjbGVhcigpCisgICAgeworICAgICAgICBtX2FnZW50ID0gMDsKKyAgICAgICAg bV9mcm9udGVuZCA9IDA7CisgICAgfQorCisgIHByaXZhdGU6CisgICAgRnJvbnRlbmRQcm92aWRl cihJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQqIGFnZW50LCBJbnNwZWN0b3JGcm9udGVuZDo6Rmls ZVN5c3RlbSogZnJvbnRlbmQpIDogbV9hZ2VudChhZ2VudCksIG1fZnJvbnRlbmQoZnJvbnRlbmQp IHsgfQorCisgICAgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KiBtX2FnZW50OworICAgIEluc3Bl Y3RvckZyb250ZW5kOjpGaWxlU3lzdGVtKiBtX2Zyb250ZW5kOworfTsKKwogLy8gc3RhdGljCiBQ YXNzT3duUHRyPEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudD4gSW5zcGVjdG9yRmlsZVN5c3RlbUFn ZW50OjpjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgSW5z cGVjdG9yU3RhdGUqIHN0YXRlKQogewpAQCAtNTIsNiArNzksOCBAQCBQYXNzT3duUHRyPEluc3Bl Y3RvckZpbGVTeXN0ZW1BZ2VudD4gSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjcmVhdGUoSW5z dHJ1bWVudAogCiBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6On5JbnNwZWN0b3JGaWxlU3lzdGVt QWdlbnQoKQogeworICAgIGlmIChtX2Zyb250ZW5kUHJvdmlkZXIpCisgICAgICAgIG1fZnJvbnRl bmRQcm92aWRlci0+Y2xlYXIoKTsKICAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3Bl Y3RvckZpbGVTeXN0ZW1BZ2VudCgwKTsKIH0KIApAQCAtNzQsMTIgKzEwMywxNSBAQCB2b2lkIElu c3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6ZGlzYWJsZShFcnJvclN0cmluZyopCiB2b2lkIEluc3Bl Y3RvckZpbGVTeXN0ZW1BZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250 ZW5kKQogewogICAgIEFTU0VSVChmcm9udGVuZCk7Ci0gICAgbV9mcm9udGVuZCA9IGZyb250ZW5k LT5maWxlc3lzdGVtKCk7CisgICAgbV9mcm9udGVuZFByb3ZpZGVyID0gRnJvbnRlbmRQcm92aWRl cjo6Y3JlYXRlKHRoaXMsIGZyb250ZW5kLT5maWxlc3lzdGVtKCkpOwogfQogCiB2b2lkIEluc3Bl Y3RvckZpbGVTeXN0ZW1BZ2VudDo6Y2xlYXJGcm9udGVuZCgpCiB7Ci0gICAgbV9mcm9udGVuZCA9 IDA7CisgICAgaWYgKG1fZnJvbnRlbmRQcm92aWRlcikgeworICAgICAgICBtX2Zyb250ZW5kUHJv dmlkZXItPmNsZWFyKCk7CisgICAgICAgIG1fZnJvbnRlbmRQcm92aWRlciA9IDA7CisgICAgfQog ICAgIG1fZW5hYmxlZCA9IGZhbHNlOwogICAgIG1fc3RhdGUtPnNldEJvb2xlYW4oRmlsZVN5c3Rl bUFnZW50U3RhdGU6OmZpbGVTeXN0ZW1BZ2VudEVuYWJsZWQsIG1fZW5hYmxlZCk7CiB9CkBAIC05 MSw3ICsxMjMsNiBAQCB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVzdG9yZSgpCiAK IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KEluc3Ry dW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3RvclN0YXRlKiBzdGF0 ZSkKICAgICA6IEluc3BlY3RvckJhc2VBZ2VudDxJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ+KCJG aWxlU3lzdGVtIiwgaW5zdHJ1bWVudGluZ0FnZW50cywgc3RhdGUpLAotICAgICAgbV9mcm9udGVu ZCgwKSwKICAgICAgIG1fZW5hYmxlZChmYWxzZSkKIHsKICAgICBBU1NFUlQoaW5zdHJ1bWVudGlu Z0FnZW50cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RmlsZVN5c3RlbUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50LmgKaW5kZXggMjhhOTc5YWFkMjAxOTg0YjM1Y2Q1ZTBlM2EzMGY2YmY1ZWY4 NjE5ZC4uYTYzN2ZhMGU5NzJiMWFlNzhmZGQ5YTQwOTJkZmUxYTFmMWJkYjE2ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuaApA QCAtNDcsNiArNDcsOCBAQCBjbGFzcyBJbnN0cnVtZW50aW5nQWdlbnRzOwogCiBjbGFzcyBJbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQgOiBwdWJsaWMgSW5zcGVjdG9yQmFzZUFnZW50PEluc3BlY3Rv ckZpbGVTeXN0ZW1BZ2VudD4sIHB1YmxpYyBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Rmls ZVN5c3RlbUNvbW1hbmRIYW5kbGVyIHsKIHB1YmxpYzoKKyAgICBjbGFzcyBGcm9udGVuZFByb3Zp ZGVyOworCiAgICAgc3RhdGljIFBhc3NPd25QdHI8SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50PiBj cmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvclN0YXRlKik7CiAgICAgdmlydHVh bCB+SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KCk7CiAKQEAgLTU5LDcgKzYxLDcgQEAgcHVibGlj OgogcHJpdmF0ZToKICAgICBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQoSW5zdHJ1bWVudGluZ0Fn ZW50cyosIEluc3BlY3RvclN0YXRlKik7CiAKLSAgICBJbnNwZWN0b3JGcm9udGVuZDo6RmlsZVN5 c3RlbSogbV9mcm9udGVuZDsKKyAgICBSZWZQdHI8RnJvbnRlbmRQcm92aWRlcj4gbV9mcm9udGVu ZFByb3ZpZGVyOwogICAgIGJvb2wgbV9lbmFibGVkOwogfTsKIAo= 144451 2012-05-28 23:12:55 -0700 2012-05-29 09:00:51 -0700 Patch bug-87635-20120529151254.patch text/plain 5127 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWNjYjg3MDMwODExZjA4 NzE4YTU3MTcwZjdiMGJlNDAxYTY3N2U5Yy4uNDFhNjgxY2FlZjcxZTM5MGM0OGZjNjdjMWY1MzQy MDY4ZTAxMWIxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTI4ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgSW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50OjpGcm9udGVuZFByb3ZpZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzYzNQorCisgICAgICAgIEluc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudCBuZWVkcyB3ZWFrIHJlZmVyZW5jZSB0byBpdHMgZnJvbnRlbmQgdG8gcGVyZm9ybQor ICAgICAgICBhc3luY2hyb25vdXMgb3BlcmF0aW9uLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1B Z2VudC5jcHA6CisgICAgICAgIChJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5kUHJv dmlkZXIpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JG aWxlU3lzdGVtQWdlbnQ6On5JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjplbmFibGUpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkaXNhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpjbGVhckZyb250ZW5kKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVzdG9yZSk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oOgorICAgICAg ICAoSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KToKKwogMjAxMi0wNS0yOCAgRGF2aWQgQmFydG9u ICA8ZGJhcnRvbkBtYXRoc2NyaWJlLmNvbT4KIAogICAgICAgICBtYXRobWwvcHJlc2VudGF0aW9u L21vLXN0cmV0Y2guaHRtbCBhbmQgbXJvb3QtcHJlZi13aWR0aC5odG1sIHRlc3RzIGZhaWwgb24g TWFjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5 c3RlbUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQuY3BwCmluZGV4IGQzZmZmNWI3ZGM4M2JhMGVjZWUzZmI2NWU2ZjE3YjUzYzFmZTYy MTkuLjNhZmIyNmJmMTk0MTkxODJjZjhhYzlmZTNiZDE5MTc2YzFkZDI5M2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3Bw CkBAIC00NCw2ICs0NCwzNSBAQCBuYW1lc3BhY2UgRmlsZVN5c3RlbUFnZW50U3RhdGUgewogc3Rh dGljIGNvbnN0IGNoYXIgZmlsZVN5c3RlbUFnZW50RW5hYmxlZFtdID0gImZpbGVTeXN0ZW1BZ2Vu dEVuYWJsZWQiOwogfQogCitjbGFzcyBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5k UHJvdmlkZXIgOiBwdWJsaWMgUmVmQ291bnRlZDxGcm9udGVuZFByb3ZpZGVyPiB7CisgIHB1Ymxp YzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxGcm9udGVuZFByb3ZpZGVyPiBjcmVhdGUoSW5zcGVj dG9yRmlsZVN5c3RlbUFnZW50KiBhZ2VudCwgSW5zcGVjdG9yRnJvbnRlbmQ6OkZpbGVTeXN0ZW0q IGZyb250ZW5kKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBGcm9udGVuZFBy b3ZpZGVyKGFnZW50LCBmcm9udGVuZCkpOworICAgIH0KKworICAgIEluc3BlY3RvckZyb250ZW5k OjpGaWxlU3lzdGVtKiBmcm9udGVuZCgpIGNvbnN0CisgICAgeworICAgICAgICBpZiAobV9hZ2Vu dCAmJiBtX2FnZW50LT5tX2VuYWJsZWQpCisgICAgICAgICAgICByZXR1cm4gbV9mcm9udGVuZDsK KyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCisgICAgdm9pZCBjbGVhcigpCisgICAgeworICAg ICAgICBtX2FnZW50ID0gMDsKKyAgICAgICAgbV9mcm9udGVuZCA9IDA7CisgICAgfQorCisgIHBy aXZhdGU6CisgICAgRnJvbnRlbmRQcm92aWRlcihJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQqIGFn ZW50LCBJbnNwZWN0b3JGcm9udGVuZDo6RmlsZVN5c3RlbSogZnJvbnRlbmQpCisgICAgICAgIDog bV9hZ2VudChhZ2VudCkKKyAgICAgICAgLCBtX2Zyb250ZW5kKGZyb250ZW5kKSB7IH0KKworICAg IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCogbV9hZ2VudDsKKyAgICBJbnNwZWN0b3JGcm9udGVu ZDo6RmlsZVN5c3RlbSogbV9mcm9udGVuZDsKK307CisKIC8vIHN0YXRpYwogUGFzc093blB0cjxJ bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ+IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6Y3JlYXRl KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3RvclN0YXRl KiBzdGF0ZSkKIHsKQEAgLTUyLDYgKzgxLDggQEAgUGFzc093blB0cjxJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQ+IEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6Y3JlYXRlKEluc3RydW1lbnQKIAog SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50Ojp+SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KCkKIHsK KyAgICBpZiAobV9mcm9udGVuZFByb3ZpZGVyKQorICAgICAgICBtX2Zyb250ZW5kUHJvdmlkZXIt PmNsZWFyKCk7CiAgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQoMCk7CiB9CiAKQEAgLTc0LDEyICsxMDUsMTUgQEAgdm9pZCBJbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQ6OmRpc2FibGUoRXJyb3JTdHJpbmcqKQogdm9pZCBJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQ6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKIHsKICAg ICBBU1NFUlQoZnJvbnRlbmQpOwotICAgIG1fZnJvbnRlbmQgPSBmcm9udGVuZC0+ZmlsZXN5c3Rl bSgpOworICAgIG1fZnJvbnRlbmRQcm92aWRlciA9IEZyb250ZW5kUHJvdmlkZXI6OmNyZWF0ZSh0 aGlzLCBmcm9udGVuZC0+ZmlsZXN5c3RlbSgpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQ6OmNsZWFyRnJvbnRlbmQoKQogewotICAgIG1fZnJvbnRlbmQgPSAwOworICAgIGlm IChtX2Zyb250ZW5kUHJvdmlkZXIpIHsKKyAgICAgICAgbV9mcm9udGVuZFByb3ZpZGVyLT5jbGVh cigpOworICAgICAgICBtX2Zyb250ZW5kUHJvdmlkZXIgPSAwOworICAgIH0KICAgICBtX2VuYWJs ZWQgPSBmYWxzZTsKICAgICBtX3N0YXRlLT5zZXRCb29sZWFuKEZpbGVTeXN0ZW1BZ2VudFN0YXRl OjpmaWxlU3lzdGVtQWdlbnRFbmFibGVkLCBtX2VuYWJsZWQpOwogfQpAQCAtOTAsOSArMTI0LDgg QEAgdm9pZCBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OnJlc3RvcmUoKQogfQogCiBJbnNwZWN0 b3JGaWxlU3lzdGVtQWdlbnQ6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudChJbnN0cnVtZW50aW5n QWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBJbnNwZWN0b3JTdGF0ZSogc3RhdGUpCi0gICAg OiBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50PigiRmlsZVN5c3Rl bSIsIGluc3RydW1lbnRpbmdBZ2VudHMsIHN0YXRlKSwKLSAgICAgIG1fZnJvbnRlbmQoMCksCi0g ICAgICBtX2VuYWJsZWQoZmFsc2UpCisgICAgOiBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9y RmlsZVN5c3RlbUFnZW50PigiRmlsZVN5c3RlbSIsIGluc3RydW1lbnRpbmdBZ2VudHMsIHN0YXRl KQorICAgICwgbV9lbmFibGVkKGZhbHNlKQogewogICAgIEFTU0VSVChpbnN0cnVtZW50aW5nQWdl bnRzKTsKICAgICBBU1NFUlQoc3RhdGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oCmluZGV4IDI4YTk3OWFhZDIwMTk4NGIzNWNk NWUwZTNhMzBmNmJmNWVmODYxOWQuLmE2MzdmYTBlOTcyYjFhZTc4ZmRkOWE0MDkyZGZlMWExZjFi ZGIxNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmls ZVN5c3RlbUFnZW50LmgKQEAgLTQ3LDYgKzQ3LDggQEAgY2xhc3MgSW5zdHJ1bWVudGluZ0FnZW50 czsKIAogY2xhc3MgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50IDogcHVibGljIEluc3BlY3RvckJh c2VBZ2VudDxJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ+LCBwdWJsaWMgSW5zcGVjdG9yQmFja2Vu ZERpc3BhdGNoZXI6OkZpbGVTeXN0ZW1Db21tYW5kSGFuZGxlciB7CiBwdWJsaWM6CisgICAgY2xh c3MgRnJvbnRlbmRQcm92aWRlcjsKKwogICAgIHN0YXRpYyBQYXNzT3duUHRyPEluc3BlY3RvckZp bGVTeXN0ZW1BZ2VudD4gY3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JTdGF0 ZSopOwogICAgIHZpcnR1YWwgfkluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCgpOwogCkBAIC01OSw3 ICs2MSw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50 KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JTdGF0ZSopOwogCi0gICAgSW5zcGVjdG9y RnJvbnRlbmQ6OkZpbGVTeXN0ZW0qIG1fZnJvbnRlbmQ7CisgICAgUmVmUHRyPEZyb250ZW5kUHJv dmlkZXI+IG1fZnJvbnRlbmRQcm92aWRlcjsKICAgICBib29sIG1fZW5hYmxlZDsKIH07CiAK