30009 2009-10-02 02:23:42 -0700 Web Inspector: close inspector client view on InspectorController::close API call. 2009-10-06 08:49:08 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 26549 1 pfeldman pfeldman timothy oldest_to_newest 151803 0 pfeldman 2009-10-02 02:23:42 -0700 In order to run batch web inspector layout tests (and not affect subsequent tests) we should close inspector client's view upon InspectorController::close API call. 151824 1 40508 pfeldman 2009-10-02 04:32:03 -0700 Created attachment 40508 patch 151902 2 40508 timothy 2009-10-02 11:08:59 -0700 Comment on attachment 40508 patch > Page* WebInspectorClient::createPage() > { > - if (m_webView) > - return core(m_webView.get()); > - > ASSERT(!m_hwnd); > > registerWindowClass(); That !m_hwnd ASSERT will fire the second time. 152092 3 40580 pfeldman 2009-10-03 11:44:35 -0700 Created attachment 40580 patch with comments addressed I still need to test it on non-Mac platforms manually. 152107 4 40580 timothy 2009-10-03 16:10:24 -0700 Comment on attachment 40580 patch with comments addressed I think you will need: if (m_hwnd) ::DestroyWindow(m_hwnd); Also: if (inspectorView) delete inspectorView; 152288 5 40631 pfeldman 2009-10-05 07:16:30 -0700 Created attachment 40631 patch Done destroying the window. Why do you think delete inspectorView is necessary? (I don't find this code in the destructor...) 152311 6 timothy 2009-10-05 09:09:19 -0700 (In reply to comment #5) > Created an attachment (id=40631) [details] > patch > > Done destroying the window. Why do you think delete inspectorView is necessary? > (I don't find this code in the destructor...) I missed the fact that it uses a spart pointer. 152739 7 pfeldman 2009-10-06 08:49:08 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorController.cpp M WebKit/gtk/ChangeLog M WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp M WebKit/mac/ChangeLog M WebKit/mac/WebCoreSupport/WebInspectorClient.mm M WebKit/qt/ChangeLog M WebKit/qt/WebCoreSupport/InspectorClientQt.cpp M WebKit/win/ChangeLog M WebKit/win/WebCoreSupport/WebInspectorClient.cpp Committed r49190 40508 2009-10-02 04:32:03 -0700 2009-10-03 11:44:35 -0700 patch close_view text/plain 7672 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWMyNjM3OS4uNTAzYjU0MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMyBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IFRp bW90aHkgSGF0Y2hlci4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBjbG9zZSBpbnNwZWN0b3Ig Y2xpZW50IHZpZXcgb24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xvc2UgQVBJIGNh bGwuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcnVuIGJhdGNoIHdlYiBpbnNwZWN0b3IgbGF5b3V0 IHRlc3RzIChhbmQgbm90IGFmZmVjdAorICAgICAgICBzdWJzZXF1ZW50IHRlc3RzKSB3ZSBzaG91 bGQgY2xvc2UgaW5zcGVjdG9yIGNsaWVudCdzIHZpZXcgdXBvbgorICAgICAgICBJbnNwZWN0b3JD b250cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAwMDkKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6 Omluc3BlY3RlZFBhZ2VEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6Y2xvc2UpOgorCisyMDA5LTEwLTAyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBwcmVwYXJlIEluc3BlY3RvckNvbnRyb2xsZXIgZm9yIGJl aW5nIHVzZWQgZnJvbSBsYXlvdXQgdGVzdHMuCiAgICAgICAgIFRoaXMgY2hhbmdlIGFkZHMgZXZh bHVhdGVGb3JUZXN0SW5Gcm9udGVuZCBtZXRob2Qgd2l0aCB0aGUgY2FsbGJhY2sgdGhhdAogICAg ICAgICBhbGxvd3MgZXZhbHVhdGluZyBhcmJpdHJhcnkgY29kZSBpbiB0aGUgZnJvbnRlbmQgY29u dGV4dC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNjQz YzY0NC4uZmFkMzAyMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAKQEAgLTE3OSwxMSArMTc5LDYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjppbnNwZWN0 ZWRQYWdlRGVzdHJveWVkKCkKICAgICBpZiAobV9zY3JpcHRTdGF0ZSkKICAgICAgICAgU2NyaXB0 R2xvYmFsT2JqZWN0OjpyZW1vdmUobV9zY3JpcHRTdGF0ZSwgIkluc3BlY3RvckNvbnRyb2xsZXIi KTsKIAotICAgIGlmIChtX3BhZ2UpIHsKLSAgICAgICAgbV9wYWdlLT5zZXRQYXJlbnRJbnNwZWN0 b3JDb250cm9sbGVyKDApOwotICAgICAgICBtX3BhZ2UgPSAwOwotICAgIH0KLQogICAgIEFTU0VS VChtX2luc3BlY3RlZFBhZ2UpOwogICAgIG1faW5zcGVjdGVkUGFnZSA9IDA7CiAKQEAgLTYyMSw2 ICs2MTYsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmNsb3NlKCkKICAgICBtX2RvbUFn ZW50ID0gMDsKICAgICBtX3RpbWVsaW5lQWdlbnQgPSAwOwogICAgIG1fc2NyaXB0U3RhdGUgPSAw OworICAgIGlmIChtX3BhZ2UpCisgICAgICAgIG1fcGFnZS0+c2V0UGFyZW50SW5zcGVjdG9yQ29u dHJvbGxlcigwKTsKKyAgICBtX3BhZ2UgPSAwOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xs ZXI6OnNob3dXaW5kb3coKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJL aXQvZ3RrL0NoYW5nZUxvZwppbmRleCAzMjQ2ZGY4Li43ZmMxMzJmIDEwMDY0NAotLS0gYS9XZWJL aXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDA5LTEwLTAyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBjbG9zZSBpbnNwZWN0b3IgY2xpZW50IHZpZXcgb24KKyAgICAgICAgSW5zcGVjdG9y Q29udHJvbGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcnVuIGJh dGNoIHdlYiBpbnNwZWN0b3IgbGF5b3V0IHRlc3RzIChhbmQgbm90IGFmZmVjdCAKKyAgICAgICAg c3Vic2VxdWVudCB0ZXN0cykgd2Ugc2hvdWxkIGNsb3NlIGluc3BlY3RvciBjbGllbnQncyB2aWV3 IHVwb24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDA5CisKKyAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwOgorICAgICAgICAo V2ViS2l0OjpJbnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UpOgorCiAyMDA5LTEwLTAxICBYYW4g TG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZv IE5vcm9uaGEuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3Rv ckNsaWVudEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dEd0ay5jcHAKaW5kZXggOTA4YmZmYS4uZmVmMDdjMSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3RrLmNwcApAQCAtNjgsOCArNjgsMTMgQEAgdm9p ZCBJbnNwZWN0b3JDbGllbnQ6OndlYlZpZXdEZXN0cm95ZWQoKQogCiBQYWdlKiBJbnNwZWN0b3JD bGllbnQ6OmNyZWF0ZVBhZ2UoKQogewotICAgIGlmIChtX3dlYlZpZXcpCi0gICAgICByZXR1cm4g Y29yZShtX3dlYlZpZXcpOworICAgIGlmIChtX3dlYlZpZXcpIHsKKyAgICAgICAgZ2Jvb2xlYW4g aGFuZGxlZCA9IEZBTFNFOworICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJJbnNw ZWN0b3IsICJkZXN0cm95IiwgJmhhbmRsZWQpOworCisgICAgICAgIC8qIHdlIGNhbiBub3cgZGlz cG9zZSBvdXIgb3duIHJlZmVyZW5jZSAqLworICAgICAgICBnX29iamVjdF91bnJlZihtX3dlYklu c3BlY3Rvcik7CisgICAgfQogCiAgICAgLy8gVGhpcyBnX29iamVjdF9nZXQgd2lsbCByZWYgdGhl IGluc3BlY3Rvci4gV2UncmUgbm90IGRvaW5nIGFuCiAgICAgLy8gdW5yZWYgaWYgdGhpcyBtZXRo b2Qgc3VjY2VlZHMgYmVjYXVzZSB0aGUgaW5zcGVjdG9yIG9iamVjdCBtdXN0CmRpZmYgLS1naXQg YS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGY3NTY4 ZDAuLjYxZDZmMzcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1dlYktp dC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMDIgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3Ro eSBIYXRjaGVyLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNsb3NlIGluc3BlY3RvciBjbGll bnQgdmlldyBvbgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4K KworICAgICAgICBJbiBvcmRlciB0byBydW4gYmF0Y2ggd2ViIGluc3BlY3RvciBsYXlvdXQgdGVz dHMgKGFuZCBub3QgYWZmZWN0IAorICAgICAgICBzdWJzZXF1ZW50IHRlc3RzKSB3ZSBzaG91bGQg Y2xvc2UgaW5zcGVjdG9yIGNsaWVudCdzIHZpZXcgdXBvbgorICAgICAgICBJbnNwZWN0b3JDb250 cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzAwMDkKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5tbToKKyAgICAgICAgKFdlYkluc3BlY3RvckNsaWVudDo6Y3JlYXRlUGFn ZSk6CisKIDIwMDktMTAtMDEgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggdGhlIFRpZ2VyIGJ1aWxkLiAgRG9uJ3QgdW5jb25kaXRpb25hbGx5IGVuYWJsZSAzRCBj YW52YXMgYXMgaXQgaXMgbm90IHN1cHBvcnRlZCBvbiBUaWdlci4KZGlmZiAtLWdpdCBhL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tIGIvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KaW5kZXggM2YwYjQzZC4uYzZiM2U3 NiAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGll bnQubW0KKysrIGIvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQu bW0KQEAgLTgxLDggKzgxLDkgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6Omluc3BlY3RvckRl c3Ryb3llZCgpCiAKIFBhZ2UqIFdlYkluc3BlY3RvckNsaWVudDo6Y3JlYXRlUGFnZSgpCiB7Ci0g ICAgaWYgKCFtX3dpbmRvd0NvbnRyb2xsZXIpCi0gICAgICAgIG1fd2luZG93Q29udHJvbGxlci5h ZG9wdE5TKFtbV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhJbnNw ZWN0ZWRXZWJWaWV3Om1fd2ViVmlld10pOworICAgIGlmIChtX3dpbmRvd0NvbnRyb2xsZXIpCisg ICAgICAgIFtbbV93aW5kb3dDb250cm9sbGVyLmdldCgpIHdlYlZpZXddIGNsb3NlXTsKKyAgICBt X3dpbmRvd0NvbnRyb2xsZXIuYWRvcHROUyhbW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIg YWxsb2NdIGluaXRXaXRoSW5zcGVjdGVkV2ViVmlldzptX3dlYlZpZXddKTsKIAogICAgIHJldHVy biBjb3JlKFttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2ViVmlld10pOwogfQpkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNTdjZjNj My4uOWVmNTJlOCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQv cXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMDIgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBI YXRjaGVyLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNsb3NlIGluc3BlY3RvciBjbGllbnQg dmlldyBvbgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4KKwor ICAgICAgICBJbiBvcmRlciB0byBydW4gYmF0Y2ggd2ViIGluc3BlY3RvciBsYXlvdXQgdGVzdHMg KGFuZCBub3QgYWZmZWN0IAorICAgICAgICBzdWJzZXF1ZW50IHRlc3RzKSB3ZSBzaG91bGQgY2xv c2UgaW5zcGVjdG9yIGNsaWVudCdzIHZpZXcgdXBvbgorICAgICAgICBJbnNwZWN0b3JDb250cm9s bGVyOjpjbG9zZSBBUEkgY2FsbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzAwMDkKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3Rv ckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjpjcmVh dGVQYWdlKToKKwogMjAwOS0xMC0wMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBu b2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KZGlmZiAt LWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAgYi9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwCmluZGV4IDM0MDMy NWUuLmUyMTFmYjMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0 b3JDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNs aWVudFF0LmNwcApAQCAtODQsOSArODQsNiBAQCB2b2lkIEluc3BlY3RvckNsaWVudFF0OjppbnNw ZWN0b3JEZXN0cm95ZWQoKQogCiBQYWdlKiBJbnNwZWN0b3JDbGllbnRRdDo6Y3JlYXRlUGFnZSgp CiB7Ci0gICAgaWYgKG1faW5zcGVjdG9yVmlldykKLSAgICAgICAgcmV0dXJuIG1faW5zcGVjdG9y Vmlldy0+cGFnZSgpLT5kLT5wYWdlOwotCiAgICAgUVdlYlZpZXcqIGluc3BlY3RvclZpZXcgPSBu ZXcgUVdlYlZpZXc7CiAgICAgSW5zcGVjdG9yQ2xpZW50V2ViUGFnZSogaW5zcGVjdG9yUGFnZSA9 IG5ldyBJbnNwZWN0b3JDbGllbnRXZWJQYWdlKGluc3BlY3RvclZpZXcpOwogICAgIGluc3BlY3Rv clZpZXctPnNldFBhZ2UoaW5zcGVjdG9yUGFnZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL0No YW5nZUxvZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IGY1NmQwNzMuLjY5M2QzNjAgMTAw NjQ0Ci0tLSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC93aW4vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMDIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IGNsb3NlIGluc3BlY3RvciBjbGllbnQgdmlldyBvbgorICAg ICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4KKworICAgICAgICBJbiBv cmRlciB0byBydW4gYmF0Y2ggd2ViIGluc3BlY3RvciBsYXlvdXQgdGVzdHMgKGFuZCBub3QgYWZm ZWN0IAorICAgICAgICBzdWJzZXF1ZW50IHRlc3RzKSB3ZSBzaG91bGQgY2xvc2UgaW5zcGVjdG9y IGNsaWVudCdzIHZpZXcgdXBvbgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSBB UEkgY2FsbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzAwMDkKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5j cHA6CisgICAgICAgIChXZWJJbnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UpOgorCiAyMDA5LTA5 LTMwICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2Vi SW5zcGVjdG9yQ2xpZW50LmNwcCBiL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVj dG9yQ2xpZW50LmNwcAppbmRleCBiYTcyNGI0Li5kZTJjZmRlIDEwMDY0NAotLS0gYS9XZWJLaXQv d2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKKysrIGIvV2ViS2l0L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCkBAIC05OSw5ICs5OSw2IEBA IHZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50OjppbnNwZWN0b3JEZXN0cm95ZWQoKQogCiBQYWdlKiBX ZWJJbnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UoKQogewotICAgIGlmIChtX3dlYlZpZXcpCi0g ICAgICAgIHJldHVybiBjb3JlKG1fd2ViVmlldy5nZXQoKSk7Ci0KICAgICBBU1NFUlQoIW1faHdu ZCk7CiAKICAgICByZWdpc3RlcldpbmRvd0NsYXNzKCk7Cg== 40580 2009-10-03 11:44:35 -0700 2009-10-05 07:16:30 -0700 patch with comments addressed close_view text/plain 7596 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDkzOTdmNy4uZjFjMjQ0OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTI5LDYgKzI5LDIzIEBACiAKICAgICAgICAgUmV2aWV3ZWQgYnkg VGltb3RoeSBIYXRjaGVyLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNsb3NlIGluc3BlY3Rv ciBjbGllbnQgdmlldyBvbgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSBBUEkg Y2FsbC4KKworICAgICAgICBJbiBvcmRlciB0byBydW4gYmF0Y2ggd2ViIGluc3BlY3RvciBsYXlv dXQgdGVzdHMgKGFuZCBub3QgYWZmZWN0CisgICAgICAgIHN1YnNlcXVlbnQgdGVzdHMpIHdlIHNo b3VsZCBjbG9zZSBpbnNwZWN0b3IgY2xpZW50J3MgdmlldyB1cG9uCisgICAgICAgIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmNsb3NlIEFQSSBjYWxsLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDAwOQorCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl cjo6aW5zcGVjdGVkUGFnZURlc3Ryb3llZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JD b250cm9sbGVyOjpjbG9zZSk6CisKKzIwMDktMTAtMDIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgor CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5vZGUgc2VhcmNoIG1vZGUgaXMgbm90IGdldHRpbmcg cmVzZXQgb24gZWxlbWVudCBzZWxlY3Rpb24uCiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDE2CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCmluZGV4IDI5YTllMjguLjVmZTFjZDcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xNzksMTEgKzE3OSw2IEBAIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6aW5zcGVjdGVkUGFnZURlc3Ryb3llZCgpCiAgICAgaWYgKG1fc2NyaXB0 U3RhdGUpCiAgICAgICAgIFNjcmlwdEdsb2JhbE9iamVjdDo6cmVtb3ZlKG1fc2NyaXB0U3RhdGUs ICJJbnNwZWN0b3JDb250cm9sbGVyIik7CiAKLSAgICBpZiAobV9wYWdlKSB7Ci0gICAgICAgIG1f cGFnZS0+c2V0UGFyZW50SW5zcGVjdG9yQ29udHJvbGxlcigwKTsKLSAgICAgICAgbV9wYWdlID0g MDsKLSAgICB9Ci0KICAgICBBU1NFUlQobV9pbnNwZWN0ZWRQYWdlKTsKICAgICBtX2luc3BlY3Rl ZFBhZ2UgPSAwOwogCkBAIC02MjEsNiArNjE2LDkgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy OjpjbG9zZSgpCiAgICAgbV9kb21BZ2VudCA9IDA7CiAgICAgbV90aW1lbGluZUFnZW50ID0gMDsK ICAgICBtX3NjcmlwdFN0YXRlID0gMDsKKyAgICBpZiAobV9wYWdlKQorICAgICAgICBtX3BhZ2Ut PnNldFBhcmVudEluc3BlY3RvckNvbnRyb2xsZXIoMCk7CisgICAgbV9wYWdlID0gMDsKIH0KIAog dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzaG93V2luZG93KCkKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMzI0NmRmOC4uN2Zj MTMyZiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOS0xMC0wMiAgUGF2ZWwgRmVsZG1hbiAgPHBm ZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNo ZXIuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY2xvc2UgaW5zcGVjdG9yIGNsaWVudCB2aWV3 IG9uCisgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXI6OmNsb3NlIEFQSSBjYWxsLgorCisgICAg ICAgIEluIG9yZGVyIHRvIHJ1biBiYXRjaCB3ZWIgaW5zcGVjdG9yIGxheW91dCB0ZXN0cyAoYW5k IG5vdCBhZmZlY3QgCisgICAgICAgIHN1YnNlcXVlbnQgdGVzdHMpIHdlIHNob3VsZCBjbG9zZSBp bnNwZWN0b3IgY2xpZW50J3MgdmlldyB1cG9uCisgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXI6 OmNsb3NlIEFQSSBjYWxsLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMDAwOQorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xp ZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5zcGVjdG9yQ2xpZW50OjpjcmVhdGVQYWdl KToKKwogMjAwOS0xMC0wMSAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCmluZGV4IDkwOGJmZmEuLmZlZjA3YzEgMTAw NjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3RrLmNw cAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEd0ay5jcHAK QEAgLTY4LDggKzY4LDEzIEBAIHZvaWQgSW5zcGVjdG9yQ2xpZW50Ojp3ZWJWaWV3RGVzdHJveWVk KCkKIAogUGFnZSogSW5zcGVjdG9yQ2xpZW50OjpjcmVhdGVQYWdlKCkKIHsKLSAgICBpZiAobV93 ZWJWaWV3KQotICAgICAgcmV0dXJuIGNvcmUobV93ZWJWaWV3KTsKKyAgICBpZiAobV93ZWJWaWV3 KSB7CisgICAgICAgIGdib29sZWFuIGhhbmRsZWQgPSBGQUxTRTsKKyAgICAgICAgZ19zaWduYWxf ZW1pdF9ieV9uYW1lKG1fd2ViSW5zcGVjdG9yLCAiZGVzdHJveSIsICZoYW5kbGVkKTsKKworICAg ICAgICAvKiB3ZSBjYW4gbm93IGRpc3Bvc2Ugb3VyIG93biByZWZlcmVuY2UgKi8KKyAgICAgICAg Z19vYmplY3RfdW5yZWYobV93ZWJJbnNwZWN0b3IpOworICAgIH0KIAogICAgIC8vIFRoaXMgZ19v YmplY3RfZ2V0IHdpbGwgcmVmIHRoZSBpbnNwZWN0b3IuIFdlJ3JlIG5vdCBkb2luZyBhbgogICAg IC8vIHVucmVmIGlmIHRoaXMgbWV0aG9kIHN1Y2NlZWRzIGJlY2F1c2UgdGhlIGluc3BlY3RvciBv YmplY3QgbXVzdApkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9XZWJLaXQvbWFj L0NoYW5nZUxvZwppbmRleCBkMDBlZTA4Li5hNjc2NzY4IDEwMDY0NAotLS0gYS9XZWJLaXQvbWFj L0NoYW5nZUxvZworKysgYi9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisy MDA5LTEwLTAyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBjbG9zZSBpbnNwZWN0b3IgY2xpZW50IHZpZXcgb24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJv bGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcnVuIGJhdGNoIHdl YiBpbnNwZWN0b3IgbGF5b3V0IHRlc3RzIChhbmQgbm90IGFmZmVjdCAKKyAgICAgICAgc3Vic2Vx dWVudCB0ZXN0cykgd2Ugc2hvdWxkIGNsb3NlIGluc3BlY3RvciBjbGllbnQncyB2aWV3IHVwb24K KyAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDA5CisKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAgIChXZWJJbnNw ZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UpOgorCiAyMDA5LTEwLTAyICBEYXZlIEh5YXR0ICA8aHlh dHRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1n aXQgYS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbSBiL1dl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCmluZGV4IDNmMGI0 M2QuLmM2YjNlNzYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5z cGVjdG9yQ2xpZW50Lm1tCisrKyBiL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVj dG9yQ2xpZW50Lm1tCkBAIC04MSw4ICs4MSw5IEBAIHZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50Ojpp bnNwZWN0b3JEZXN0cm95ZWQoKQogCiBQYWdlKiBXZWJJbnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBh Z2UoKQogewotICAgIGlmICghbV93aW5kb3dDb250cm9sbGVyKQotICAgICAgICBtX3dpbmRvd0Nv bnRyb2xsZXIuYWRvcHROUyhbW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgYWxsb2NdIGlu aXRXaXRoSW5zcGVjdGVkV2ViVmlldzptX3dlYlZpZXddKTsKKyAgICBpZiAobV93aW5kb3dDb250 cm9sbGVyKQorICAgICAgICBbW21fd2luZG93Q29udHJvbGxlci5nZXQoKSB3ZWJWaWV3XSBjbG9z ZV07CisgICAgbV93aW5kb3dDb250cm9sbGVyLmFkb3B0TlMoW1tXZWJJbnNwZWN0b3JXaW5kb3dD b250cm9sbGVyIGFsbG9jXSBpbml0V2l0aEluc3BlY3RlZFdlYlZpZXc6bV93ZWJWaWV3XSk7CiAK ICAgICByZXR1cm4gY29yZShbbV93aW5kb3dDb250cm9sbGVyLmdldCgpIHdlYlZpZXddKTsKIH0K ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IDcwMDU5MTYuLmRiNjhmYzkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDA5LTEwLTAyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBjbG9zZSBpbnNwZWN0 b3IgY2xpZW50IHZpZXcgb24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xvc2UgQVBJ IGNhbGwuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcnVuIGJhdGNoIHdlYiBpbnNwZWN0b3IgbGF5 b3V0IHRlc3RzIChhbmQgbm90IGFmZmVjdCAKKyAgICAgICAgc3Vic2VxdWVudCB0ZXN0cykgd2Ug c2hvdWxkIGNsb3NlIGluc3BlY3RvciBjbGllbnQncyB2aWV3IHVwb24KKyAgICAgICAgSW5zcGVj dG9yQ29udHJvbGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDA5CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9JbnNwZWN0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGll bnRRdDo6Y3JlYXRlUGFnZSk6CisKIDIwMDktMTAtMDIgIE5vcmJlcnQgTGVzZXIgIDxub3JiZXJ0 Lmxlc2VyQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4K ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5j cHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwCmluZGV4 IDM5MzFhODUuLjEyZjQwNWMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9J bnNwZWN0b3JDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3Bl Y3RvckNsaWVudFF0LmNwcApAQCAtODQsOSArODQsNiBAQCB2b2lkIEluc3BlY3RvckNsaWVudFF0 OjppbnNwZWN0b3JEZXN0cm95ZWQoKQogCiBQYWdlKiBJbnNwZWN0b3JDbGllbnRRdDo6Y3JlYXRl UGFnZSgpCiB7Ci0gICAgaWYgKG1faW5zcGVjdG9yVmlldykKLSAgICAgICAgcmV0dXJuIG1faW5z cGVjdG9yVmlldy0+cGFnZSgpLT5kLT5wYWdlOwotCiAgICAgUVdlYlZpZXcqIGluc3BlY3RvclZp ZXcgPSBuZXcgUVdlYlZpZXc7CiAgICAgSW5zcGVjdG9yQ2xpZW50V2ViUGFnZSogaW5zcGVjdG9y UGFnZSA9IG5ldyBJbnNwZWN0b3JDbGllbnRXZWJQYWdlKGluc3BlY3RvclZpZXcpOwogICAgIGlu c3BlY3RvclZpZXctPnNldFBhZ2UoaW5zcGVjdG9yUGFnZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQv d2luL0NoYW5nZUxvZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDc1MWFjOTMuLmJiOTc3 NjAgMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC93aW4vQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMDIgIFBhdmVsIEZlbGRtYW4gIDxwZmVs ZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVy LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNsb3NlIGluc3BlY3RvciBjbGllbnQgdmlldyBv bgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4KKworICAgICAg ICBJbiBvcmRlciB0byBydW4gYmF0Y2ggd2ViIGluc3BlY3RvciBsYXlvdXQgdGVzdHMgKGFuZCBu b3QgYWZmZWN0IAorICAgICAgICBzdWJzZXF1ZW50IHRlc3RzKSB3ZSBzaG91bGQgY2xvc2UgaW5z cGVjdG9yIGNsaWVudCdzIHZpZXcgdXBvbgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpj bG9zZSBBUEkgY2FsbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzAwMDkKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNs aWVudC5jcHA6CisgICAgICAgIChXZWJJbnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UpOgorCiAy MDA5LTEwLTAyICBEYXZlIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0 L1dlYkluc3BlY3RvckNsaWVudC5jcHAgYi9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5jcHAKaW5kZXggYmE3MjRiNC4uMzEwYTQ0NiAxMDA2NDQKLS0tIGEvV2Vi S2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCisrKyBiL1dlYktp dC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcApAQCAtOTksMTEgKzk5 LDYgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6Omluc3BlY3RvckRlc3Ryb3llZCgpCiAKIFBh Z2UqIFdlYkluc3BlY3RvckNsaWVudDo6Y3JlYXRlUGFnZSgpCiB7Ci0gICAgaWYgKG1fd2ViVmll dykKLSAgICAgICAgcmV0dXJuIGNvcmUobV93ZWJWaWV3LmdldCgpKTsKLQotICAgIEFTU0VSVCgh bV9od25kKTsKLQogICAgIHJlZ2lzdGVyV2luZG93Q2xhc3MoKTsKIAogICAgIG1faHduZCA9IDo6 Q3JlYXRlV2luZG93RXgoMCwga1dlYkluc3BlY3RvcldpbmRvd0NsYXNzTmFtZSwgMCwgV1NfT1ZF UkxBUFBFRFdJTkRPVywK 40631 2009-10-05 07:16:30 -0700 2009-10-05 09:08:49 -0700 patch close_view text/plain 7697 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmEyYjNkNC4uN2ZiZTRlMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAwOS0xMC0wMiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY2xvc2UgaW5zcGVjdG9yIGNsaWVu dCB2aWV3IG9uCisgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXI6OmNsb3NlIEFQSSBjYWxsLgor CisgICAgICAgIEluIG9yZGVyIHRvIHJ1biBiYXRjaCB3ZWIgaW5zcGVjdG9yIGxheW91dCB0ZXN0 cyAoYW5kIG5vdCBhZmZlY3QKKyAgICAgICAgc3Vic2VxdWVudCB0ZXN0cykgd2Ugc2hvdWxkIGNs b3NlIGluc3BlY3RvciBjbGllbnQncyB2aWV3IHVwb24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJv bGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMwMDA5CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjppbnNw ZWN0ZWRQYWdlRGVzdHJveWVkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xs ZXI6OmNsb3NlKToKKwogMjAwOS0xMC0wNSAgSi1QIE51cm1pICA8anBudXJtaUBnbWFpbC5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDE1ZDczMjUuLmRiYTJkMjUgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xNzksMTEgKzE3OSw2IEBA IHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aW5zcGVjdGVkUGFnZURlc3Ryb3llZCgpCiAgICAg aWYgKG1fc2NyaXB0U3RhdGUpCiAgICAgICAgIFNjcmlwdEdsb2JhbE9iamVjdDo6cmVtb3ZlKG1f c2NyaXB0U3RhdGUsICJJbnNwZWN0b3JDb250cm9sbGVyIik7CiAKLSAgICBpZiAobV9wYWdlKSB7 Ci0gICAgICAgIG1fcGFnZS0+c2V0UGFyZW50SW5zcGVjdG9yQ29udHJvbGxlcigwKTsKLSAgICAg ICAgbV9wYWdlID0gMDsKLSAgICB9Ci0KICAgICBBU1NFUlQobV9pbnNwZWN0ZWRQYWdlKTsKICAg ICBtX2luc3BlY3RlZFBhZ2UgPSAwOwogCkBAIC02MjEsNiArNjE2LDkgQEAgdm9pZCBJbnNwZWN0 b3JDb250cm9sbGVyOjpjbG9zZSgpCiAgICAgbV9kb21BZ2VudCA9IDA7CiAgICAgbV90aW1lbGlu ZUFnZW50ID0gMDsKICAgICBtX3NjcmlwdFN0YXRlID0gMDsKKyAgICBpZiAobV9wYWdlKQorICAg ICAgICBtX3BhZ2UtPnNldFBhcmVudEluc3BlY3RvckNvbnRyb2xsZXIoMCk7CisgICAgbV9wYWdl ID0gMDsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzaG93V2luZG93KCkKZGlmZiAt LWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXgg YTllZjM0NC4uM2U0YjA2MSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOS0xMC0wMiAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBU aW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY2xvc2UgaW5zcGVjdG9y IGNsaWVudCB2aWV3IG9uCisgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXI6OmNsb3NlIEFQSSBj YWxsLgorCisgICAgICAgIEluIG9yZGVyIHRvIHJ1biBiYXRjaCB3ZWIgaW5zcGVjdG9yIGxheW91 dCB0ZXN0cyAoYW5kIG5vdCBhZmZlY3QgCisgICAgICAgIHN1YnNlcXVlbnQgdGVzdHMpIHdlIHNo b3VsZCBjbG9zZSBpbnNwZWN0b3IgY2xpZW50J3MgdmlldyB1cG9uCisgICAgICAgIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmNsb3NlIEFQSSBjYWxsLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDAwOQorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv SW5zcGVjdG9yQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5zcGVjdG9yQ2xpZW50 OjpjcmVhdGVQYWdlKToKKwogMjAwOS0xMC0wMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQu b3JnPgogCiAgICAgICAgIE1vcmUgYnVpbGQgZml4aW5nLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCmluZGV4IDkwOGJmZmEuLmZlZjA3YzEg MTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3Rr LmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEd0ay5j cHAKQEAgLTY4LDggKzY4LDEzIEBAIHZvaWQgSW5zcGVjdG9yQ2xpZW50Ojp3ZWJWaWV3RGVzdHJv eWVkKCkKIAogUGFnZSogSW5zcGVjdG9yQ2xpZW50OjpjcmVhdGVQYWdlKCkKIHsKLSAgICBpZiAo bV93ZWJWaWV3KQotICAgICAgcmV0dXJuIGNvcmUobV93ZWJWaWV3KTsKKyAgICBpZiAobV93ZWJW aWV3KSB7CisgICAgICAgIGdib29sZWFuIGhhbmRsZWQgPSBGQUxTRTsKKyAgICAgICAgZ19zaWdu YWxfZW1pdF9ieV9uYW1lKG1fd2ViSW5zcGVjdG9yLCAiZGVzdHJveSIsICZoYW5kbGVkKTsKKwor ICAgICAgICAvKiB3ZSBjYW4gbm93IGRpc3Bvc2Ugb3VyIG93biByZWZlcmVuY2UgKi8KKyAgICAg ICAgZ19vYmplY3RfdW5yZWYobV93ZWJJbnNwZWN0b3IpOworICAgIH0KIAogICAgIC8vIFRoaXMg Z19vYmplY3RfZ2V0IHdpbGwgcmVmIHRoZSBpbnNwZWN0b3IuIFdlJ3JlIG5vdCBkb2luZyBhbgog ICAgIC8vIHVucmVmIGlmIHRoaXMgbWV0aG9kIHN1Y2NlZWRzIGJlY2F1c2UgdGhlIGluc3BlY3Rv ciBvYmplY3QgbXVzdApkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCAzMzUyNzJlLi4yNWJmMGYzIDEwMDY0NAotLS0gYS9XZWJLaXQv bWFjL0NoYW5nZUxvZworKysgYi9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBA CisyMDA5LTEwLTAyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBjbG9zZSBpbnNwZWN0b3IgY2xpZW50IHZpZXcgb24KKyAgICAgICAgSW5zcGVjdG9yQ29u dHJvbGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcnVuIGJhdGNo IHdlYiBpbnNwZWN0b3IgbGF5b3V0IHRlc3RzIChhbmQgbm90IGFmZmVjdCAKKyAgICAgICAgc3Vi c2VxdWVudCB0ZXN0cykgd2Ugc2hvdWxkIGNsb3NlIGluc3BlY3RvciBjbGllbnQncyB2aWV3IHVw b24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDA5CisKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAgIChXZWJJ bnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UpOgorCiAyMDA5LTEwLTA1ICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVj dG9yQ2xpZW50Lm1tIGIvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGll bnQubW0KaW5kZXggM2YwYjQzZC4uYzZiM2U3NiAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KKysrIGIvV2ViS2l0L21hYy9XZWJDb3Jl U3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KQEAgLTgxLDggKzgxLDkgQEAgdm9pZCBXZWJJ bnNwZWN0b3JDbGllbnQ6Omluc3BlY3RvckRlc3Ryb3llZCgpCiAKIFBhZ2UqIFdlYkluc3BlY3Rv ckNsaWVudDo6Y3JlYXRlUGFnZSgpCiB7Ci0gICAgaWYgKCFtX3dpbmRvd0NvbnRyb2xsZXIpCi0g ICAgICAgIG1fd2luZG93Q29udHJvbGxlci5hZG9wdE5TKFtbV2ViSW5zcGVjdG9yV2luZG93Q29u dHJvbGxlciBhbGxvY10gaW5pdFdpdGhJbnNwZWN0ZWRXZWJWaWV3Om1fd2ViVmlld10pOworICAg IGlmIChtX3dpbmRvd0NvbnRyb2xsZXIpCisgICAgICAgIFtbbV93aW5kb3dDb250cm9sbGVyLmdl dCgpIHdlYlZpZXddIGNsb3NlXTsKKyAgICBtX3dpbmRvd0NvbnRyb2xsZXIuYWRvcHROUyhbW1dl Ykluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoSW5zcGVjdGVkV2ViVmll dzptX3dlYlZpZXddKTsKIAogICAgIHJldHVybiBjb3JlKFttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0 KCkgd2ViVmlld10pOwogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktp dC9xdC9DaGFuZ2VMb2cKaW5kZXggMTc5Mjc1YS4uMmFlNTZjYSAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMDktMTAtMDIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGNsb3NlIGluc3BlY3RvciBjbGllbnQgdmlldyBvbgorICAgICAgICBJbnNwZWN0b3JDb250 cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4KKworICAgICAgICBJbiBvcmRlciB0byBydW4gYmF0Y2gg d2ViIGluc3BlY3RvciBsYXlvdXQgdGVzdHMgKGFuZCBub3QgYWZmZWN0IAorICAgICAgICBzdWJz ZXF1ZW50IHRlc3RzKSB3ZSBzaG91bGQgY2xvc2UgaW5zcGVjdG9yIGNsaWVudCdzIHZpZXcgdXBv bgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9zZSBBUEkgY2FsbC4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAwMDkKKworICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckNsaWVudFF0OjpjcmVhdGVQYWdlKToKKwogMjAwOS0xMC0wNSAgSi1QIE51 cm1pICA8anBudXJtaUBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1 c21hbm4uCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xp ZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNw cAppbmRleCAzOTMxYTg1Li4xMmY0MDVjIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9JbnNwZWN0b3JDbGllbnRRdC5jcHAKQEAgLTg0LDkgKzg0LDYgQEAgdm9pZCBJbnNwZWN0b3JD bGllbnRRdDo6aW5zcGVjdG9yRGVzdHJveWVkKCkKIAogUGFnZSogSW5zcGVjdG9yQ2xpZW50UXQ6 OmNyZWF0ZVBhZ2UoKQogewotICAgIGlmIChtX2luc3BlY3RvclZpZXcpCi0gICAgICAgIHJldHVy biBtX2luc3BlY3RvclZpZXctPnBhZ2UoKS0+ZC0+cGFnZTsKLQogICAgIFFXZWJWaWV3KiBpbnNw ZWN0b3JWaWV3ID0gbmV3IFFXZWJWaWV3OwogICAgIEluc3BlY3RvckNsaWVudFdlYlBhZ2UqIGlu c3BlY3RvclBhZ2UgPSBuZXcgSW5zcGVjdG9yQ2xpZW50V2ViUGFnZShpbnNwZWN0b3JWaWV3KTsK ICAgICBpbnNwZWN0b3JWaWV3LT5zZXRQYWdlKGluc3BlY3RvclBhZ2UpOwpkaWZmIC0tZ2l0IGEv V2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCA4MWY1MWYx Li43NmMxZmI0IDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9XZWJLaXQv d2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDA5LTEwLTAyICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBjbG9zZSBpbnNwZWN0b3IgY2xpZW50 IHZpZXcgb24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisK KyAgICAgICAgSW4gb3JkZXIgdG8gcnVuIGJhdGNoIHdlYiBpbnNwZWN0b3IgbGF5b3V0IHRlc3Rz IChhbmQgbm90IGFmZmVjdCAKKyAgICAgICAgc3Vic2VxdWVudCB0ZXN0cykgd2Ugc2hvdWxkIGNs b3NlIGluc3BlY3RvciBjbGllbnQncyB2aWV3IHVwb24KKyAgICAgICAgSW5zcGVjdG9yQ29udHJv bGxlcjo6Y2xvc2UgQVBJIGNhbGwuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMwMDA5CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNw ZWN0b3JDbGllbnQuY3BwOgorICAgICAgICAoV2ViSW5zcGVjdG9yQ2xpZW50OjpjcmVhdGVQYWdl KToKKwogMjAwOS0xMC0wNSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJL aXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAgYi9XZWJLaXQvd2lu L1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKaW5kZXggYmE3MjRiNC4uYjNi ZDQ5ZSAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JD bGllbnQuY3BwCisrKyBiL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xp ZW50LmNwcApAQCAtOTksMTMgKzk5LDExIEBAIHZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50OjppbnNw ZWN0b3JEZXN0cm95ZWQoKQogCiBQYWdlKiBXZWJJbnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2Uo KQogewotICAgIGlmIChtX3dlYlZpZXcpCi0gICAgICAgIHJldHVybiBjb3JlKG1fd2ViVmlldy5n ZXQoKSk7Ci0KLSAgICBBU1NFUlQoIW1faHduZCk7Ci0KICAgICByZWdpc3RlcldpbmRvd0NsYXNz KCk7CiAKKyAgICBpZiAobV9od25kKQorICAgICAgICA6OkRlc3Ryb3lXaW5kb3cobV9od25kKTsK KwogICAgIG1faHduZCA9IDo6Q3JlYXRlV2luZG93RXgoMCwga1dlYkluc3BlY3RvcldpbmRvd0Ns YXNzTmFtZSwgMCwgV1NfT1ZFUkxBUFBFRFdJTkRPVywKICAgICAgICAgZGVmYXVsdFdpbmRvd1Jl Y3QoKS54KCksIGRlZmF1bHRXaW5kb3dSZWN0KCkueSgpLCBkZWZhdWx0V2luZG93UmVjdCgpLndp ZHRoKCksIGRlZmF1bHRXaW5kb3dSZWN0KCkuaGVpZ2h0KCksCiAgICAgICAgIDAsIDAsIDAsIDAp Owo=