25911 2009-05-21 00:23:43 -0700 Apply href in base elements to anchors shown on the source viewer 2009-05-31 19:37:08 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows Vista RESOLVED FIXED P2 Normal --- 0 tyoshino levin ap oldest_to_newest 122262 0 tyoshino 2009-05-21 00:23:43 -0700 In rendering HTML sources, parse base elements to apply the base URI to anchors shown on the source viewer. This issue was originally reported to the Chromium issue tracker. http://code.google.com/p/chromium/issues/detail?id=2418 122264 1 30523 tyoshino 2009-05-21 00:32:16 -0700 Created attachment 30523 Proposed fix for 25911 122270 2 30523 tyoshino 2009-05-21 00:47:22 -0700 Comment on attachment 30523 Proposed fix for 25911 Hi, Could someone review this fix? Thanks, 122336 3 ap 2009-05-21 06:07:40 -0700 Even after running WebKit with this patch applied, I don't see any changes in Web Inspector. Is this supposed to do something for Safari, or only for Chrome? 122532 4 tyoshino 2009-05-21 21:18:12 -0700 (In reply to comment #3) > Even after running WebKit with this patch applied, I don't see any changes in > Web Inspector. Is this supposed to do something for Safari, or only for Chrome? > Thank you for review. We can click URLs of anchors' href values in Chrome's source viewer. Not inspector. It uses HTMLViewSourceDocument to render sources. I didn't intended to improve something in Safari and I didn't know where HTMLViewSourceDocument is used in Safari. But I found that the resources tab in Safari Web Inspector also uses HTMLViewSourceDocument (Element tab doesn't) after your comment. Yes, there must be some change on the behavior of anchors in the resource tab when I view http://backup.gene-it.nl/welcome/persoonsgegevens since this document contains a base element. Actually, after patching this fix, the result of "Copy Link" changes. For example, the result for gene_global.css change from file:///Users/testing/webkit_trunk/WebKitBuild/Release/WebCore.framework/Resources/inspector/gene_global.css to http://backup.gene-it.nl/gene_global.css . This is a side effect of my patch. It's a new bug that we cannot "Copy Link" on the resource tab correctly (file:/// ... /inspector returns). 122550 5 mjs 2009-05-21 22:54:14 -0700 Are the described changes regressions or improvements? 122560 6 tyoshino 2009-05-21 23:42:12 -0700 It's not a regression. It's a little improvement. - For anchors with RELATIVE URLs in its href attribute on the Web Inspector -- For documents with base elements --- This is improvement not regression. We will be able to click them to switch to the resource in resource viewer and copy correct URLs from them. -- For documents with no base element --- This is neither improvement nor regression. There is no change on behavior. - For anchors with ABSOLUTE URLs in its href attribute on the Web Inspector: -- This is neither improvement nor regression. Anchors are now working well and still work well with this patch. 122650 7 30523 eric 2009-05-22 07:03:57 -0700 Comment on attachment 30523 Proposed fix for 25911 You should be able to make a test case using a viewsource attribute. <iframe viewsource src="data:text/html,<p>hello world</p>"></iframe> see fast/frames/viewsource-attribute.html r- for lack of test case. 123016 8 30644 tyoshino 2009-05-25 00:31:29 -0700 Created attachment 30644 Proposed fix for 25911 (rev2) Added a test following Eric's suggestion. Thank you. 123141 9 30644 darin 2009-05-26 09:16:28 -0700 Comment on attachment 30644 Proposed fix for 25911 (rev2) > + if (token->tagName == baseTag && equalIgnoringCase(attr->name().localName(), "href")) { I'm not sure why the code in this class checks attribute names in this inefficient way. In normal WebCore code we would just compare with hrefAttr using == instead. r=me 123240 10 30697 tyoshino 2009-05-26 23:30:25 -0700 Created attachment 30697 Proposed fix for 25911 (rev3) 123243 11 tyoshino 2009-05-26 23:39:14 -0700 (In reply to comment #9) > (From update of attachment 30644 [review]) > > + if (token->tagName == baseTag && equalIgnoringCase(attr->name().localName(), "href")) { > > I'm not sure why the code in this class checks attribute names in this > inefficient way. In normal WebCore code we would just compare with hrefAttr > using == instead. > > r=me > Thank you. After your comment, I investigated and understood the reason. In order to show HTML sources as is on the view-source window, HTMLTokenizer doesn't lower names when inViewSourceMode() is true. So, we have to lower names before comparison in HTMLViewSourceDocument class. Patch revision 2 was comparing tagName and baseTag case sensitively, so I updated to revision 3. Please take a look again. 123285 12 30697 darin 2009-05-27 07:38:38 -0700 Comment on attachment 30697 Proposed fix for 25911 (rev3) I think the test case should try both lowercase and uppercase, since the code has to be written carefully to be case insensitive. But even without that, r=me 123530 13 30769 tyoshino 2009-05-29 02:29:30 -0700 Created attachment 30769 Proposed fix for 25911 (rev4) Modified so that we can check the code works case-insensitively. 123640 14 levin 2009-05-29 16:06:53 -0700 Committed as http://trac.webkit.org/changeset/44278. 123770 15 tyoshino 2009-05-31 19:37:08 -0700 Thank you all. 30523 2009-05-21 00:32:16 -0700 2009-05-25 00:31:29 -0700 Proposed fix for 25911 25911.patch text/plain 2066 tyoshino SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQzOTYw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDUt MjEgIFRha2VzaGkgWW9zaGlubyAgPHR5b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDI1OTExOiBBcHBseSBocmVm IGluIGJhc2UgZWxlbWVudHMgdG8gYW5jaG9ycyBzaG93biBvbiB0aGUgc291cmNlIHZpZXdlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU5MTEKKwor ICAgICAgICBJbiByZW5kZXJpbmcgSFRNTCBzb3VyY2VzLCBwYXJzZSBiYXNlIGVsZW1lbnRzIHRv IGFwcGx5IHRoZSBiYXNlIFVSSSB0bworICAgICAgICBhbmNob3JzIHNob3duIG9uIHRoZSBzb3Vy Y2Ugdmlld2VyLgorCisgICAgICAgIFRoaXMgaXNzdWUgd2FzIG9yaWdpbmFsbHkgcmVwb3J0ZWQg dG8gdGhlIENocm9taXVtIGlzc3VlIHRyYWNrZXIuCisgICAgICAgIGh0dHA6Ly9jb2RlLmdvb2ds ZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lkPTI0MTgKKworICAgICAgICAqIGh0bWwv SFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1Nv dXJjZURvY3VtZW50OjphZGRWaWV3U291cmNlVG9rZW4pOgorCiAyMDA5LTA1LTIwICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBH bGF6a292LgpJbmRleDogaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBodG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCShyZXZpc2lvbiA0Mzk1OCkKKysr IGh0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MSw2 ICsxNTEsMTQgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jdXJyZW50ID0g c3RhdGljX2Nhc3Q8RWxlbWVudCo+KG1fY3VycmVudC0+cGFyZW50KCkpOwogICAgICAgICAgICAg ICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBT dHJpbmcmIHZhbHVlID0gYXR0ci0+dmFsdWUoKS5zdHJpbmcoKTsKKworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlmICh0b2tlbi0+dGFnTmFtZSA9PSBiYXNlVGFnICYmIGVxdWFsSWdub3Jp bmdDYXNlKGF0dHItPm5hbWUoKS5sb2NhbE5hbWUoKSwgImhyZWYiKSkgeworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAvLyBDYXRjaCB0aGUgaHJlZiBhdHRyaWJ1dGUgaW4gdGhlIGJh c2UgZWxlbWVudC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gSXQgd2lsbCBi ZSB1c2VkIGZvciByZW5kZXJpbmcgYW5jaG9ycyBjcmVhdGVkCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIGJ5IGFkZExpbmsoKSBiZWxvdy4KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2V0QmFzZUVsZW1lbnRVUkwoS1VSTCh1cmwoKSwgdmFsdWUpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv LyBGSVhNRTogWE1MIGNvdWxkIHVzZSBuYW1lc3BhY2UgcHJlZml4ZXMgYW5kIGNvbmZ1c2UgdXMu CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGF0dHIt Pm5hbWUoKS5sb2NhbE5hbWUoKSwgInNyYyIpIHx8IGVxdWFsSWdub3JpbmdDYXNlKGF0dHItPm5h bWUoKS5sb2NhbE5hbWUoKSwgImhyZWYiKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbV9jdXJyZW50ID0gYWRkTGluayh2YWx1ZSwgZXF1YWxJZ25vcmluZ0Nhc2UodG9rZW4tPnRh Z05hbWUsICJhIikpOwo= 30644 2009-05-25 00:31:29 -0700 2009-05-26 23:30:25 -0700 Proposed fix for 25911 (rev2) 25911_layout_test.patch text/plain 6517 tyoshino SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDEyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDUtMjUgIFRha2VzaGkgWW9zaGlubyAgPHR5b3NoaW5vQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQnVnIDI1OTExOiBBcHBseSBocmVmIGluIGJhc2UgZWxlbWVudHMgdG8gYW5jaG9ycyBzaG93 biBvbiB0aGUgc291cmNlIHZpZXdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjU5MTEKKworICAgICAgICBJbiByZW5kZXJpbmcgSFRNTCBzb3VyY2Vz LCBwYXJzZSBiYXNlIGVsZW1lbnRzIHRvIGFwcGx5IHRoZSBiYXNlIFVSSSB0bworICAgICAgICBh bmNob3JzIHNob3duIG9uIHRoZSBzb3VyY2Ugdmlld2VyLgorCisgICAgICAgIFRoaXMgaXNzdWUg d2FzIG9yaWdpbmFsbHkgcmVwb3J0ZWQgdG8gdGhlIENocm9taXVtIGlzc3VlIHRyYWNrZXIuCisg ICAgICAgIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lk PTI0MTgKKworICAgICAgICBUZXN0OiBmYXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmstb24taHJl Zi12YWx1ZS5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkVmlld1NvdXJj ZVRva2VuKToKKwogMjAwOS0wNS0yNCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KSW5kZXg6IFdlYkNvcmUvaHRtbC9I VE1MVmlld1NvdXJjZURvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRN TFZpZXdTb3VyY2VEb2N1bWVudC5jcHAJKHJldmlzaW9uIDQ0MTIxKQorKysgV2ViQ29yZS9odG1s L0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNiArMTUx LDE0IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fY3VycmVudCA9IHN0YXRp Y19jYXN0PEVsZW1lbnQqPihtX2N1cnJlbnQtPnBhcmVudCgpKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5n JiB2YWx1ZSA9IGF0dHItPnZhbHVlKCkuc3RyaW5nKCk7CisKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpZiAodG9rZW4tPnRhZ05hbWUgPT0gYmFzZVRhZyAmJiBlcXVhbElnbm9yaW5nQ2Fz ZShhdHRyLT5uYW1lKCkubG9jYWxOYW1lKCksICJocmVmIikpIHsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLy8gQ2F0Y2ggdGhlIGhyZWYgYXR0cmlidXRlIGluIHRoZSBiYXNlIGVs ZW1lbnQuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEl0IHdpbGwgYmUgdXNl ZCBmb3IgcmVuZGVyaW5nIGFuY2hvcnMgY3JlYXRlZAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBieSBhZGRMaW5rKCkgYmVsb3cuCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNldEJhc2VFbGVtZW50VVJMKEtVUkwodXJsKCksIHZhbHVlKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gRklY TUU6IFhNTCBjb3VsZCB1c2UgbmFtZXNwYWNlIHByZWZpeGVzIGFuZCBjb25mdXNlIHVzLgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShhdHRyLT5uYW1l KCkubG9jYWxOYW1lKCksICJzcmMiKSB8fCBlcXVhbElnbm9yaW5nQ2FzZShhdHRyLT5uYW1lKCku bG9jYWxOYW1lKCksICJocmVmIikpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1f Y3VycmVudCA9IGFkZExpbmsodmFsdWUsIGVxdWFsSWdub3JpbmdDYXNlKHRva2VuLT50YWdOYW1l LCAiYSIpKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ0MTIzKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDUtMjUgIFRha2VzaGkg WW9zaGlubyAgPHR5b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDI1OTExOiBBcHBseSBocmVmIGluIGJhc2UgZWxl bWVudHMgdG8gYW5jaG9ycyBzaG93biBvbiB0aGUgc291cmNlIHZpZXdlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU5MTEKKworICAgICAgICBJbiBy ZW5kZXJpbmcgSFRNTCBzb3VyY2VzLCBwYXJzZSBiYXNlIGVsZW1lbnRzIHRvIGFwcGx5IHRoZSBi YXNlIFVSSSB0bworICAgICAgICBhbmNob3JzIHNob3duIG9uIHRoZSBzb3VyY2Ugdmlld2VyLgor CisgICAgICAgIEFkZCB0ZXN0cyB0byB2ZXJpZnkgdGhpcyBjaGFuZ2UuCisKKyAgICAgICAgVGhp cyBpc3N1ZSB3YXMgb3JpZ2luYWxseSByZXBvcnRlZCB0byB0aGUgQ2hyb21pdW0gaXNzdWUgdHJh Y2tlci4KKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9k ZXRhaWw/aWQ9MjQxOAorCisgICAgICAgICogZmFzdC9mcmFtZXMvcmVzb3VyY2VzL3ZpZXdzb3Vy Y2UtZnJhbWUtMy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZyYW1lcy92aWV3c291cmNl LWxpbmstb24taHJlZi12YWx1ZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv ZnJhbWVzL3ZpZXdzb3VyY2UtbGluay1vbi1ocmVmLXZhbHVlLmh0bWw6IEFkZGVkLgorCiAyMDA5 LTA1LTIzICBKYW4gTWljaGFlbCBBbG9uem8gIDxqbWFsb256b0B3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEd1c3Rhdm8gTm9yb25oYSBhbmQgWGFuIExvcGV6LgpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9mcmFtZXMvdmlld3NvdXJjZS1saW5rLW9uLWhyZWYtdmFsdWUtZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3ZpZXdzb3VyY2Ut bGluay1vbi1ocmVmLXZhbHVlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL2Zhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtbGluay1vbi1ocmVmLXZhbHVlLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAorUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvZmFz dC9mcmFtZXMvdmlld3NvdXJjZS1saW5rLW9uLWhyZWYtdmFsdWUuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmstb24taHJlZi12YWx1ZS5o dG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvdmlld3NvdXJjZS1s aW5rLW9uLWhyZWYtdmFsdWUuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw2MCBAQAorPGh0 bWw+DQorPCEtLSBUaGlzIHRlc3RzIHRoYXQgYSBiYXNlIGVsZW1lbnQgaXMgcmVzcGVjdGVkIGlu IHJlbmRlcmluZyBhbmNob3JzIG9uIHZpZXdzb3VyY2UgcGFnZS4gLS0+DQorPGhlYWQ+DQorPHNj cmlwdD4NCisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgew0KKyAgICAgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOw0KKyAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOw0KKyAgICB9DQorDQorICAgIGZ1bmN0aW9uIHJlcG9y dChmcmFtZSkgew0KKyAgICAgICAgLy8gVXBkYXRlIHRoaXMgbGlzdCB3aGVuIHlvdSBtb2RpZmll ZCByZXNvdXJjZXMvdmlld3NvdXJjZS1mcmFtZS0zLmh0bWwgLg0KKyAgICAgICAgdmFyIGV4cGVj dGVkID0gWw0KKyAgICAgICAgICAgIC8vIFRoaXMgd2lsbCBiZSBtYXRjaGVkIHdpdGggdGhlIGhy ZWYgaW4gdGhlIGJhc2UgZWxlbWVudC4NCisgICAgICAgICAgICBbICJodHRwOi8vZXhhbXBsZS5v cmcvZm9vLyIsICJodHRwOi8vZXhhbXBsZS5vcmcvZm9vLyIgXSwNCisgICAgICAgICAgICBbICJi YXIiLCAiaHR0cDovL2V4YW1wbGUub3JnL2Zvby9iYXIiIF0sDQorICAgICAgICAgICAgWyAiL2Jh ciIsICJodHRwOi8vZXhhbXBsZS5vcmcvYmFyIiBdLA0KKyAgICAgICAgICAgIC8vIFRoaXMgc2hv dWxkbid0IGJlIGFmZmVjdGVkLg0KKyAgICAgICAgICAgIFsgImh0dHA6Ly9leGFtcGxlLm9yZy9m b29iYXIiLCAiaHR0cDovL2V4YW1wbGUub3JnL2Zvb2JhciIgXQ0KKyAgICAgICAgXTsNCisNCisg ICAgICAgIHZhciByZXN1bHRUZXh0ID0gIkZBSUwiOw0KKyAgICAgICAgdmFyIGVsZW1lbnRzID0g ZnJhbWUuY29udGVudERvY3VtZW50LmRvY3VtZW50RWxlbWVudC5nZXRFbGVtZW50c0J5VGFnTmFt ZSgiYSIpOw0KKyAgICAgICAgaWYgKGVsZW1lbnRzICYmIGVsZW1lbnRzLmxlbmd0aCA9PT0gNCkg ew0KKyAgICAgICAgICAgIHZhciBvayA9IHRydWU7DQorICAgICAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7ICsraSkgew0KKyAgICAgICAgICAgICAgICB2YXIgZWxl bWVudCA9IGVsZW1lbnRzLml0ZW0oaSk7DQorICAgICAgICAgICAgICAgIGlmIChlbGVtZW50Lmlu bmVySFRNTCAhPT0gZXhwZWN0ZWRbaV1bMF0gfHwgZWxlbWVudC5ocmVmICE9PSBleHBlY3RlZFtp XVsxXSkgew0KKyAgICAgICAgICAgICAgICAgICAgb2sgPSBmYWxzZTsNCisgICAgICAgICAgICAg ICAgICAgIGJyZWFrOw0KKyAgICAgICAgICAgICAgICB9DQorICAgICAgICAgICAgfQ0KKyAgICAg ICAgICAgIGlmIChvaykgew0KKyAgICAgICAgICAgICAgICByZXN1bHRUZXh0ID0gIlBBU1MiOw0K KyAgICAgICAgICAgIH0NCisgICAgICAgIH0NCisNCisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpIHsNCisgICAgICAgICAgICBkb2N1bWVudC5vcGVuKCk7DQorICAgICAg ICAgICAgZG9jdW1lbnQud3JpdGUocmVzdWx0VGV4dCk7DQorICAgICAgICAgICAgZG9jdW1lbnQu Y2xvc2UoKTsNCisNCisgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25l KCk7DQorICAgICAgICB9IGVsc2Ugew0KKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJyZXN1bHQiKS50ZXh0Q29udGVudCA9IHJlc3VsdFRleHQ7DQorICAgICAgICB9DQorICAg IH0NCis8L3NjcmlwdD4NCis8L2hlYWQ+DQorPGJvZHk+DQorPHA+DQorSW4gYSBmcmFtZSBiZWxv dyB3aGljaCBpcyBpbiAndmlldyBzb3VyY2UnIG1vZGUsIGVhY2ggbGluayBvbiB0aGUgdmFsdWUg b2YgdGhlDQoraHJlZiBhdHRyaWJ1dGUgaW4gYW5jaG9yIGVsZW1lbnRzIG11c3QgaGF2ZSB0aGUg c2FtZSBhZGRyZXNzIGFzIHRoZSBhbmNob3INCitlbGVtZW50J3MgY29udGVudHMuDQorPC9wPg0K Kzxocj4NCis8aWZyYW1lIHZpZXdzb3VyY2Ugc3JjPSJyZXNvdXJjZXMvdmlld3NvdXJjZS1mcmFt ZS0zLmh0bWwiIHdpZHRoPSI2MDAiIG9ubG9hZD0icmVwb3J0KHRoaXMpIj48L2lmcmFtZT4NCis8 aHI+DQorPGRpdiBpZD0icmVzdWx0Ij48L2Rpdj4NCis8L2JvZHk+DQorPC9odG1sPg0KSW5kZXg6 IExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy92aWV3c291cmNlLWZyYW1lLTMuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvdmlld3Nv dXJjZS1mcmFtZS0zLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1l cy9yZXNvdXJjZXMvdmlld3NvdXJjZS1mcmFtZS0zLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsNiBAQAorPGhlYWQ+PGJhc2UgaHJlZj0iaHR0cDovL2V4YW1wbGUub3JnL2Zvby8iPjwvaGVh ZD4NCis8Ym9keT4NCis8YSBocmVmPSJiYXIiPmh0dHA6Ly9leGFtcGxlLm9yZy9mb28vYmFyPC9h Pjxicj4NCis8YSBocmVmPSIvYmFyIj5odHRwOi8vZXhhbXBsZS5vcmcvYmFyPC9hPjxicj4NCis8 YSBocmVmPSJodHRwOi8vZXhhbXBsZS5vcmcvZm9vYmFyIj5odHRwOi8vZXhhbXBsZS5vcmcvZm9v YmFyPC9hPg0KKzwvYm9keT4NCg== 30697 2009-05-26 23:30:25 -0700 2009-05-29 02:29:30 -0700 Proposed fix for 25911 (rev3) 25911_layout_test_rev3.patch text/plain 6741 tyoshino SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDEyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDUtMjUgIFRha2VzaGkgWW9zaGlubyAgPHR5b3NoaW5vQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQnVnIDI1OTExOiBBcHBseSBocmVmIGluIGJhc2UgZWxlbWVudHMgdG8gYW5jaG9ycyBzaG93 biBvbiB0aGUgc291cmNlIHZpZXdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjU5MTEKKworICAgICAgICBJbiByZW5kZXJpbmcgSFRNTCBzb3VyY2Vz LCBwYXJzZSBiYXNlIGVsZW1lbnRzIHRvIGFwcGx5IHRoZSBiYXNlIFVSSSB0bworICAgICAgICBh bmNob3JzIHNob3duIG9uIHRoZSBzb3VyY2Ugdmlld2VyLgorCisgICAgICAgIFRoaXMgaXNzdWUg d2FzIG9yaWdpbmFsbHkgcmVwb3J0ZWQgdG8gdGhlIENocm9taXVtIGlzc3VlIHRyYWNrZXIuCisg ICAgICAgIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lk PTI0MTgKKworICAgICAgICBUZXN0OiBmYXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmstb24taHJl Zi12YWx1ZS5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkVmlld1NvdXJj ZVRva2VuKToKKwogMjAwOS0wNS0yNCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KSW5kZXg6IFdlYkNvcmUvaHRtbC9I VE1MVmlld1NvdXJjZURvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRN TFZpZXdTb3VyY2VEb2N1bWVudC5jcHAJKHJldmlzaW9uIDQ0MTIxKQorKysgV2ViQ29yZS9odG1s L0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNiArMTUx LDE3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fY3VycmVudCA9IHN0YXRp Y19jYXN0PEVsZW1lbnQqPihtX2N1cnJlbnQtPnBhcmVudCgpKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5n JiB2YWx1ZSA9IGF0dHItPnZhbHVlKCkuc3RyaW5nKCk7CisKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBDb21wYXJlIGlnbm9yaW5nIGNhc2Ugc2luY2UgSFRNTFRva2VuaXplciBkb2Vz bid0CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbG93ZXIgbmFtZXMgd2hlbiBwYXNz aW5nIGluIHRva2VucyB0bworICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEhUTUxWaWV3 U291cmNlRG9jdW1lbnQuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVxdWFsSWdu b3JpbmdDYXNlKHRva2VuLT50YWdOYW1lLCAiYmFzZSIpICYmIGVxdWFsSWdub3JpbmdDYXNlKGF0 dHItPm5hbWUoKS5sb2NhbE5hbWUoKSwgImhyZWYiKSkgeworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAvLyBDYXRjaCB0aGUgaHJlZiBhdHRyaWJ1dGUgaW4gdGhlIGJhc2UgZWxlbWVu dC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gSXQgd2lsbCBiZSB1c2VkIGZv ciByZW5kZXJpbmcgYW5jaG9ycyBjcmVhdGVkCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIGJ5IGFkZExpbmsoKSBiZWxvdy4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2V0QmFzZUVsZW1lbnRVUkwoS1VSTCh1cmwoKSwgdmFsdWUpKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTog WE1MIGNvdWxkIHVzZSBuYW1lc3BhY2UgcHJlZml4ZXMgYW5kIGNvbmZ1c2UgdXMuCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGF0dHItPm5hbWUoKS5s b2NhbE5hbWUoKSwgInNyYyIpIHx8IGVxdWFsSWdub3JpbmdDYXNlKGF0dHItPm5hbWUoKS5sb2Nh bE5hbWUoKSwgImhyZWYiKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jdXJy ZW50ID0gYWRkTGluayh2YWx1ZSwgZXF1YWxJZ25vcmluZ0Nhc2UodG9rZW4tPnRhZ05hbWUsICJh IikpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDQxMjMpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0wNS0yNSAgVGFrZXNoaSBZb3No aW5vICA8dHlvc2hpbm9AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBCdWcgMjU5MTE6IEFwcGx5IGhyZWYgaW4gYmFzZSBlbGVtZW50 cyB0byBhbmNob3JzIHNob3duIG9uIHRoZSBzb3VyY2Ugdmlld2VyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTkxMQorCisgICAgICAgIEluIHJlbmRl cmluZyBIVE1MIHNvdXJjZXMsIHBhcnNlIGJhc2UgZWxlbWVudHMgdG8gYXBwbHkgdGhlIGJhc2Ug VVJJIHRvCisgICAgICAgIGFuY2hvcnMgc2hvd24gb24gdGhlIHNvdXJjZSB2aWV3ZXIuCisKKyAg ICAgICAgQWRkIHRlc3RzIHRvIHZlcmlmeSB0aGlzIGNoYW5nZS4KKworICAgICAgICBUaGlzIGlz c3VlIHdhcyBvcmlnaW5hbGx5IHJlcG9ydGVkIHRvIHRoZSBDaHJvbWl1bSBpc3N1ZSB0cmFja2Vy LgorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFp bD9pZD0yNDE4CisKKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9yZXNvdXJjZXMvdmlld3NvdXJjZS1m cmFtZS0zLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtbGlu ay1vbi1ocmVmLXZhbHVlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9mcmFt ZXMvdmlld3NvdXJjZS1saW5rLW9uLWhyZWYtdmFsdWUuaHRtbDogQWRkZWQuCisKIDIwMDktMDUt MjMgIEphbiBNaWNoYWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIGFuZCBYYW4gTG9wZXouCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmstb24taHJlZi12YWx1ZS1leHBlY3RlZC50 eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvdmlld3NvdXJjZS1saW5r LW9uLWhyZWYtdmFsdWUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv ZmFzdC9mcmFtZXMvdmlld3NvdXJjZS1saW5rLW9uLWhyZWYtdmFsdWUtZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBACitQQVNTCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Zy YW1lcy92aWV3c291cmNlLWxpbmstb24taHJlZi12YWx1ZS5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtbGluay1vbi1ocmVmLXZhbHVlLmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmst b24taHJlZi12YWx1ZS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYwIEBACis8aHRtbD4N Cis8IS0tIFRoaXMgdGVzdHMgdGhhdCBhIGJhc2UgZWxlbWVudCBpcyByZXNwZWN0ZWQgaW4gcmVu ZGVyaW5nIGFuY2hvcnMgb24gdmlld3NvdXJjZSBwYWdlLiAtLT4NCis8aGVhZD4NCis8c2NyaXB0 Pg0KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7DQorICAgICAgICBsYXlv dXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7DQorICAgICAgICBsYXlvdXRUZXN0Q29udHJv bGxlci53YWl0VW50aWxEb25lKCk7DQorICAgIH0NCisNCisgICAgZnVuY3Rpb24gcmVwb3J0KGZy YW1lKSB7DQorICAgICAgICAvLyBVcGRhdGUgdGhpcyBsaXN0IHdoZW4geW91IG1vZGlmaWVkIHJl c291cmNlcy92aWV3c291cmNlLWZyYW1lLTMuaHRtbCAuDQorICAgICAgICB2YXIgZXhwZWN0ZWQg PSBbDQorICAgICAgICAgICAgLy8gVGhpcyB3aWxsIGJlIG1hdGNoZWQgd2l0aCB0aGUgaHJlZiBp biB0aGUgYmFzZSBlbGVtZW50Lg0KKyAgICAgICAgICAgIFsgImh0dHA6Ly9leGFtcGxlLm9yZy9m b28vIiwgImh0dHA6Ly9leGFtcGxlLm9yZy9mb28vIiBdLA0KKyAgICAgICAgICAgIFsgImJhciIs ICJodHRwOi8vZXhhbXBsZS5vcmcvZm9vL2JhciIgXSwNCisgICAgICAgICAgICBbICIvYmFyIiwg Imh0dHA6Ly9leGFtcGxlLm9yZy9iYXIiIF0sDQorICAgICAgICAgICAgLy8gVGhpcyBzaG91bGRu J3QgYmUgYWZmZWN0ZWQuDQorICAgICAgICAgICAgWyAiaHR0cDovL2V4YW1wbGUub3JnL2Zvb2Jh ciIsICJodHRwOi8vZXhhbXBsZS5vcmcvZm9vYmFyIiBdDQorICAgICAgICBdOw0KKw0KKyAgICAg ICAgdmFyIHJlc3VsdFRleHQgPSAiRkFJTCI7DQorICAgICAgICB2YXIgZWxlbWVudHMgPSBmcmFt ZS5jb250ZW50RG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJh Iik7DQorICAgICAgICBpZiAoZWxlbWVudHMgJiYgZWxlbWVudHMubGVuZ3RoID09PSA0KSB7DQor ICAgICAgICAgICAgdmFyIG9rID0gdHJ1ZTsNCisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IGVsZW1lbnRzLmxlbmd0aDsgKytpKSB7DQorICAgICAgICAgICAgICAgIHZhciBlbGVtZW50 ID0gZWxlbWVudHMuaXRlbShpKTsNCisgICAgICAgICAgICAgICAgaWYgKGVsZW1lbnQuaW5uZXJI VE1MICE9PSBleHBlY3RlZFtpXVswXSB8fCBlbGVtZW50LmhyZWYgIT09IGV4cGVjdGVkW2ldWzFd KSB7DQorICAgICAgICAgICAgICAgICAgICBvayA9IGZhbHNlOw0KKyAgICAgICAgICAgICAgICAg ICAgYnJlYWs7DQorICAgICAgICAgICAgICAgIH0NCisgICAgICAgICAgICB9DQorICAgICAgICAg ICAgaWYgKG9rKSB7DQorICAgICAgICAgICAgICAgIHJlc3VsdFRleHQgPSAiUEFTUyI7DQorICAg ICAgICAgICAgfQ0KKyAgICAgICAgfQ0KKw0KKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikgew0KKyAgICAgICAgICAgIGRvY3VtZW50Lm9wZW4oKTsNCisgICAgICAgICAg ICBkb2N1bWVudC53cml0ZShyZXN1bHRUZXh0KTsNCisgICAgICAgICAgICBkb2N1bWVudC5jbG9z ZSgpOw0KKw0KKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsN CisgICAgICAgIH0gZWxzZSB7DQorICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InJlc3VsdCIpLnRleHRDb250ZW50ID0gcmVzdWx0VGV4dDsNCisgICAgICAgIH0NCisgICAgfQ0K Kzwvc2NyaXB0Pg0KKzwvaGVhZD4NCis8Ym9keT4NCis8cD4NCitJbiBhIGZyYW1lIGJlbG93IHdo aWNoIGlzIGluICd2aWV3IHNvdXJjZScgbW9kZSwgZWFjaCBsaW5rIG9uIHRoZSB2YWx1ZSBvZiB0 aGUNCitocmVmIGF0dHJpYnV0ZSBpbiBhbmNob3IgZWxlbWVudHMgbXVzdCBoYXZlIHRoZSBzYW1l IGFkZHJlc3MgYXMgdGhlIGFuY2hvcg0KK2VsZW1lbnQncyBjb250ZW50cy4NCis8L3A+DQorPGhy Pg0KKzxpZnJhbWUgdmlld3NvdXJjZSBzcmM9InJlc291cmNlcy92aWV3c291cmNlLWZyYW1lLTMu aHRtbCIgd2lkdGg9IjYwMCIgb25sb2FkPSJyZXBvcnQodGhpcykiPjwvaWZyYW1lPg0KKzxocj4N Cis8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2Pg0KKzwvYm9keT4NCis8L2h0bWw+DQpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVzb3VyY2VzL3ZpZXdzb3VyY2UtZnJhbWUtMy5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy92aWV3c291cmNl LWZyYW1lLTMuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3Jl c291cmNlcy92aWV3c291cmNlLWZyYW1lLTMuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw2 IEBACis8aGVhZD48YmFzZSBocmVmPSJodHRwOi8vZXhhbXBsZS5vcmcvZm9vLyI+PC9oZWFkPg0K Kzxib2R5Pg0KKzxhIGhyZWY9ImJhciI+aHR0cDovL2V4YW1wbGUub3JnL2Zvby9iYXI8L2E+PGJy Pg0KKzxhIGhyZWY9Ii9iYXIiPmh0dHA6Ly9leGFtcGxlLm9yZy9iYXI8L2E+PGJyPg0KKzxhIGhy ZWY9Imh0dHA6Ly9leGFtcGxlLm9yZy9mb29iYXIiPmh0dHA6Ly9leGFtcGxlLm9yZy9mb29iYXI8 L2E+DQorPC9ib2R5Pg0K 30769 2009-05-29 02:29:30 -0700 2009-05-29 11:52:28 -0700 Proposed fix for 25911 (rev4) 25911_layout_test_rev4.patch text/plain 7658 tyoshino SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDEyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDUtMjUgIFRha2VzaGkgWW9zaGlubyAgPHR5b3NoaW5vQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQnVnIDI1OTExOiBBcHBseSBocmVmIGluIGJhc2UgZWxlbWVudHMgdG8gYW5jaG9ycyBzaG93 biBvbiB0aGUgc291cmNlIHZpZXdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjU5MTEKKworICAgICAgICBJbiByZW5kZXJpbmcgSFRNTCBzb3VyY2Vz LCBwYXJzZSBiYXNlIGVsZW1lbnRzIHRvIGFwcGx5IHRoZSBiYXNlIFVSSSB0bworICAgICAgICBh bmNob3JzIHNob3duIG9uIHRoZSBzb3VyY2Ugdmlld2VyLgorCisgICAgICAgIFRoaXMgaXNzdWUg d2FzIG9yaWdpbmFsbHkgcmVwb3J0ZWQgdG8gdGhlIENocm9taXVtIGlzc3VlIHRyYWNrZXIuCisg ICAgICAgIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lk PTI0MTgKKworICAgICAgICBUZXN0OiBmYXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmstb24taHJl Zi12YWx1ZS5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkVmlld1NvdXJj ZVRva2VuKToKKwogMjAwOS0wNS0yNCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KSW5kZXg6IFdlYkNvcmUvaHRtbC9I VE1MVmlld1NvdXJjZURvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRN TFZpZXdTb3VyY2VEb2N1bWVudC5jcHAJKHJldmlzaW9uIDQ0MTIxKQorKysgV2ViQ29yZS9odG1s L0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNiArMTUx LDE3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fY3VycmVudCA9IHN0YXRp Y19jYXN0PEVsZW1lbnQqPihtX2N1cnJlbnQtPnBhcmVudCgpKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5n JiB2YWx1ZSA9IGF0dHItPnZhbHVlKCkuc3RyaW5nKCk7CisKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBDb21wYXJlIGlnbm9yaW5nIGNhc2Ugc2luY2UgSFRNTFRva2VuaXplciBkb2Vz bid0CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbG93ZXIgbmFtZXMgd2hlbiBwYXNz aW5nIGluIHRva2VucyB0bworICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEhUTUxWaWV3 U291cmNlRG9jdW1lbnQuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVxdWFsSWdu b3JpbmdDYXNlKHRva2VuLT50YWdOYW1lLCAiYmFzZSIpICYmIGVxdWFsSWdub3JpbmdDYXNlKGF0 dHItPm5hbWUoKS5sb2NhbE5hbWUoKSwgImhyZWYiKSkgeworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAvLyBDYXRjaCB0aGUgaHJlZiBhdHRyaWJ1dGUgaW4gdGhlIGJhc2UgZWxlbWVu dC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gSXQgd2lsbCBiZSB1c2VkIGZv ciByZW5kZXJpbmcgYW5jaG9ycyBjcmVhdGVkCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIGJ5IGFkZExpbmsoKSBiZWxvdy4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2V0QmFzZUVsZW1lbnRVUkwoS1VSTCh1cmwoKSwgdmFsdWUpKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTog WE1MIGNvdWxkIHVzZSBuYW1lc3BhY2UgcHJlZml4ZXMgYW5kIGNvbmZ1c2UgdXMuCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGF0dHItPm5hbWUoKS5s b2NhbE5hbWUoKSwgInNyYyIpIHx8IGVxdWFsSWdub3JpbmdDYXNlKGF0dHItPm5hbWUoKS5sb2Nh bE5hbWUoKSwgImhyZWYiKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jdXJy ZW50ID0gYWRkTGluayh2YWx1ZSwgZXF1YWxJZ25vcmluZ0Nhc2UodG9rZW4tPnRhZ05hbWUsICJh IikpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDQyNjEpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAwOS0wNS0yNSAgVGFrZXNoaSBZb3No aW5vICA8dHlvc2hpbm9AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBCdWcgMjU5MTE6IEFwcGx5IGhyZWYgaW4gYmFzZSBlbGVtZW50 cyB0byBhbmNob3JzIHNob3duIG9uIHRoZSBzb3VyY2Ugdmlld2VyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTkxMQorCisgICAgICAgIEluIHJlbmRl cmluZyBIVE1MIHNvdXJjZXMsIHBhcnNlIGJhc2UgZWxlbWVudHMgdG8gYXBwbHkgdGhlIGJhc2Ug VVJJIHRvCisgICAgICAgIGFuY2hvcnMgc2hvd24gb24gdGhlIHNvdXJjZSB2aWV3ZXIuCisKKyAg ICAgICAgQWRkIHRlc3RzIHRvIHZlcmlmeSB0aGlzIGNoYW5nZS4KKworICAgICAgICBUaGlzIGlz c3VlIHdhcyBvcmlnaW5hbGx5IHJlcG9ydGVkIHRvIHRoZSBDaHJvbWl1bSBpc3N1ZSB0cmFja2Vy LgorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFp bD9pZD0yNDE4CisKKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9yZXNvdXJjZXMvdmlld3NvdXJjZS1m cmFtZS0zLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZnJhbWVzL3Jlc291cmNlcy92aWV3 c291cmNlLWZyYW1lLTQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9mcmFtZXMvdmlld3Nv dXJjZS1saW5rLW9uLWhyZWYtdmFsdWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmstb24taHJlZi12YWx1ZS5odG1sOiBBZGRlZC4KKwog MjAwOS0wNS0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZnJh bWVzL3ZpZXdzb3VyY2UtbGluay1vbi1ocmVmLXZhbHVlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy92aWV3c291cmNlLWxpbmstb24taHJlZi12YWx1 ZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy92 aWV3c291cmNlLWxpbmstb24taHJlZi12YWx1ZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEgQEAKK1BBU1MKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3ZpZXdzb3Vy Y2UtbGluay1vbi1ocmVmLXZhbHVlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFz dC9mcmFtZXMvdmlld3NvdXJjZS1saW5rLW9uLWhyZWYtdmFsdWUuaHRtbAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtbGluay1vbi1ocmVmLXZhbHVl Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNjkgQEAKKzxodG1sPg0KKzwhLS0gVGhpcyB0 ZXN0cyB0aGF0IGEgYmFzZSBlbGVtZW50IGlzIHJlc3BlY3RlZCBpbiByZW5kZXJpbmcgYW5jaG9y cyBvbiB2aWV3c291cmNlIHBhZ2UuIC0tPg0KKzxoZWFkPg0KKzxzY3JpcHQ+DQorICAgIGlmICh3 aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsNCisgICAgICAgIGxheW91dFRlc3RDb250cm9s bGVyLmR1bXBBc1RleHQoKTsNCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRp bERvbmUoKTsNCisgICAgfQ0KKw0KKyAgICBmdW5jdGlvbiBjaGVja0ZyYW1lKGlkKSB7DQorICAg ICAgICB2YXIgZnJhbWUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChpZCk7DQorDQorICAgICAg ICAvLyBVcGRhdGUgdGhpcyBsaXN0IHdoZW4geW91IG1vZGlmaWVkIHJlc291cmNlcy92aWV3c291 cmNlLWZyYW1lLXszLDR9Lmh0bWwgLg0KKyAgICAgICAgdmFyIGV4cGVjdGVkID0gWw0KKyAgICAg ICAgICAgIC8vIFRoaXMgd2lsbCBiZSBtYXRjaGVkIHdpdGggdGhlIGhyZWYgaW4gdGhlIGJhc2Ug ZWxlbWVudC4NCisgICAgICAgICAgICBbICJodHRwOi8vZXhhbXBsZS5vcmcvZm9vLyIsICJodHRw Oi8vZXhhbXBsZS5vcmcvZm9vLyIgXSwNCisgICAgICAgICAgICBbICJiYXIiLCAiaHR0cDovL2V4 YW1wbGUub3JnL2Zvby9iYXIiIF0sDQorICAgICAgICAgICAgWyAiL2JhciIsICJodHRwOi8vZXhh bXBsZS5vcmcvYmFyIiBdLA0KKyAgICAgICAgICAgIC8vIFRoaXMgc2hvdWxkbid0IGJlIGFmZmVj dGVkLg0KKyAgICAgICAgICAgIFsgImh0dHA6Ly9leGFtcGxlLm9yZy9mb29iYXIiLCAiaHR0cDov L2V4YW1wbGUub3JnL2Zvb2JhciIgXQ0KKyAgICAgICAgXTsNCisNCisgICAgICAgIHZhciBlbGVt ZW50cyA9IGZyYW1lLmNvbnRlbnREb2N1bWVudC5kb2N1bWVudEVsZW1lbnQuZ2V0RWxlbWVudHNC eVRhZ05hbWUoImEiKTsNCisgICAgICAgIGlmICghZWxlbWVudHMgfHwgZWxlbWVudHMubGVuZ3Ro ICE9PSA0KSB7DQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOw0KKyAgICAgICAgfQ0KKw0KKyAg ICAgICAgdmFyIG9rID0gdHJ1ZTsNCisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZWxlbWVu dHMubGVuZ3RoOyArK2kpIHsNCisgICAgICAgICAgICB2YXIgZWxlbWVudCA9IGVsZW1lbnRzLml0 ZW0oaSk7DQorICAgICAgICAgICAgaWYgKGVsZW1lbnQuaW5uZXJIVE1MICE9PSBleHBlY3RlZFtp XVswXSB8fCBlbGVtZW50LmhyZWYgIT09IGV4cGVjdGVkW2ldWzFdKSB7DQorICAgICAgICAgICAg ICAgIG9rID0gZmFsc2U7DQorICAgICAgICAgICAgICAgIGJyZWFrOw0KKyAgICAgICAgICAgIH0N CisgICAgICAgIH0NCisgICAgICAgIHJldHVybiBvazsNCisgICAgfQ0KKw0KKyAgICBmdW5jdGlv biByZXBvcnQoKSB7DQorICAgICAgICB2YXIgcmVzdWx0VGV4dCA9ICJGQUlMIjsNCisgICAgICAg IC8vIENoZWNrIHRoYXQgbGlua3MgYXJlIGFkZGVkIG9uIGhyZWYgdmFsdWVzIHJlZ2FyZGxlc3Mg b2YgdGhlIGNhc2Ugb2YgdGFnIG5hbWVzLg0KKyAgICAgICAgaWYgKGNoZWNrRnJhbWUoImxvd2Vy IikgJiYgY2hlY2tGcmFtZSgidXBwZXIiKSkgew0KKyAgICAgICAgICAgIHJlc3VsdFRleHQgPSAi UEFTUyI7DQorICAgICAgICB9DQorICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9s bGVyKSB7DQorICAgICAgICAgICAgZG9jdW1lbnQub3BlbigpOw0KKyAgICAgICAgICAgIGRvY3Vt ZW50LndyaXRlKHJlc3VsdFRleHQpOw0KKyAgICAgICAgICAgIGRvY3VtZW50LmNsb3NlKCk7DQor DQorICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOw0KKyAgICAg ICAgfSBlbHNlIHsNCisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0 IikudGV4dENvbnRlbnQgPSByZXN1bHRUZXh0Ow0KKyAgICAgICAgfQ0KKyAgICB9DQorPC9zY3Jp cHQ+DQorPC9oZWFkPg0KKzxib2R5IG9ubG9hZD0icmVwb3J0KCkiPg0KKzxwPg0KK0luIGEgZnJh bWUgYmVsb3cgd2hpY2ggaXMgaW4gJ3ZpZXcgc291cmNlJyBtb2RlLCBlYWNoIGxpbmsgb24gdGhl IHZhbHVlIG9mIHRoZQ0KK2hyZWYgYXR0cmlidXRlIGluIGFuY2hvciBlbGVtZW50cyBtdXN0IGhh dmUgdGhlIHNhbWUgYWRkcmVzcyBhcyB0aGUgYW5jaG9yDQorZWxlbWVudCdzIGNvbnRlbnRzLg0K KzwvcD4NCis8aHI+DQorPGlmcmFtZSB2aWV3c291cmNlIHNyYz0icmVzb3VyY2VzL3ZpZXdzb3Vy Y2UtZnJhbWUtMy5odG1sIiB3aWR0aD0iNjAwIiBpZD0ibG93ZXIiPjwvaWZyYW1lPg0KKzxpZnJh bWUgdmlld3NvdXJjZSBzcmM9InJlc291cmNlcy92aWV3c291cmNlLWZyYW1lLTQuaHRtbCIgd2lk dGg9IjYwMCIgaWQ9InVwcGVyIj48L2lmcmFtZT4NCis8aHI+DQorPGRpdiBpZD0icmVzdWx0Ij48 L2Rpdj4NCis8L2JvZHk+DQorPC9odG1sPg0KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZnJhbWVz L3Jlc291cmNlcy92aWV3c291cmNlLWZyYW1lLTMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvdmlld3NvdXJjZS1mcmFtZS0zLmh0bWwJKHJldmlz aW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvdmlld3NvdXJjZS1m cmFtZS0zLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNiBAQAorPGhlYWQ+PGJhc2UgaHJl Zj0iaHR0cDovL2V4YW1wbGUub3JnL2Zvby8iPjwvaGVhZD4NCis8Ym9keT4NCis8YSBocmVmPSJi YXIiPmh0dHA6Ly9leGFtcGxlLm9yZy9mb28vYmFyPC9hPjxicj4NCis8YSBocmVmPSIvYmFyIj5o dHRwOi8vZXhhbXBsZS5vcmcvYmFyPC9hPjxicj4NCis8YSBocmVmPSJodHRwOi8vZXhhbXBsZS5v cmcvZm9vYmFyIj5odHRwOi8vZXhhbXBsZS5vcmcvZm9vYmFyPC9hPg0KKzwvYm9keT4NCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvdmlld3NvdXJjZS1mcmFtZS00Lmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVzb3VyY2VzL3ZpZXdz b3VyY2UtZnJhbWUtNC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9mcmFt ZXMvcmVzb3VyY2VzL3ZpZXdzb3VyY2UtZnJhbWUtNC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCww ICsxLDYgQEAKKzxIRUFEPjxCQVNFIEhSRUY9Imh0dHA6Ly9leGFtcGxlLm9yZy9mb28vIj48L0hF QUQ+DQorPEJPRFk+DQorPEEgSFJFRj0iYmFyIj5odHRwOi8vZXhhbXBsZS5vcmcvZm9vL2Jhcjwv QT48QlI+DQorPEEgSFJFRj0iL2JhciI+aHR0cDovL2V4YW1wbGUub3JnL2JhcjwvQT48QlI+DQor PEEgSFJFRj0iaHR0cDovL2V4YW1wbGUub3JnL2Zvb2JhciI+aHR0cDovL2V4YW1wbGUub3JnL2Zv b2JhcjwvQT4NCis8L0JPRFk+DQo=