63532 2011-06-28 07:01:32 -0700 DRT: Make Hixie76WebSocketProtocolEnabled preference flag configurable from LayoutTestController 2011-06-29 20:40:19 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 50099 1 yutak yutak abarth ap tkent webkit.review.bot oldest_to_newest 428854 0 yutak 2011-06-28 07:01:32 -0700 Add setHixie76WebSocketProtocolEnabled() method to LayoutTestController in order to switch WebSocket protocols in layout tests. 428864 1 98915 yutak 2011-06-28 07:19:34 -0700 Created attachment 98915 Patch 428917 2 98915 ap 2011-06-28 08:52:03 -0700 Comment on attachment 98915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98915&action=review Going forward, this really needs a WebKit2 implementation, too. > Tools/DumpRenderTree/LayoutTestController.cpp:2139 > + if (argumentCount == 1) > + controller->setHixie76WebSocketProtocolEnabled(JSValueToBoolean(context, arguments[0])); A function with this name could enable it when called with no arguments, too. That could save someone a few minutes of confusion some day. 429121 3 98915 abarth 2011-06-28 14:00:00 -0700 Comment on attachment 98915 Patch There's already a general LayoutTestController method for setting preferences. We don't need a one-off for each one. 429457 4 yutak 2011-06-29 00:19:05 -0700 (In reply to comment #3) > (From update of attachment 98915 [details]) > There's already a general LayoutTestController method for setting preferences. We don't need a one-off for each one. Sure, I will use LayoutTestController::overridePreference(). With this function, almost all the code of the above patch has become unnecessary, but we still need to reset the preference value in the beginning of each test run. The patch will become reasonably small, so I think I can do Chromium part in the same patch as well as mac/win. 429469 5 yutak 2011-06-29 01:04:24 -0700 *** Bug 63536 has been marked as a duplicate of this bug. *** 429494 6 99060 yutak 2011-06-29 02:41:28 -0700 Created attachment 99060 Patch v2 429496 7 99060 tkent 2011-06-29 02:50:58 -0700 Comment on attachment 99060 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=99060&action=review > Tools/DumpRenderTree/chromium/WebPreferences.cpp:113 > + hixie76WebSocketProtocolEnabled = true; Is the default value true? What's your testing plan? Will we have tests for the current protocol and tests for the new protocol? What tests should call overridePreference()? 429546 8 99060 yutak 2011-06-29 05:53:26 -0700 Comment on attachment 99060 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=99060&action=review >> Tools/DumpRenderTree/chromium/WebPreferences.cpp:113 >> + hixie76WebSocketProtocolEnabled = true; > > Is the default value true? > > What's your testing plan? Will we have tests for the current protocol and tests for the new protocol? What tests should call overridePreference()? At least for now, I want to make the default value true to keep existing tests as-is (note that Hixie76 is an old protocol, so this means "we use the old protocol by default.") I'm going to update WebSocket tests in the following way: 1) Move existing tests (using the old hixie76 protocol) under a new directory (say, websocket/tests/hixie76). 2) Put tests for the new protocol. Each test should have a line "overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0)" in the beginning. We can copy most tests from hixie76 tests, but some tests will need manual modifications, hence they will diverge from hixie76 tests. 3) Make changes... 4) When we are sure about flipping default to the new protocol, put "overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1)" to every hixie76 tests, and flip the default value. 5) When we are sure about dropping support for the old protocol, remove tests for the old protocol, Settings item, "overridePreference()" calls, etc. So my answers to your last two questions are: - Meanwhile, we will have to maintain two sets of tests: one for the old protocol, and one for the new protocol. I expect this period will not last long. - Meanwhile, only new tests should call overridePreference() (because the old protocol is default). This will change as the default changes. 430070 9 99060 tkent 2011-06-29 18:22:59 -0700 Comment on attachment 99060 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=99060&action=review >>> Tools/DumpRenderTree/chromium/WebPreferences.cpp:113 >>> + hixie76WebSocketProtocolEnabled = true; >> >> Is the default value true? >> >> What's your testing plan? Will we have tests for the current protocol and tests for the new protocol? What tests should call overridePreference()? > > At least for now, I want to make the default value true to keep existing tests as-is (note that Hixie76 is an old protocol, so this means "we use the old protocol by default.") > > I'm going to update WebSocket tests in the following way: > 1) Move existing tests (using the old hixie76 protocol) under a new directory (say, websocket/tests/hixie76). > 2) Put tests for the new protocol. Each test should have a line "overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0)" in the beginning. We can copy most tests from hixie76 tests, but some tests will need manual modifications, hence they will diverge from hixie76 tests. > 3) Make changes... > 4) When we are sure about flipping default to the new protocol, put "overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1)" to every hixie76 tests, and flip the default value. > 5) When we are sure about dropping support for the old protocol, remove tests for the old protocol, Settings item, "overridePreference()" calls, etc. > > So my answers to your last two questions are: > - Meanwhile, we will have to maintain two sets of tests: one for the old protocol, and one for the new protocol. I expect this period will not last long. > - Meanwhile, only new tests should call overridePreference() (because the old protocol is default). This will change as the default changes. ok, I understand. The initial value of Settings:m_useHixie76WebSocketProtocol() is also true. Resetting to true is reasonable. 430142 10 99060 webkit.review.bot 2011-06-29 20:40:14 -0700 Comment on attachment 99060 Patch v2 Clearing flags on attachment: 99060 Committed r90085: <http://trac.webkit.org/changeset/90085> 430143 11 webkit.review.bot 2011-06-29 20:40:19 -0700 All reviewed patches have been landed. Closing bug. 98915 2011-06-28 07:19:34 -0700 2011-06-29 02:41:21 -0700 Patch bug-63532-20110628231932.patch text/plain 8169 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogODk4OTEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMzZkNmRhNjIwMjVkNjljOGY1NDIyODE4MTU3YzA3ZmI4 ZmVkNTg3Li42Y2Y1MzQwNGUyODZmNDk2YzE0NTRiMDQ5NWQwNWVjOGQ1N2Q1ZTk2IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTEtMDYtMjggIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW01hYywgV2luXSBE UlQ6IEFkZCBzZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkIHRvIExheW91dFRlc3RD b250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MzUzMgorCisgICAgICAgIEFkZCBhIG1ldGhvZCB0byBMYXlvdXRUZXN0Q29udHJvbGxlciBz byB3ZSBjYW4gc3dpdGNoIFdlYlNvY2tldCBwcm90b2NvbHMgaW4gbGF5b3V0IHRlc3RzLgorICAg ICAgICBUaGlzIG1ldGhvZCBjaGFuZ2VzIHRoZSB2YWx1ZSBvZiBhIGZsYWcgaW4gV2ViQ29yZTo6 U2V0dGluZ3MgKHVzZUhpeGllNzZXZWJTb2NrZXRQcm90b2NvbCkKKyAgICAgICAgd2hpY2ggd2Fz IGFkZGVkIGluIHI4OTY2OSAoYnVnIDYwMzQ4KS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVl L0xheW91dFRlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKHNldEhpeGllNzZXZWJTb2NrZXRQ cm90b2NvbEVuYWJsZWRDYWxsYmFjayk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6 c3RhdGljRnVuY3Rpb25zKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29u dHJvbGxlci5oOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJv bGxlckd0ay5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0SGl4aWU3Nldl YlNvY2tldFByb3RvY29sRW5hYmxlZCk6IEFkZCBhIHN0dWIuCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAocmVzZXREZWZhdWx0c1RvQ29u c2lzdGVudFZhbHVlcyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RD b250cm9sbGVyTWFjLm1tOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEhpeGll NzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dp bi9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChyZXNldERlZmF1bHRzVG9Db25zaXN0ZW50 VmFsdWVzKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vTGF5b3V0VGVzdENvbnRyb2xs ZXJXaW4uY3BwOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEhpeGllNzZXZWJT b2NrZXRQcm90b2NvbEVuYWJsZWQpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3d4L0xheW91 dFRlc3RDb250cm9sbGVyV3guY3BwOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNl dEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQpOiBBZGQgYSBzdHViLgorCiAyMDExLTA2 LTI3ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9M YXlvdXRUZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0 Q29udHJvbGxlci5jcHAKaW5kZXggZGY2ZjM1MTZjNmU4MzcyNTZiYTFlYjBmMjM4MDBiNzA3MGNi MDA3Ni4uZDAxODA4YzM1Njg1YWViYTNiNjYwMGRiOTJkMmNiNzg1ZTQ0NDNlOSAxMDA2NDQKLS0t IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcApAQCAtMjEzMiw2ICsy MTMyLDE0IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIGFsbG93Um91bmRpbmdIYWNrc0NhbGxiYWNrKEpT Q29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiB0CiAgICAgcmV0dXJuIEpTVmFsdWVNYWtl VW5kZWZpbmVkKGNvbnRleHQpOwogfQogCitzdGF0aWMgSlNWYWx1ZVJlZiBzZXRIaXhpZTc2V2Vi U29ja2V0UHJvdG9jb2xFbmFibGVkQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2Jq ZWN0UmVmIHRoaXNPYmplY3QsIEpTT2JqZWN0UmVmLCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29u c3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAg IExheW91dFRlc3RDb250cm9sbGVyKiBjb250cm9sbGVyID0gc3RhdGljX2Nhc3Q8TGF5b3V0VGVz dENvbnRyb2xsZXIqPihKU09iamVjdEdldFByaXZhdGUodGhpc09iamVjdCkpOworICAgIGlmIChh cmd1bWVudENvdW50ID09IDEpCisgICAgICAgIGNvbnRyb2xsZXItPnNldEhpeGllNzZXZWJTb2Nr ZXRQcm90b2NvbEVuYWJsZWQoSlNWYWx1ZVRvQm9vbGVhbihjb250ZXh0LCBhcmd1bWVudHNbMF0p KTsKKyAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7Cit9CisKIC8vIFN0 YXRpYyBWYWx1ZXMKIAogc3RhdGljIEpTVmFsdWVSZWYgZ2V0R2xvYmFsRmxhZ0NhbGxiYWNrKEpT Q29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBKU1N0cmluZ1JlZiBw cm9wZXJ0eU5hbWUsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKQEAgLTI0MDUsNiArMjQxMyw3IEBA IEpTU3RhdGljRnVuY3Rpb24qIExheW91dFRlc3RDb250cm9sbGVyOjpzdGF0aWNGdW5jdGlvbnMo KQogICAgICAgICB7ICJzZXRTaG91bGRQYWludEJyb2tlbkltYWdlIiwgc2V0U2hvdWxkUGFpbnRC cm9rZW5JbWFnZUNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJv cGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgInNldFRleHREaXJlY3Rpb24i LCBzZXRUZXh0RGlyZWN0aW9uQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkg fCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiYWxsb3dSb3Vu ZGluZ0hhY2tzIiwgYWxsb3dSb3VuZGluZ0hhY2tzQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmli dXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKKyAgICAgICAg eyAic2V0SGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCIsIHNldEhpeGllNzZXZWJTb2Nr ZXRQcm90b2NvbEVuYWJsZWRDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8 IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7IDAsIDAsIDAgfQog ICAgIH07CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250 cm9sbGVyLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCmlu ZGV4IGRmNzViZWE4M2FkZGZiOGRlN2QxMjM4YWVmNzUwMmFkZmVhMGU5MzcuLmIyOTkzZWIxM2Vl NTkzOTBiMmMwYmY3YWQ3OGQyZGIwYzlmNjY1MDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv TGF5b3V0VGVzdENvbnRyb2xsZXIuaApAQCAtMzQ2LDYgKzM0Niw4IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgc2V0VGV4dERpcmVjdGlvbihKU1N0cmluZ1JlZik7CiAKKyAgICB2b2lkIHNldEhpeGll NzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQoYm9vbCk7CisKIHByaXZhdGU6CiAgICAgTGF5b3V0 VGVzdENvbnRyb2xsZXIoY29uc3Qgc3RkOjpzdHJpbmcmIHRlc3RQYXRoT3JVUkwsIGNvbnN0IHN0 ZDo6c3RyaW5nJiBleHBlY3RlZFBpeGVsSGFzaCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJvbGxlckd0ay5jcHAgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9ndGsvTGF5b3V0VGVzdENvbnRyb2xsZXJHdGsuY3BwCmluZGV4IDk4Y2MxZGQ5OGZh ZjIxNzFlZDhiZmFhOTgzZmZjMjU2ZjAwNmNhYjkuLjdmMjExMmE5MjhiNTM2MWExMmI1ZDllMzM5 NWJlMzdiMjhlNjg1ZmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9MYXlv dXRUZXN0Q29udHJvbGxlckd0ay5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0xh eW91dFRlc3RDb250cm9sbGVyR3RrLmNwcApAQCAtOTgxLDMgKzk4MSw4IEBAIHZvaWQgTGF5b3V0 VGVzdENvbnRyb2xsZXI6OnNldFRleHREaXJlY3Rpb24oSlNTdHJpbmdSZWYgZGlyZWN0aW9uKQog dm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6YWxsb3dSb3VuZGluZ0hhY2tzKCkKIHsKIH0KKwor dm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0SGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5h YmxlZChib29sKQoreworICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCit9CmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0gYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KaW5kZXggYzQwZDhiOTc0ZmUyMDViMzcyM2M4 OGUzZmZjM2Y0MWNiZWU4MzRlMC4uMmFiMmQ2YTI4YmZhYjFmNGQzNDE4ODA1YTdhYzQ4ZDk2MWQw MDFmOSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVl Lm1tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAt NDc3LDYgKzQ3Nyw3IEBAIHN0YXRpYyB2b2lkIHJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1 ZXMoKQogICAgIFtwcmVmZXJlbmNlcyBzZXRXZWJHTEVuYWJsZWQ6Tk9dOwogICAgIFtwcmVmZXJl bmNlcyBzZXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrczpOT107CiAgICAgW3ByZWZlcmVuY2VzIHNl dEFzeW5jaHJvbm91c1NwZWxsQ2hlY2tpbmdFbmFibGVkOk5PXTsKKyAgICBbcHJlZmVyZW5jZXMg c2V0SGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZDpZRVNdOwogCiAgICAgW1tOU0hUVFBD b29raWVTdG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBzZXRDb29raWVBY2NlcHRQb2xp Y3k6TlNIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW5dOwog ICAgIApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250 cm9sbGVyTWFjLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9s bGVyTWFjLm1tCmluZGV4IDI0NGU3MWQ4ZjA1MTA2N2ZkMDhiZWI4NGQ4OTJkZTIyMzBhMDk4OGEu LjU4OGFhZWJjNGIxMzljNjU0NmNkNWNiYjA4ZGNiYTc4YWYwNTQ2YjkgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQorKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0KQEAgLTEx MzcsMyArMTEzNyw4IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFRleHREaXJlY3Rp b24oSlNTdHJpbmdSZWYgZGlyZWN0aW9uTmFtZSkKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiAjZW5kaWYKIH0KKwordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0SGl4aWU3Nldl YlNvY2tldFByb3RvY29sRW5hYmxlZChib29sIGVuYWJsZWQpCit7CisgICAgW1tbbWFpbkZyYW1l IHdlYlZpZXddIHByZWZlcmVuY2VzXSBzZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVk OmVuYWJsZWRdOworfQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBS ZW5kZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5j cHAKaW5kZXggMmRiNDNkYTQyZGZlMmExMjY1Nzc3MTQ1ZGYyYjRjYTUyMTlkMGEwZi4uM2Y5ZmY3 Y2NhNDRlZjg0N2Q2ZTY4NDY3MTlkMzNlODUwNTNmMzA4ZSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVy VHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC04NzcsNiArODc3LDcgQEAgc3RhdGljIHZv aWQgcmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlcyhJV2ViUHJlZmVyZW5jZXMqIHByZWZl cmVuY2VzKQogICAgICAgICBwcmVmc1ByaXZhdGUtPnNldEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQo RkFMU0UpOwogICAgICAgICBwcmVmc1ByaXZhdGUtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNh Y2hlRW5hYmxlZChUUlVFKTsKICAgICAgICAgcHJlZnNQcml2YXRlLT5zZXRMb2Fkc1NpdGVJY29u c0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVyZW5jZShGQUxTRSk7CisgICAgICAgIHByZWZzUHJp dmF0ZS0+c2V0SGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZChUUlVFKTsKICAgICB9CiAg ICAgc2V0QWx3YXlzQWNjZXB0Q29va2llcyhmYWxzZSk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL3dpbi9MYXlvdXRUZXN0Q29udHJvbGxlcldpbi5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS93aW4vTGF5b3V0VGVzdENvbnRyb2xsZXJXaW4uY3BwCmluZGV4IGQ4ZGUyYjkz MDgyMjIyZWM5ZDY4MmFhNjU3YTZkMTM2ZmNmNjhhZmUuLmI5NzQxNzBiMjJjMWVjZGExNDBhZDEx Y2UzMTU2YzExZjIyMzhjOTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9M YXlvdXRUZXN0Q29udHJvbGxlcldpbi5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2lu L0xheW91dFRlc3RDb250cm9sbGVyV2luLmNwcApAQCAtMTUzMCwzICsxNTMwLDIwIEBAIHZvaWQg TGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFRleHREaXJlY3Rpb24oSlNTdHJpbmdSZWYgZGlyZWN0 aW9uKQogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6YWxsb3dSb3VuZGluZ0hhY2tzKCkKIHsK IH0KKwordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0SGl4aWU3NldlYlNvY2tldFByb3Rv Y29sRW5hYmxlZChib29sIGVuYWJsZWQpCit7CisgICAgQ09NUHRyPElXZWJWaWV3PiB3ZWJWaWV3 OworICAgIGlmIChGQUlMRUQoZnJhbWUtPndlYlZpZXcoJndlYlZpZXcpKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgQ09NUHRyPElXZWJQcmVmZXJlbmNlcz4gcHJlZmVyZW5jZXM7CisgICAgaWYg KEZBSUxFRCh3ZWJWaWV3LT5wcmVmZXJlbmNlcygmcHJlZmVyZW5jZXMpKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgQ09NUHRyPElXZWJQcmVmZXJlbmNlc1ByaXZhdGU+IHByZWZzUHJpdmF0ZShR dWVyeSwgcHJlZmVyZW5jZXMpOworICAgIGlmICghcHJlZnNQcml2YXRlKQorICAgICAgICByZXR1 cm47CisKKyAgICBwcmVmc1ByaXZhdGUtPnNldEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJs ZWQoZW5hYmxlZCk7Cit9CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93eC9MYXlv dXRUZXN0Q29udHJvbGxlcld4LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRl c3RDb250cm9sbGVyV3guY3BwCmluZGV4IDYzMDBjYzU3OWIwOThiYTkxZjllYzYzNDYzNjJkZGU3 NGYzMzVmMzMuLmE2YzkwYTUxODVkOGUzYTlkOGE2NzkzNmQ3NjQ4ZDkxMzg0ZWYwYjYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRlc3RDb250cm9sbGVyV3guY3Bw CisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRlc3RDb250cm9sbGVyV3guY3Bw CkBAIC02MzksMyArNjM5LDggQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0VGV4dERp cmVjdGlvbihKU1N0cmluZ1JlZiBkaXJlY3Rpb24pCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVy OjphbGxvd1JvdW5kaW5nSGFja3MoKQogewogfQorCit2b2lkIExheW91dFRlc3RDb250cm9sbGVy OjpzZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkKGJvb2wpCit7CisgICAgLy8gRklY TUU6IEltcGxlbWVudC4KK30K 99060 2011-06-29 02:41:28 -0700 2011-06-29 20:40:14 -0700 Patch v2 bug-63532-20110629184126.patch text/plain 5664 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogODk5NjcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OGU4ZjEwMmJlNTdlYjdlZWVjOTdlMmE5MmYyMTk0ZTE0 Y2M2ZGI1Li5iMzE1MmFkMzEyNTEzODAxZjI3YjZmZTM5YTRlZTU3YWMzYWI0MGI2IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTEtMDYtMjkgIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRFJUOiBNYWtlIEhp eGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQgcHJlZmVyZW5jZSBmbGFnIGNvbmZpZ3VyYWJs ZSBmcm9tIExheW91dFRlc3RDb250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MzUzMgorCisgICAgICAgIExheW91dFRlc3RDb250cm9sbGVy OjpvdmVycmlkZVByZWZlcmVuY2UoKSB3aWxsIGJlIHVzZWQgdG8gY2hhbmdlIHRoZSB2YWx1ZSBv ZgorICAgICAgICB0aGUgSGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCBwcmVmZXJlbmNl IGZsYWcgZnJvbSBsYXlvdXQgdGVzdHMuIEluIHRoaXMgd2F5LAorICAgICAgICB3ZSBjYW4gYXZv aWQgd3JpdGluZyBhIGxvdCBvZiBib2lsZXJwbGF0ZSBjb2RlIGluIGVhY2ggcG9ydCdzIER1bXBS ZW5kZXJUcmVlLCBidXQKKyAgICAgICAgYXQgbGVhc3Qgd2UgbmVlZCB0byByZXNldCBwcmVmZXJl bmNlIHZhbHVlcyBpbiBEdW1wUmVuZGVyVHJlZSBldmVyeSB0aW1lIHdlIHN0YXJ0CisgICAgICAg IGEgbmV3IHRlc3QgYmVjYXVzZSBwcmVmZXJlbmNlIHZhbHVlcyBjaGFuZ2VkIGluIHNvbWUgdGVz dCBzaG91bGQgbm90IGJlIGxlYWtlZAorICAgICAgICB0byB0aGUgbmV4dCB0ZXN0LgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwOgor ICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZSk6CisgICAg ICAgIFRoZSBuYW1lIG9mIHByZWZlcmVuY2Uga2V5IGlzIGRlZmluZWQgaW4gV2ViS2l0L3ttYWMv V2ViVmlldyx3aW59L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oLgorICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdlYlByZWZl cmVuY2VzOjpyZXNldCk6CisgICAgICAgIFNldCB0aGUgZGVmYXVsdCB2YWx1ZS4gVGhpcyB3aWxs IGJlIGNhbGxlZCBmcm9tIFRlc3RTaGVsbDo6cmVzZXRUZXN0Q29udHJvbGxlcigpLgorICAgICAg ICAoV2ViUHJlZmVyZW5jZXM6OmFwcGx5VG8pOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2No cm9taXVtL1dlYlByZWZlcmVuY2VzLmg6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1 bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAocmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVl cyk6IFNldCB0aGUgZGVmYXVsdCB2YWx1ZS4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4v RHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAocmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZh bHVlcyk6IERpdHRvLgorCiAyMDExLTA2LTI4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAKaW5kZXgg YjU4YTk0NDQ4Njg1YThkMjg0MzM1NTYwY2ZmZjBiNGFlM2IxYjY3Yy4uYmY3ZjNiYjJiNDg2OWUw MDE3OWM2OTBmNDU0NWYxNTU0YzJiODhiNSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmNwcApAQCAtMTQyNSw2ICsxNDI1 LDggQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKGNvbnN0 IENwcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLAogICAgICAgICBwcmVmcy0+YWxsb3dEaXNwbGF5 T2ZJbnNlY3VyZUNvbnRlbnQgPSBjcHBWYXJpYW50VG9Cb29sKHZhbHVlKTsKICAgICBlbHNlIGlm IChrZXkgPT0gIldlYktpdEFsbG93UnVubmluZ0luc2VjdXJlQ29udGVudCIpCiAgICAgICAgIHBy ZWZzLT5hbGxvd1J1bm5pbmdPZkluc2VjdXJlQ29udGVudCA9IGNwcFZhcmlhbnRUb0Jvb2wodmFs dWUpOworICAgIGVsc2UgaWYgKGtleSA9PSAiV2ViS2l0SGl4aWU3NldlYlNvY2tldFByb3RvY29s RW5hYmxlZCIpCisgICAgICAgIHByZWZzLT5oaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVk ID0gY3BwVmFyaWFudFRvQm9vbCh2YWx1ZSk7CiAgICAgZWxzZSB7CiAgICAgICAgIHN0cmluZyBt ZXNzYWdlKCJJbnZhbGlkIG5hbWUgZm9yIHByZWZlcmVuY2U6ICIpOwogICAgICAgICBtZXNzYWdl LmFwcGVuZChrZXkpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v V2ViUHJlZmVyZW5jZXMuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJl ZmVyZW5jZXMuY3BwCmluZGV4IDA2ODA5NjY4Njk4YWRlMzYxOGRhZmEyNzBlYzg2MmNjZDQxMGYw OTEuLjAxMTFmYTJhYWFhODgyNjE0YTQ5MzBlNzg3ODBkNGI2Zjc2MGU3MDcgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmNwcAorKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAKQEAgLTExMCw2 ICsxMTAsNyBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjpyZXNldCgpCiAgICAgbGVnYWN5QWNjZWxl cmF0ZWQyZENhbnZhc0VuYWJsZWQgPSBmYWxzZTsKICAgICBhY2NlbGVyYXRlZERyYXdpbmdFbmFi bGVkID0gZmFsc2U7CiAgICAgZm9yY2VDb21wb3NpdGluZ01vZGUgPSBmYWxzZTsKKyAgICBoaXhp ZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkID0gdHJ1ZTsKIH0KIAogdm9pZCBXZWJQcmVmZXJl bmNlczo6YXBwbHlUbyhXZWJWaWV3KiB3ZWJWaWV3KQpAQCAtMTYyLDYgKzE2Myw3IEBAIHZvaWQg V2ViUHJlZmVyZW5jZXM6OmFwcGx5VG8oV2ViVmlldyogd2ViVmlldykKICAgICBzZXR0aW5ncy0+ c2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQp OwogICAgIHNldHRpbmdzLT5zZXRMZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChsZWdh Y3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCk7CiAgICAgc2V0dGluZ3MtPnNldEFjY2VsZXJh dGVkRHJhd2luZ0VuYWJsZWQoYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCk7CisgICAgc2V0dGlu Z3MtPnNldEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQoaGl4aWU3NldlYlNvY2tldFBy b3RvY29sRW5hYmxlZCk7CiAKICAgICAvLyBGaXhlZCB2YWx1ZXMuCiAgICAgc2V0dGluZ3MtPnNl dFNob3VsZFBhaW50Q3VzdG9tU2Nyb2xsYmFycyh0cnVlKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmggYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5oCmluZGV4IDM4ZmI1NTc3MzM1ZDE4ZDUwNzRh NzEwYzY2MTg1ZTgxODdhNjc4N2EuLjU4M2VlMjE2YzU3YzRkZjRjYmFjYWRjNzM4NDY2N2NlMjVk NWVkYWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZl cmVuY2VzLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5j ZXMuaApAQCAtODUsNiArODUsNyBAQCBzdHJ1Y3QgV2ViUHJlZmVyZW5jZXMgewogICAgIGJvb2wg YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7CiAgICAgYm9vbCBsZWdhY3lBY2NlbGVyYXRlZDJk Q2FudmFzRW5hYmxlZDsKICAgICBib29sIGFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQ7CisgICAg Ym9vbCBoaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkOwogCiAgICAgV2ViUHJlZmVyZW5j ZXMoKSB7IHJlc2V0KCk7IH0KICAgICB2b2lkIHJlc2V0KCk7CmRpZmYgLS1naXQgYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KaW5kZXggYzQwZDhiOTc0ZmUyMDViMzcyM2M4OGUzZmZj M2Y0MWNiZWU4MzRlMC4uMmFiMmQ2YTI4YmZhYjFmNGQzNDE4ODA1YTdhYzQ4ZDk2MWQwMDFmOSAx MDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisr KyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtNDc3LDYg KzQ3Nyw3IEBAIHN0YXRpYyB2b2lkIHJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMoKQog ICAgIFtwcmVmZXJlbmNlcyBzZXRXZWJHTEVuYWJsZWQ6Tk9dOwogICAgIFtwcmVmZXJlbmNlcyBz ZXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrczpOT107CiAgICAgW3ByZWZlcmVuY2VzIHNldEFzeW5j aHJvbm91c1NwZWxsQ2hlY2tpbmdFbmFibGVkOk5PXTsKKyAgICBbcHJlZmVyZW5jZXMgc2V0SGl4 aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZDpZRVNdOwogCiAgICAgW1tOU0hUVFBDb29raWVT dG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBzZXRDb29raWVBY2NlcHRQb2xpY3k6TlNI VFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW5dOwogICAgIApk aWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcCBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHAKaW5kZXggMmRiNDNk YTQyZGZlMmExMjY1Nzc3MTQ1ZGYyYjRjYTUyMTlkMGEwZi4uM2Y5ZmY3Y2NhNDRlZjg0N2Q2ZTY4 NDY3MTlkMzNlODUwNTNmMzA4ZSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2lu L0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJl bmRlclRyZWUuY3BwCkBAIC04NzcsNiArODc3LDcgQEAgc3RhdGljIHZvaWQgcmVzZXREZWZhdWx0 c1RvQ29uc2lzdGVudFZhbHVlcyhJV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQogICAgICAg ICBwcmVmc1ByaXZhdGUtPnNldEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoRkFMU0UpOwogICAgICAg ICBwcmVmc1ByaXZhdGUtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChUUlVF KTsKICAgICAgICAgcHJlZnNQcml2YXRlLT5zZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VM b2FkaW5nUHJlZmVyZW5jZShGQUxTRSk7CisgICAgICAgIHByZWZzUHJpdmF0ZS0+c2V0SGl4aWU3 NldlYlNvY2tldFByb3RvY29sRW5hYmxlZChUUlVFKTsKICAgICB9CiAgICAgc2V0QWx3YXlzQWNj ZXB0Q29va2llcyhmYWxzZSk7CiAK