46223 2010-09-21 15:26:55 -0700 Can't put flash object over an iframe shim in Chromium 2010-09-29 10:15:20 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 ananta ananta commit-queue fishd webkit.review.bot oldest_to_newest 282587 0 ananta 2010-09-21 15:26:55 -0700 This bug affects Chromium only. The Chrome bug is here http://code.google.com/p/chromium/issues/detail?id=54200 Steps 1. Have an iframe element with a page loaded within. 2. Use script, etc. to place a flash object from the parent page on top of the iframe object. 3. Even if you set the flash object's z-index higher than the iframe's, the flash object will be displayed under the iframe Here is a site which has this problem. http://mixla.org The problem appears to affect the Windows port of Chromium only. 282718 1 68321 ananta 2010-09-21 18:37:22 -0700 Created attachment 68321 Initial patch for this issue 282720 2 ananta 2010-09-21 18:39:02 -0700 I discussed this issue with Thatcher Ulrich from Google who originally wrote this code for Chromium and John Newlin from Google who rewrote parts of the iframe shim code to fix a layering bug. We agreed that the proposed fix is the right fix in the short term. Longer term we should look into Firefox's implementation which seems to do the right thing even if there is no iframe shim. I tested this fix with the test case mentioned in the bug and the test cases on the site maintained by Thatecher Ulrich. They all work fine. The plugin layout test iframe-shims.html also works fine. Please take a look at the proposed patch. It is relatively low risk as the only consumer of this code is Chromium. 282806 3 68321 fishd 2010-09-22 00:28:57 -0700 Comment on attachment 68321 Initial patch for this issue View in context: https://bugs.webkit.org/attachment.cgi?id=68321&action=review > WebKit/chromium/src/WebPluginContainerImpl.cpp:545 > + // it stacks behind the iframe. it seems like the comment needs to be updated. > WebKit/chromium/src/WebPluginContainerImpl.cpp:547 > + const RenderObject* pluginRenderObject = pluginZstack[0]; it is not obvious to me why you always check the 0'th elements of pluginZstack and iframeZstack here. 282912 4 68368 ananta 2010-09-22 07:10:03 -0700 Created attachment 68368 Patch with updated comments 282913 5 ananta 2010-09-22 07:11:23 -0700 Hi Darin Thanks for the review. I updated the earlier comment and added a note indicating why we check the 0'th elements of the RenderObject arrays. Thanks Ananta 284414 6 68368 fishd 2010-09-24 09:01:29 -0700 Comment on attachment 68368 Patch with updated comments R=me, but is it possible to write a layout test for this extending or building upon the layout test that already exists for iframe shims? 285030 7 68829 ananta 2010-09-25 10:20:04 -0700 Created attachment 68829 New patch with the iframe-shims.html Layout test updated to test this case. 285031 8 webkit.review.bot 2010-09-25 10:24:49 -0700 Attachment 68829 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/chromium/ChangeLog:5: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 285032 9 68830 ananta 2010-09-25 10:24:57 -0700 Created attachment 68830 Updated patch with the iframe-shims.html layout test updated to test for this case. 285033 10 68831 ananta 2010-09-25 10:27:42 -0700 Created attachment 68831 Updated patch with formatting errors fixed 285034 11 68832 ananta 2010-09-25 10:28:47 -0700 Created attachment 68832 Updated patch with formatting errors fixed 285036 12 68833 ananta 2010-09-25 10:31:52 -0700 Created attachment 68833 Fixed the formatting in the layout test 285038 13 68834 ananta 2010-09-25 10:34:55 -0700 Created attachment 68834 Hopefully the last of the formatting fix. 285496 14 68834 fishd 2010-09-27 09:28:34 -0700 Comment on attachment 68834 Hopefully the last of the formatting fix. Thanks for the test! R=me 285510 15 68834 commit-queue 2010-09-27 09:48:33 -0700 Comment on attachment 68834 Hopefully the last of the formatting fix. Rejecting patch 68834 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']" exit_code: 2 Last 500 characters of output: r....ok All tests successful. Files=14, Tests=304, 1 wallclock secs ( 0.72 cusr + 0.16 csys = 0.88 CPU) Running build-dumprendertree Compiling Java tests make: Nothing to be done for `default'. Running tests from /Projects/CommitQueue/LayoutTests Testing 21378 test cases. plugins/iframe-shims.html -> failed Exiting early after 1 failures. 17854 tests run. 317.92s total testing time 17853 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 31 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/4132012 286009 16 69012 ananta 2010-09-27 19:19:26 -0700 Created attachment 69012 Updated patch with the iframe-shims.html added to skipped list for mac platforms. 286143 17 68368 eric 2010-09-28 03:18:45 -0700 Comment on attachment 68368 Patch with updated comments Cleared Darin Fisher's review+ from obsolete attachment 68368 so that this bug does not appear in http://webkit.org/pending-commit. 286144 18 68834 eric 2010-09-28 03:18:49 -0700 Comment on attachment 68834 Hopefully the last of the formatting fix. Cleared Darin Fisher's review+ from obsolete attachment 68834 so that this bug does not appear in http://webkit.org/pending-commit. 286347 19 69012 levin 2010-09-28 10:29:57 -0700 Comment on attachment 69012 Updated patch with the iframe-shims.html added to skipped list for mac platforms. View in context: https://bugs.webkit.org/attachment.cgi?id=69012&action=review > LayoutTests/platform/mac-leopard/Skipped:106 > +plugins/iframe-shims.html LayoutTests/platform/mac/Skipped should be sufficent. > LayoutTests/platform/mac-snowleopard/Skipped:143 > +plugins/iframe-shims.html LayoutTests/platform/mac/Skipped should be sufficent. > LayoutTests/platform/mac-tiger/Skipped:212 > +plugins/iframe-shims.html LayoutTests/platform/mac/Skipped should be sufficent. > LayoutTests/platform/mac/Skipped:326 > +plugins/iframe-shims.html What about other platforms like LayoutTests/platform/win/Skipped? 286385 20 69073 ananta 2010-09-28 11:11:06 -0700 Created attachment 69073 Updated patch with the iframe-shims.html skipped for mac, win and qt. 286445 21 69085 ananta 2010-09-28 12:21:01 -0700 Created attachment 69085 Updated patch with style issues and svn conflicts fixed. 286945 22 69085 commit-queue 2010-09-29 10:15:14 -0700 Comment on attachment 69085 Updated patch with style issues and svn conflicts fixed. Clearing flags on attachment: 69085 Committed r68656: <http://trac.webkit.org/changeset/68656> 286946 23 commit-queue 2010-09-29 10:15:20 -0700 All reviewed patches have been landed. Closing bug. 68321 2010-09-21 18:37:22 -0700 2010-09-22 07:10:03 -0700 Initial patch for this issue iframe_shim_fix.txt text/plain 2153 ananta SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODAwNikKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOS0yMSAgQW5h bnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBbY2hyb21pdW1d IEhvbm9yIHotaW5kZXggc3BlY2lmaWVkIGJ5IGEgcGx1Z2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjIyMworICAgICAgICAKKyAgICAgICAgVGhl IENocm9taXVtIHBsdWdpbiBjb2RlIHdoaWNoIGltcGxlbWVudHMgdGhlIGlmcmFtZSBzaGltIHRl Y2huaXF1ZQorICAgICAgICBmb3Igb3ZlcmxheWluZyBhIHdpbmRvd2VkIHBsdWdpbiB3aXRoIGNv bnRlbnQgb24gdGhlIHBhZ2Ugc2hvdWxkCisgICAgICAgIGhvbm9yIHRoZSB6LWluZGV4IHNwZWNp ZmllZCBvbiB0aGUgcGx1Z2luIHdpZGdldC4gSWYgdGhlIHotaW5kZXgKKyAgICAgICAgaGVyZSBp cyBncmVhdGVyIHRoYW4gdGhlIGVuY2xvc2luZyBpZnJhbWUgc2hpbSB0aGVuIHRoZSBwbHVnaW4K KyAgICAgICAgc2hvdWxkIGJlIGRpc3BsYXllZCBvdmVyIHRoZSBpZnJhbWUuCisgICAgICAgIAor ICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcDoKKwogMjAxMC0wOS0yMSAg QW5kcmV3IFdpbHNvbiAgPGF0d2lsc29uQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByNjc5ODIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBs dWdpbkNvbnRhaW5lckltcGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAkocmV2aXNpb24gNjc5ODgpCisrKyBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01NDIsMTAgKzU0MiwxNyBAQCBzdGF0aWMgYm9vbCBjaGVja1N0YWNrT25Ub3AoCiAgICAgICAg ICAgICB9CiAKICAgICAgICAgICAgIC8vIEZvciBjb21wYXRpYmlsaXR5IHdpdGggSUU6IHdoZW4g dGhlIHBsdWdpbiBpcyBub3QgcG9zaXRpb25lZCwKLSAgICAgICAgICAgIC8vIGl0IHN0YWNrcyBi ZWhpbmQgdGhlIGlmcmFtZSwgZXZlbiBpZiBpdCdzIGxhdGVyIGluIHRoZQotICAgICAgICAgICAg Ly8gZG9jdW1lbnQgb3JkZXIuCi0gICAgICAgICAgICBpZiAocm8yLT5zdHlsZSgpLT5wb3NpdGlv bigpID09IFN0YXRpY1Bvc2l0aW9uKQorICAgICAgICAgICAgLy8gaXQgc3RhY2tzIGJlaGluZCB0 aGUgaWZyYW1lLgorICAgICAgICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBT dGF0aWNQb3NpdGlvbikgeworICAgICAgICAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCogcGx1 Z2luUmVuZGVyT2JqZWN0ID0gcGx1Z2luWnN0YWNrWzBdOworICAgICAgICAgICAgICAgIGNvbnN0 IFJlbmRlck9iamVjdCogaWZyYW1lUmVuZGVyT2JqZWN0ID0gaWZyYW1lWnN0YWNrWzBdOworCisg ICAgICAgICAgICAgICAgaWYgKHBsdWdpblJlbmRlck9iamVjdC0+c3R5bGUoKSAmJiBpZnJhbWVS ZW5kZXJPYmplY3QtPnN0eWxlKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHBsdWdpblJl bmRlck9iamVjdC0+c3R5bGUoKS0+ekluZGV4KCkgPiBpZnJhbWVSZW5kZXJPYmplY3QtPnN0eWxl KCktPnpJbmRleCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAg IH0KIAogICAgICAgICAgICAgLy8gSW5zcGVjdCB0aGUgZG9jdW1lbnQgb3JkZXIuICBMYXRlciBv cmRlciBtZWFucyBoaWdoZXIKICAgICAgICAgICAgIC8vIHN0YWNraW5nLgo= 68368 2010-09-22 07:10:03 -0700 2010-09-28 03:18:45 -0700 Patch with updated comments iframe_shim_fix.txt text/plain 2408 ananta SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODAzNykKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOS0yMiAgQW5h bnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBIb25vciB6 LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyAgICAgICAgCisgICAgICAgIFRoZSBDaHJvbWl1 bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1lbnRzIHRoZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUK KyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3aW5kb3dlZCBwbHVnaW4gd2l0aCBjb250ZW50IG9u IHRoZSBwYWdlIHNob3VsZAorICAgICAgICBob25vciB0aGUgei1pbmRleCBzcGVjaWZpZWQgb24g dGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6LWluZGV4CisgICAgICAgIGhlcmUgaXMgZ3JlYXRl ciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1lIHNoaW0gdGhlbiB0aGUgcGx1Z2luCisgICAgICAg IHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0aGUgaWZyYW1lLgorCisgICAgICAgICogc3JjL1dl YlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorCiAyMDEwLTA5LTIxICBKYW1lcyBSb2JpbnNvbiAg PGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNz ZWxsLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNw cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVy SW1wbC5jcHAJKHJldmlzaW9uIDY3OTg4KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVn aW5Db250YWluZXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTQxLDExICs1NDEsMjAgQEAg c3RhdGljIGJvb2wgY2hlY2tTdGFja09uVG9wKAogICAgICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIC8vIEZvciBjb21wYXRpYmlsaXR5 IHdpdGggSUU6IHdoZW4gdGhlIHBsdWdpbiBpcyBub3QgcG9zaXRpb25lZCwKLSAgICAgICAgICAg IC8vIGl0IHN0YWNrcyBiZWhpbmQgdGhlIGlmcmFtZSwgZXZlbiBpZiBpdCdzIGxhdGVyIGluIHRo ZQotICAgICAgICAgICAgLy8gZG9jdW1lbnQgb3JkZXIuCi0gICAgICAgICAgICBpZiAocm8yLT5z dHlsZSgpLT5wb3NpdGlvbigpID09IFN0YXRpY1Bvc2l0aW9uKQorICAgICAgICAgICAgLy8gSWYg dGhlIHBsdWdpbiBkb2VzIG5vdCBoYXZlIGFuIGV4cGxpY2l0IHotaW5kZXggaXQgc3RhY2tzIGJl aGluZCB0aGUgaWZyYW1lLgorICAgICAgICAgICAgLy8gVGhpcyBpcyBmb3IgbWFpbnRhaW5pbmcg Y29tcGF0aWJpbGl0eSB3aXRoIElFLgorICAgICAgICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9z aXRpb24oKSA9PSBTdGF0aWNQb3NpdGlvbikgeworICAgICAgICAgICAgICAgIC8vIFRoZSAwJ3Ro IGVsZW1lbnRzIG9mIHRoZXNlIFJlbmRlck9iamVjdCBhcnJheXMgcmVwcmVzZW50IHRoZSBwbHVn aW4gbm9kZSBhbmQKKyAgICAgICAgICAgICAgICAvLyB0aGUgaWZyYW1lLgorICAgICAgICAgICAg ICAgIGNvbnN0IFJlbmRlck9iamVjdCogcGx1Z2luUmVuZGVyT2JqZWN0ID0gcGx1Z2luWnN0YWNr WzBdOworICAgICAgICAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCogaWZyYW1lUmVuZGVyT2Jq ZWN0ID0gaWZyYW1lWnN0YWNrWzBdOworCisgICAgICAgICAgICAgICAgaWYgKHBsdWdpblJlbmRl ck9iamVjdC0+c3R5bGUoKSAmJiBpZnJhbWVSZW5kZXJPYmplY3QtPnN0eWxlKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKHBsdWdpblJlbmRlck9iamVjdC0+c3R5bGUoKS0+ekluZGV4KCkg PiBpZnJhbWVSZW5kZXJPYmplY3QtPnN0eWxlKCktPnpJbmRleCgpKQorICAgICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gSW5zcGVjdCB0 aGUgZG9jdW1lbnQgb3JkZXIuICBMYXRlciBvcmRlciBtZWFucyBoaWdoZXIKICAgICAgICAgICAg IC8vIHN0YWNraW5nLgo= 68829 2010-09-25 10:20:04 -0700 2010-09-25 10:24:57 -0700 New patch with the iframe-shims.html Layout test updated to test this case. iframe_shim_fix.txt text/plain 5388 ananta SW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCShyZXZpc2lvbiA2Nzk4 OCkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTIwLDYgKzIwLDE0IEBACiAgICAgICAgIHJldHVybiBmOwogICAgIH0KIAorICAgIGZ1 bmN0aW9uIG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpCisgICAgeworICAgICAg ICB2YXIgZiA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgIGYuc3R5bGUuekluZGV4ID0g MTAwMDsKKyAgICAgICAgZi5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7CisgICAgICAgIHJl dHVybiBmOworICAgIH0KKwogICAgIGZ1bmN0aW9uIG1ha2VJZnJhbWVEaXYoKQogICAgIHsKICAg ICAgICAgdmFyIGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTsKQEAgLTEwOSwy NyArMTE3LDM2IEBACiAgICAgICAgICAgICBwbHVnaW5EaXZaID0gMTAwOwogICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAxMDA7CisgICAgICAgIH0gZWxzZSBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRl eCkgeworICAgICAgICAgICAgLy8gRm9yIHRoaXMgdGVzdCBjYXNlIHdlIHNldCB0aGUgei1pbmRl eCBmb3IgdGhlIGlmcmFtZSBhbmQgdGhlIG92ZXJsYXkKKyAgICAgICAgICAgIC8vIHRvIGJlIGxv d2VyIHRoYW4gdGhlIHBsdWdpbi4KKyAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAw OworICAgICAgICAgICAgb3ZlcmxheURpdlpPdmVybGF5ID0gMDsKICAgICAgICAgfQogCi0gICAg ICAgIHZhciBhcHBlbmRQbHVnaW4gPSBmdW5jdGlvbigpCi0gICAgICAgIHsKLSAgICAgICAgICAg IHZhciBwZCA9IG1ha2VQbHVnaW5FbGVtZW50KCk7Ci0gICAgICAgICAgICBpZiAodGFncy5wbHVn aW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2WikgewotICAgICAgICAgICAgICAgIHZhciBwYXJlbnRk aXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKLSAgICAgICAgICAgICAgICBwYXJl bnRkaXYuYXBwZW5kQ2hpbGQocGQpCi0gICAgICAgICAgICAgICAgaWYgKCF0YWdzLnBsdWdpbk5v cmVsYXRpdmUpCi0gICAgICAgICAgICAgICAgICAgIHBhcmVudGRpdi5zdHlsZS5wb3NpdGlvbiA9 ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAgICAgICAgICBpZiAocGx1Z2luRGl2WikKLSAgICAgICAg ICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdpbkRpdlo7Ci0KLSAgICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBhcmVudGRpdik7Ci0gICAgICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZlKQotICAgICAg ICAgICAgICAgICAgICBwZC5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAg ICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgdmFy IGFwcGVuZFBsdWdpbiA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgIHZhciBwZDsKKyAgICAgICAg ICBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRleCkgeworICAgICAgICAgICAgICBw ZCA9IG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpOworICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAgICAgICAgICB9 CisKKyAgICAgICAgICBpZiAodGFncy5wbHVnaW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2Wikgewor ICAgICAgICAgICAgICB2YXIgcGFyZW50ZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2 Jyk7CisgICAgICAgICAgICAgIHBhcmVudGRpdi5hcHBlbmRDaGlsZChwZCkKKyAgICAgICAgICAg ICAgaWYgKCF0YWdzLnBsdWdpbk5vcmVsYXRpdmUpCisgICAgICAgICAgICAgICAgICBwYXJlbnRk aXYuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworCisgICAgICAgICAgICAgIGlmIChwbHVn aW5EaXZaKQorICAgICAgICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdp bkRpdlo7CisKKyAgICAgICAgICAgICAgcm9vdC5hcHBlbmRDaGlsZChwYXJlbnRkaXYpOworICAg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZl KQorICAgICAgICAgICAgICAgICAgcGQuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKKyAgICAgICAgICB9CiAgICAgICAgIH07 CiAKICAgICAgICAgaWYgKHRhZ3Mub3ZlcmxheUVhcmxpZXIpIHsKQEAgLTE4NCw3ICsyMDEsNyBA QAogICAgICAgICBhZGRDYXNlKDEsIDMsIHsnb3ZlcmxheUVhcmxpZXInOjEsICdwbHVnaW5Ob3Jl bGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2JzoxLCBleHBlY3Q6J292ZXJsYXkgT1ZFUid9KTsK ICAgICAgICAgYWRkQ2FzZSgyLCAzLCB7J3BsdWdpbk5vcmVsYXRpdmUnOjEsICdwbHVnaW5JbnNp ZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVSJ30pOwogICAgICAgICBhZGRDYXNlKDMsIDMs IHsncGx1Z2luTG93ZXJ6JzoxLCAnb3ZlcmxheU9uVGltZW91dCc6MSwgZXhwZWN0OidvdmVybGF5 IE9WRVInfSk7Ci0KKyAgICAgICAgYWRkQ2FzZSg0LCAwLCB7ICdwbHVnaW5FeHBsaWNpdEhpZ2hl clpJbmRleCc6IDEsICdwbHVnaW5Ob3JlbGF0aXZlJzogMSwgJ3BsdWdpbkluc2lkZURpdic6IDEs ICdvdmVybGF5SW5zaWRlRGl2JzogMSwgZXhwZWN0OiAnb3ZlcmxheSBVTkRFUicgfSk7CiAgICAg ICAgIHJ1blRlc3QoKTsKICAgICB9CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODMz MykKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxOCBAQAorMjAxMC0wOS0yNSAgQW5hbnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKwkJ W2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdpbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyAgICAgICAgCisg ICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1lbnRzIHRoZSBpZnJh bWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3aW5kb3dlZCBwbHVn aW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNob3VsZAorICAgICAgICBob25vciB0aGUgei1p bmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6LWluZGV4CisgICAg ICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1lIHNoaW0gdGhlbiB0 aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0aGUgaWZyYW1lLgor CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorCiAyMDEwLTA5LTI1 ICBOaWNvbGFzIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2lu Q29udGFpbmVySW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCShyZXZpc2lvbiA2Nzk4OCkKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0 MSwxMSArNTQxLDIwIEBAIHN0YXRpYyBib29sIGNoZWNrU3RhY2tPblRvcCgKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAvLyBG b3IgY29tcGF0aWJpbGl0eSB3aXRoIElFOiB3aGVuIHRoZSBwbHVnaW4gaXMgbm90IHBvc2l0aW9u ZWQsCi0gICAgICAgICAgICAvLyBpdCBzdGFja3MgYmVoaW5kIHRoZSBpZnJhbWUsIGV2ZW4gaWYg aXQncyBsYXRlciBpbiB0aGUKLSAgICAgICAgICAgIC8vIGRvY3VtZW50IG9yZGVyLgotICAgICAg ICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlvbikKKyAg ICAgICAgICAgIC8vIElmIHRoZSBwbHVnaW4gZG9lcyBub3QgaGF2ZSBhbiBleHBsaWNpdCB6LWlu ZGV4IGl0IHN0YWNrcyBiZWhpbmQgdGhlIGlmcmFtZS4KKyAgICAgICAgICAgIC8vIFRoaXMgaXMg Zm9yIG1haW50YWluaW5nIGNvbXBhdGliaWxpdHkgd2l0aCBJRS4KKyAgICAgICAgICAgIGlmIChy bzItPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gU3RhdGljUG9zaXRpb24pIHsKKyAgICAgICAgICAg ICAgICAvLyBUaGUgMCd0aCBlbGVtZW50cyBvZiB0aGVzZSBSZW5kZXJPYmplY3QgYXJyYXlzIHJl cHJlc2VudCB0aGUgcGx1Z2luIG5vZGUgYW5kCisgICAgICAgICAgICAgICAgLy8gdGhlIGlmcmFt ZS4KKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QqIHBsdWdpblJlbmRlck9iamVj dCA9IHBsdWdpblpzdGFja1swXTsKKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJPYmplY3Qq IGlmcmFtZVJlbmRlck9iamVjdCA9IGlmcmFtZVpzdGFja1swXTsKKworICAgICAgICAgICAgICAg IGlmIChwbHVnaW5SZW5kZXJPYmplY3QtPnN0eWxlKCkgJiYgaWZyYW1lUmVuZGVyT2JqZWN0LT5z dHlsZSgpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmplY3QtPnN0 eWxlKCktPnpJbmRleCgpID4gaWZyYW1lUmVuZGVyT2JqZWN0LT5zdHlsZSgpLT56SW5kZXgoKSkK KyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIC8vIEluc3BlY3QgdGhlIGRvY3VtZW50IG9yZGVyLiAgTGF0ZXIgb3JkZXIgbWVhbnMgaGln aGVyCiAgICAgICAgICAgICAvLyBzdGFja2luZy4K 68830 2010-09-25 10:24:57 -0700 2010-09-25 10:27:42 -0700 Updated patch with the iframe-shims.html layout test updated to test for this case. iframe_shim_fix.txt text/plain 5388 ananta SW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCShyZXZpc2lvbiA2Nzk4 OCkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTIwLDYgKzIwLDE0IEBACiAgICAgICAgIHJldHVybiBmOwogICAgIH0KIAorICAgIGZ1 bmN0aW9uIG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpCisgICAgeworICAgICAg ICB2YXIgZiA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgIGYuc3R5bGUuekluZGV4ID0g MTAwMDsKKyAgICAgICAgZi5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7CisgICAgICAgIHJl dHVybiBmOworICAgIH0KKwogICAgIGZ1bmN0aW9uIG1ha2VJZnJhbWVEaXYoKQogICAgIHsKICAg ICAgICAgdmFyIGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTsKQEAgLTEwOSwy NyArMTE3LDM2IEBACiAgICAgICAgICAgICBwbHVnaW5EaXZaID0gMTAwOwogICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAxMDA7CisgICAgICAgIH0gZWxzZSBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRl eCkgeworICAgICAgICAgICAgLy8gRm9yIHRoaXMgdGVzdCBjYXNlIHdlIHNldCB0aGUgei1pbmRl eCBmb3IgdGhlIGlmcmFtZSBhbmQgdGhlIG92ZXJsYXkKKyAgICAgICAgICAgIC8vIHRvIGJlIGxv d2VyIHRoYW4gdGhlIHBsdWdpbi4KKyAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAw OworICAgICAgICAgICAgb3ZlcmxheURpdlpPdmVybGF5ID0gMDsKICAgICAgICAgfQogCi0gICAg ICAgIHZhciBhcHBlbmRQbHVnaW4gPSBmdW5jdGlvbigpCi0gICAgICAgIHsKLSAgICAgICAgICAg IHZhciBwZCA9IG1ha2VQbHVnaW5FbGVtZW50KCk7Ci0gICAgICAgICAgICBpZiAodGFncy5wbHVn aW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2WikgewotICAgICAgICAgICAgICAgIHZhciBwYXJlbnRk aXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKLSAgICAgICAgICAgICAgICBwYXJl bnRkaXYuYXBwZW5kQ2hpbGQocGQpCi0gICAgICAgICAgICAgICAgaWYgKCF0YWdzLnBsdWdpbk5v cmVsYXRpdmUpCi0gICAgICAgICAgICAgICAgICAgIHBhcmVudGRpdi5zdHlsZS5wb3NpdGlvbiA9 ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAgICAgICAgICBpZiAocGx1Z2luRGl2WikKLSAgICAgICAg ICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdpbkRpdlo7Ci0KLSAgICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBhcmVudGRpdik7Ci0gICAgICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZlKQotICAgICAg ICAgICAgICAgICAgICBwZC5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAg ICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgdmFy IGFwcGVuZFBsdWdpbiA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgIHZhciBwZDsKKyAgICAgICAg ICBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRleCkgeworICAgICAgICAgICAgICBw ZCA9IG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpOworICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAgICAgICAgICB9 CisKKyAgICAgICAgICBpZiAodGFncy5wbHVnaW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2Wikgewor ICAgICAgICAgICAgICB2YXIgcGFyZW50ZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2 Jyk7CisgICAgICAgICAgICAgIHBhcmVudGRpdi5hcHBlbmRDaGlsZChwZCkKKyAgICAgICAgICAg ICAgaWYgKCF0YWdzLnBsdWdpbk5vcmVsYXRpdmUpCisgICAgICAgICAgICAgICAgICBwYXJlbnRk aXYuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworCisgICAgICAgICAgICAgIGlmIChwbHVn aW5EaXZaKQorICAgICAgICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdp bkRpdlo7CisKKyAgICAgICAgICAgICAgcm9vdC5hcHBlbmRDaGlsZChwYXJlbnRkaXYpOworICAg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZl KQorICAgICAgICAgICAgICAgICAgcGQuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKKyAgICAgICAgICB9CiAgICAgICAgIH07 CiAKICAgICAgICAgaWYgKHRhZ3Mub3ZlcmxheUVhcmxpZXIpIHsKQEAgLTE4NCw3ICsyMDEsNyBA QAogICAgICAgICBhZGRDYXNlKDEsIDMsIHsnb3ZlcmxheUVhcmxpZXInOjEsICdwbHVnaW5Ob3Jl bGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2JzoxLCBleHBlY3Q6J292ZXJsYXkgT1ZFUid9KTsK ICAgICAgICAgYWRkQ2FzZSgyLCAzLCB7J3BsdWdpbk5vcmVsYXRpdmUnOjEsICdwbHVnaW5JbnNp ZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVSJ30pOwogICAgICAgICBhZGRDYXNlKDMsIDMs IHsncGx1Z2luTG93ZXJ6JzoxLCAnb3ZlcmxheU9uVGltZW91dCc6MSwgZXhwZWN0OidvdmVybGF5 IE9WRVInfSk7Ci0KKyAgICAgICAgYWRkQ2FzZSg0LCAwLCB7ICdwbHVnaW5FeHBsaWNpdEhpZ2hl clpJbmRleCc6IDEsICdwbHVnaW5Ob3JlbGF0aXZlJzogMSwgJ3BsdWdpbkluc2lkZURpdic6IDEs ICdvdmVybGF5SW5zaWRlRGl2JzogMSwgZXhwZWN0OiAnb3ZlcmxheSBVTkRFUicgfSk7CiAgICAg ICAgIHJ1blRlc3QoKTsKICAgICB9CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODMz MykKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxOCBAQAorMjAxMC0wOS0yNSAgQW5hbnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKwkJ W2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdpbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyAgICAgICAgCisg ICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1lbnRzIHRoZSBpZnJh bWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3aW5kb3dlZCBwbHVn aW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNob3VsZAorICAgICAgICBob25vciB0aGUgei1p bmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6LWluZGV4CisgICAg ICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1lIHNoaW0gdGhlbiB0 aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0aGUgaWZyYW1lLgor CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorCiAyMDEwLTA5LTI1 ICBOaWNvbGFzIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2lu Q29udGFpbmVySW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCShyZXZpc2lvbiA2Nzk4OCkKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0 MSwxMSArNTQxLDIwIEBAIHN0YXRpYyBib29sIGNoZWNrU3RhY2tPblRvcCgKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAvLyBG b3IgY29tcGF0aWJpbGl0eSB3aXRoIElFOiB3aGVuIHRoZSBwbHVnaW4gaXMgbm90IHBvc2l0aW9u ZWQsCi0gICAgICAgICAgICAvLyBpdCBzdGFja3MgYmVoaW5kIHRoZSBpZnJhbWUsIGV2ZW4gaWYg aXQncyBsYXRlciBpbiB0aGUKLSAgICAgICAgICAgIC8vIGRvY3VtZW50IG9yZGVyLgotICAgICAg ICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlvbikKKyAg ICAgICAgICAgIC8vIElmIHRoZSBwbHVnaW4gZG9lcyBub3QgaGF2ZSBhbiBleHBsaWNpdCB6LWlu ZGV4IGl0IHN0YWNrcyBiZWhpbmQgdGhlIGlmcmFtZS4KKyAgICAgICAgICAgIC8vIFRoaXMgaXMg Zm9yIG1haW50YWluaW5nIGNvbXBhdGliaWxpdHkgd2l0aCBJRS4KKyAgICAgICAgICAgIGlmIChy bzItPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gU3RhdGljUG9zaXRpb24pIHsKKyAgICAgICAgICAg ICAgICAvLyBUaGUgMCd0aCBlbGVtZW50cyBvZiB0aGVzZSBSZW5kZXJPYmplY3QgYXJyYXlzIHJl cHJlc2VudCB0aGUgcGx1Z2luIG5vZGUgYW5kCisgICAgICAgICAgICAgICAgLy8gdGhlIGlmcmFt ZS4KKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QqIHBsdWdpblJlbmRlck9iamVj dCA9IHBsdWdpblpzdGFja1swXTsKKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJPYmplY3Qq IGlmcmFtZVJlbmRlck9iamVjdCA9IGlmcmFtZVpzdGFja1swXTsKKworICAgICAgICAgICAgICAg IGlmIChwbHVnaW5SZW5kZXJPYmplY3QtPnN0eWxlKCkgJiYgaWZyYW1lUmVuZGVyT2JqZWN0LT5z dHlsZSgpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmplY3QtPnN0 eWxlKCktPnpJbmRleCgpID4gaWZyYW1lUmVuZGVyT2JqZWN0LT5zdHlsZSgpLT56SW5kZXgoKSkK KyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIC8vIEluc3BlY3QgdGhlIGRvY3VtZW50IG9yZGVyLiAgTGF0ZXIgb3JkZXIgbWVhbnMgaGln aGVyCiAgICAgICAgICAgICAvLyBzdGFja2luZy4K 68831 2010-09-25 10:27:42 -0700 2010-09-25 10:28:47 -0700 Updated patch with formatting errors fixed iframe_shim_fix.txt text/plain 5394 ananta SW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCShyZXZpc2lvbiA2Nzk4 OCkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTIwLDYgKzIwLDE0IEBACiAgICAgICAgIHJldHVybiBmOwogICAgIH0KIAorICAgIGZ1 bmN0aW9uIG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpCisgICAgeworICAgICAg ICB2YXIgZiA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgIGYuc3R5bGUuekluZGV4ID0g MTAwMDsKKyAgICAgICAgZi5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7CisgICAgICAgIHJl dHVybiBmOworICAgIH0KKwogICAgIGZ1bmN0aW9uIG1ha2VJZnJhbWVEaXYoKQogICAgIHsKICAg ICAgICAgdmFyIGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTsKQEAgLTEwOSwy NyArMTE3LDM2IEBACiAgICAgICAgICAgICBwbHVnaW5EaXZaID0gMTAwOwogICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAxMDA7CisgICAgICAgIH0gZWxzZSBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRl eCkgeworICAgICAgICAgICAgLy8gRm9yIHRoaXMgdGVzdCBjYXNlIHdlIHNldCB0aGUgei1pbmRl eCBmb3IgdGhlIGlmcmFtZSBhbmQgdGhlIG92ZXJsYXkKKyAgICAgICAgICAgIC8vIHRvIGJlIGxv d2VyIHRoYW4gdGhlIHBsdWdpbi4KKyAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAw OworICAgICAgICAgICAgb3ZlcmxheURpdlpPdmVybGF5ID0gMDsKICAgICAgICAgfQogCi0gICAg ICAgIHZhciBhcHBlbmRQbHVnaW4gPSBmdW5jdGlvbigpCi0gICAgICAgIHsKLSAgICAgICAgICAg IHZhciBwZCA9IG1ha2VQbHVnaW5FbGVtZW50KCk7Ci0gICAgICAgICAgICBpZiAodGFncy5wbHVn aW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2WikgewotICAgICAgICAgICAgICAgIHZhciBwYXJlbnRk aXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKLSAgICAgICAgICAgICAgICBwYXJl bnRkaXYuYXBwZW5kQ2hpbGQocGQpCi0gICAgICAgICAgICAgICAgaWYgKCF0YWdzLnBsdWdpbk5v cmVsYXRpdmUpCi0gICAgICAgICAgICAgICAgICAgIHBhcmVudGRpdi5zdHlsZS5wb3NpdGlvbiA9 ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAgICAgICAgICBpZiAocGx1Z2luRGl2WikKLSAgICAgICAg ICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdpbkRpdlo7Ci0KLSAgICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBhcmVudGRpdik7Ci0gICAgICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZlKQotICAgICAg ICAgICAgICAgICAgICBwZC5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAg ICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgdmFy IGFwcGVuZFBsdWdpbiA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgIHZhciBwZDsKKyAgICAgICAg ICBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRleCkgeworICAgICAgICAgICAgICBw ZCA9IG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpOworICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAgICAgICAgICB9 CisKKyAgICAgICAgICBpZiAodGFncy5wbHVnaW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2Wikgewor ICAgICAgICAgICAgICB2YXIgcGFyZW50ZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2 Jyk7CisgICAgICAgICAgICAgIHBhcmVudGRpdi5hcHBlbmRDaGlsZChwZCkKKyAgICAgICAgICAg ICAgaWYgKCF0YWdzLnBsdWdpbk5vcmVsYXRpdmUpCisgICAgICAgICAgICAgICAgICBwYXJlbnRk aXYuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworCisgICAgICAgICAgICAgIGlmIChwbHVn aW5EaXZaKQorICAgICAgICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdp bkRpdlo7CisKKyAgICAgICAgICAgICAgcm9vdC5hcHBlbmRDaGlsZChwYXJlbnRkaXYpOworICAg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZl KQorICAgICAgICAgICAgICAgICAgcGQuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKKyAgICAgICAgICB9CiAgICAgICAgIH07 CiAKICAgICAgICAgaWYgKHRhZ3Mub3ZlcmxheUVhcmxpZXIpIHsKQEAgLTE4NCw3ICsyMDEsNyBA QAogICAgICAgICBhZGRDYXNlKDEsIDMsIHsnb3ZlcmxheUVhcmxpZXInOjEsICdwbHVnaW5Ob3Jl bGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2JzoxLCBleHBlY3Q6J292ZXJsYXkgT1ZFUid9KTsK ICAgICAgICAgYWRkQ2FzZSgyLCAzLCB7J3BsdWdpbk5vcmVsYXRpdmUnOjEsICdwbHVnaW5JbnNp ZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVSJ30pOwogICAgICAgICBhZGRDYXNlKDMsIDMs IHsncGx1Z2luTG93ZXJ6JzoxLCAnb3ZlcmxheU9uVGltZW91dCc6MSwgZXhwZWN0OidvdmVybGF5 IE9WRVInfSk7Ci0KKyAgICAgICAgYWRkQ2FzZSg0LCAwLCB7ICdwbHVnaW5FeHBsaWNpdEhpZ2hl clpJbmRleCc6IDEsICdwbHVnaW5Ob3JlbGF0aXZlJzogMSwgJ3BsdWdpbkluc2lkZURpdic6IDEs ICdvdmVybGF5SW5zaWRlRGl2JzogMSwgZXhwZWN0OiAnb3ZlcmxheSBVTkRFUicgfSk7CiAgICAg ICAgIHJ1blRlc3QoKTsKICAgICB9CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODMz MykKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxOCBAQAorMjAxMC0wOS0yNSAgQW5hbnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdpbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyAgICAg ICAgCisgICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1lbnRzIHRo ZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3aW5kb3dl ZCBwbHVnaW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNob3VsZAorICAgICAgICBob25vciB0 aGUgei1pbmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6LWluZGV4 CisgICAgICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1lIHNoaW0g dGhlbiB0aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0aGUgaWZy YW1lLgorCisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorCiAyMDEw LTA5LTI1ICBOaWNvbGFzIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2Vi UGx1Z2luQ29udGFpbmVySW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCShyZXZpc2lvbiA2Nzk4OCkKKysrIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTU0MSwxMSArNTQxLDIwIEBAIHN0YXRpYyBib29sIGNoZWNrU3RhY2tPblRvcCgKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAg ICAvLyBGb3IgY29tcGF0aWJpbGl0eSB3aXRoIElFOiB3aGVuIHRoZSBwbHVnaW4gaXMgbm90IHBv c2l0aW9uZWQsCi0gICAgICAgICAgICAvLyBpdCBzdGFja3MgYmVoaW5kIHRoZSBpZnJhbWUsIGV2 ZW4gaWYgaXQncyBsYXRlciBpbiB0aGUKLSAgICAgICAgICAgIC8vIGRvY3VtZW50IG9yZGVyLgot ICAgICAgICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlv bikKKyAgICAgICAgICAgIC8vIElmIHRoZSBwbHVnaW4gZG9lcyBub3QgaGF2ZSBhbiBleHBsaWNp dCB6LWluZGV4IGl0IHN0YWNrcyBiZWhpbmQgdGhlIGlmcmFtZS4KKyAgICAgICAgICAgIC8vIFRo aXMgaXMgZm9yIG1haW50YWluaW5nIGNvbXBhdGliaWxpdHkgd2l0aCBJRS4KKyAgICAgICAgICAg IGlmIChybzItPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gU3RhdGljUG9zaXRpb24pIHsKKyAgICAg ICAgICAgICAgICAvLyBUaGUgMCd0aCBlbGVtZW50cyBvZiB0aGVzZSBSZW5kZXJPYmplY3QgYXJy YXlzIHJlcHJlc2VudCB0aGUgcGx1Z2luIG5vZGUgYW5kCisgICAgICAgICAgICAgICAgLy8gdGhl IGlmcmFtZS4KKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QqIHBsdWdpblJlbmRl ck9iamVjdCA9IHBsdWdpblpzdGFja1swXTsKKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJP YmplY3QqIGlmcmFtZVJlbmRlck9iamVjdCA9IGlmcmFtZVpzdGFja1swXTsKKworICAgICAgICAg ICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmplY3QtPnN0eWxlKCkgJiYgaWZyYW1lUmVuZGVyT2Jq ZWN0LT5zdHlsZSgpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmpl Y3QtPnN0eWxlKCktPnpJbmRleCgpID4gaWZyYW1lUmVuZGVyT2JqZWN0LT5zdHlsZSgpLT56SW5k ZXgoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIC8vIEluc3BlY3QgdGhlIGRvY3VtZW50IG9yZGVyLiAgTGF0ZXIgb3JkZXIgbWVh bnMgaGlnaGVyCiAgICAgICAgICAgICAvLyBzdGFja2luZy4K 68832 2010-09-25 10:28:47 -0700 2010-09-25 10:31:52 -0700 Updated patch with formatting errors fixed iframe_shim_fix.txt text/plain 5394 ananta SW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCShyZXZpc2lvbiA2Nzk4 OCkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTIwLDYgKzIwLDE0IEBACiAgICAgICAgIHJldHVybiBmOwogICAgIH0KIAorICAgIGZ1 bmN0aW9uIG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpCisgICAgeworICAgICAg ICB2YXIgZiA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgIGYuc3R5bGUuekluZGV4ID0g MTAwMDsKKyAgICAgICAgZi5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7CisgICAgICAgIHJl dHVybiBmOworICAgIH0KKwogICAgIGZ1bmN0aW9uIG1ha2VJZnJhbWVEaXYoKQogICAgIHsKICAg ICAgICAgdmFyIGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTsKQEAgLTEwOSwy NyArMTE3LDM2IEBACiAgICAgICAgICAgICBwbHVnaW5EaXZaID0gMTAwOwogICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAxMDA7CisgICAgICAgIH0gZWxzZSBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRl eCkgeworICAgICAgICAgICAgLy8gRm9yIHRoaXMgdGVzdCBjYXNlIHdlIHNldCB0aGUgei1pbmRl eCBmb3IgdGhlIGlmcmFtZSBhbmQgdGhlIG92ZXJsYXkKKyAgICAgICAgICAgIC8vIHRvIGJlIGxv d2VyIHRoYW4gdGhlIHBsdWdpbi4KKyAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAw OworICAgICAgICAgICAgb3ZlcmxheURpdlpPdmVybGF5ID0gMDsKICAgICAgICAgfQogCi0gICAg ICAgIHZhciBhcHBlbmRQbHVnaW4gPSBmdW5jdGlvbigpCi0gICAgICAgIHsKLSAgICAgICAgICAg IHZhciBwZCA9IG1ha2VQbHVnaW5FbGVtZW50KCk7Ci0gICAgICAgICAgICBpZiAodGFncy5wbHVn aW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2WikgewotICAgICAgICAgICAgICAgIHZhciBwYXJlbnRk aXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKLSAgICAgICAgICAgICAgICBwYXJl bnRkaXYuYXBwZW5kQ2hpbGQocGQpCi0gICAgICAgICAgICAgICAgaWYgKCF0YWdzLnBsdWdpbk5v cmVsYXRpdmUpCi0gICAgICAgICAgICAgICAgICAgIHBhcmVudGRpdi5zdHlsZS5wb3NpdGlvbiA9 ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAgICAgICAgICBpZiAocGx1Z2luRGl2WikKLSAgICAgICAg ICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdpbkRpdlo7Ci0KLSAgICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBhcmVudGRpdik7Ci0gICAgICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZlKQotICAgICAg ICAgICAgICAgICAgICBwZC5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAg ICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgdmFy IGFwcGVuZFBsdWdpbiA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgIHZhciBwZDsKKyAgICAgICAg ICBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRleCkgeworICAgICAgICAgICAgICBw ZCA9IG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpOworICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAgICAgICAgICB9 CisKKyAgICAgICAgICBpZiAodGFncy5wbHVnaW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2Wikgewor ICAgICAgICAgICAgICB2YXIgcGFyZW50ZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2 Jyk7CisgICAgICAgICAgICAgIHBhcmVudGRpdi5hcHBlbmRDaGlsZChwZCkKKyAgICAgICAgICAg ICAgaWYgKCF0YWdzLnBsdWdpbk5vcmVsYXRpdmUpCisgICAgICAgICAgICAgICAgICBwYXJlbnRk aXYuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworCisgICAgICAgICAgICAgIGlmIChwbHVn aW5EaXZaKQorICAgICAgICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdp bkRpdlo7CisKKyAgICAgICAgICAgICAgcm9vdC5hcHBlbmRDaGlsZChwYXJlbnRkaXYpOworICAg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZl KQorICAgICAgICAgICAgICAgICAgcGQuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKKyAgICAgICAgICB9CiAgICAgICAgIH07 CiAKICAgICAgICAgaWYgKHRhZ3Mub3ZlcmxheUVhcmxpZXIpIHsKQEAgLTE4NCw3ICsyMDEsNyBA QAogICAgICAgICBhZGRDYXNlKDEsIDMsIHsnb3ZlcmxheUVhcmxpZXInOjEsICdwbHVnaW5Ob3Jl bGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2JzoxLCBleHBlY3Q6J292ZXJsYXkgT1ZFUid9KTsK ICAgICAgICAgYWRkQ2FzZSgyLCAzLCB7J3BsdWdpbk5vcmVsYXRpdmUnOjEsICdwbHVnaW5JbnNp ZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVSJ30pOwogICAgICAgICBhZGRDYXNlKDMsIDMs IHsncGx1Z2luTG93ZXJ6JzoxLCAnb3ZlcmxheU9uVGltZW91dCc6MSwgZXhwZWN0OidvdmVybGF5 IE9WRVInfSk7Ci0KKyAgICAgICAgYWRkQ2FzZSg0LCAwLCB7ICdwbHVnaW5FeHBsaWNpdEhpZ2hl clpJbmRleCc6IDEsICdwbHVnaW5Ob3JlbGF0aXZlJzogMSwgJ3BsdWdpbkluc2lkZURpdic6IDEs ICdvdmVybGF5SW5zaWRlRGl2JzogMSwgZXhwZWN0OiAnb3ZlcmxheSBVTkRFUicgfSk7CiAgICAg ICAgIHJ1blRlc3QoKTsKICAgICB9CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODMz MykKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxOCBAQAorMjAxMC0wOS0yNSAgQW5hbnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdpbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyAgICAg ICAgCisgICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1lbnRzIHRo ZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3aW5kb3dl ZCBwbHVnaW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNob3VsZAorICAgICAgICBob25vciB0 aGUgei1pbmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6LWluZGV4 CisgICAgICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1lIHNoaW0g dGhlbiB0aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0aGUgaWZy YW1lLgorCisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorCiAyMDEw LTA5LTI1ICBOaWNvbGFzIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2Vi UGx1Z2luQ29udGFpbmVySW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCShyZXZpc2lvbiA2Nzk4OCkKKysrIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTU0MSwxMSArNTQxLDIwIEBAIHN0YXRpYyBib29sIGNoZWNrU3RhY2tPblRvcCgKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAg ICAvLyBGb3IgY29tcGF0aWJpbGl0eSB3aXRoIElFOiB3aGVuIHRoZSBwbHVnaW4gaXMgbm90IHBv c2l0aW9uZWQsCi0gICAgICAgICAgICAvLyBpdCBzdGFja3MgYmVoaW5kIHRoZSBpZnJhbWUsIGV2 ZW4gaWYgaXQncyBsYXRlciBpbiB0aGUKLSAgICAgICAgICAgIC8vIGRvY3VtZW50IG9yZGVyLgot ICAgICAgICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlv bikKKyAgICAgICAgICAgIC8vIElmIHRoZSBwbHVnaW4gZG9lcyBub3QgaGF2ZSBhbiBleHBsaWNp dCB6LWluZGV4IGl0IHN0YWNrcyBiZWhpbmQgdGhlIGlmcmFtZS4KKyAgICAgICAgICAgIC8vIFRo aXMgaXMgZm9yIG1haW50YWluaW5nIGNvbXBhdGliaWxpdHkgd2l0aCBJRS4KKyAgICAgICAgICAg IGlmIChybzItPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gU3RhdGljUG9zaXRpb24pIHsKKyAgICAg ICAgICAgICAgICAvLyBUaGUgMCd0aCBlbGVtZW50cyBvZiB0aGVzZSBSZW5kZXJPYmplY3QgYXJy YXlzIHJlcHJlc2VudCB0aGUgcGx1Z2luIG5vZGUgYW5kCisgICAgICAgICAgICAgICAgLy8gdGhl IGlmcmFtZS4KKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QqIHBsdWdpblJlbmRl ck9iamVjdCA9IHBsdWdpblpzdGFja1swXTsKKyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJP YmplY3QqIGlmcmFtZVJlbmRlck9iamVjdCA9IGlmcmFtZVpzdGFja1swXTsKKworICAgICAgICAg ICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmplY3QtPnN0eWxlKCkgJiYgaWZyYW1lUmVuZGVyT2Jq ZWN0LT5zdHlsZSgpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmpl Y3QtPnN0eWxlKCktPnpJbmRleCgpID4gaWZyYW1lUmVuZGVyT2JqZWN0LT5zdHlsZSgpLT56SW5k ZXgoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIC8vIEluc3BlY3QgdGhlIGRvY3VtZW50IG9yZGVyLiAgTGF0ZXIgb3JkZXIgbWVh bnMgaGlnaGVyCiAgICAgICAgICAgICAvLyBzdGFja2luZy4K 68833 2010-09-25 10:31:52 -0700 2010-09-25 10:34:55 -0700 Fixed the formatting in the layout test iframe_shim_fix.txt text/plain 5450 ananta SW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCShyZXZpc2lvbiA2Nzk4 OCkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTIwLDYgKzIwLDE0IEBACiAgICAgICAgIHJldHVybiBmOwogICAgIH0KIAorICAgIGZ1 bmN0aW9uIG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpCisgICAgeworICAgICAg ICB2YXIgZiA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgIGYuc3R5bGUuekluZGV4ID0g MTAwMDsKKyAgICAgICAgZi5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7CisgICAgICAgIHJl dHVybiBmOworICAgIH0KKwogICAgIGZ1bmN0aW9uIG1ha2VJZnJhbWVEaXYoKQogICAgIHsKICAg ICAgICAgdmFyIGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTsKQEAgLTEwOSwy NyArMTE3LDM2IEBACiAgICAgICAgICAgICBwbHVnaW5EaXZaID0gMTAwOwogICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAxMDA7CisgICAgICAgIH0gZWxzZSBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRl eCkgeworICAgICAgICAgICAgLy8gRm9yIHRoaXMgdGVzdCBjYXNlIHdlIHNldCB0aGUgei1pbmRl eCBmb3IgdGhlIGlmcmFtZSBhbmQgdGhlIG92ZXJsYXkKKyAgICAgICAgICAgIC8vIHRvIGJlIGxv d2VyIHRoYW4gdGhlIHBsdWdpbi4KKyAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAw OworICAgICAgICAgICAgb3ZlcmxheURpdlpPdmVybGF5ID0gMDsKICAgICAgICAgfQogCi0gICAg ICAgIHZhciBhcHBlbmRQbHVnaW4gPSBmdW5jdGlvbigpCi0gICAgICAgIHsKLSAgICAgICAgICAg IHZhciBwZCA9IG1ha2VQbHVnaW5FbGVtZW50KCk7Ci0gICAgICAgICAgICBpZiAodGFncy5wbHVn aW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2WikgewotICAgICAgICAgICAgICAgIHZhciBwYXJlbnRk aXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKLSAgICAgICAgICAgICAgICBwYXJl bnRkaXYuYXBwZW5kQ2hpbGQocGQpCi0gICAgICAgICAgICAgICAgaWYgKCF0YWdzLnBsdWdpbk5v cmVsYXRpdmUpCi0gICAgICAgICAgICAgICAgICAgIHBhcmVudGRpdi5zdHlsZS5wb3NpdGlvbiA9 ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAgICAgICAgICBpZiAocGx1Z2luRGl2WikKLSAgICAgICAg ICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdpbkRpdlo7Ci0KLSAgICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBhcmVudGRpdik7Ci0gICAgICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZlKQotICAgICAg ICAgICAgICAgICAgICBwZC5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7Ci0KLSAgICAgICAg ICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgdmFy IGFwcGVuZFBsdWdpbiA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgIHZhciBwZDsKKyAgICAgICAg ICBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRleCkgeworICAgICAgICAgICAgICBw ZCA9IG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpOworICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAgICAgICAgICB9 CisKKyAgICAgICAgICBpZiAodGFncy5wbHVnaW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2Wikgewor ICAgICAgICAgICAgICB2YXIgcGFyZW50ZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2 Jyk7CisgICAgICAgICAgICAgIHBhcmVudGRpdi5hcHBlbmRDaGlsZChwZCkKKyAgICAgICAgICAg ICAgaWYgKCF0YWdzLnBsdWdpbk5vcmVsYXRpdmUpCisgICAgICAgICAgICAgICAgICBwYXJlbnRk aXYuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworCisgICAgICAgICAgICAgIGlmIChwbHVn aW5EaXZaKQorICAgICAgICAgICAgICAgICAgcGFyZW50ZGl2LnN0eWxlLnpJbmRleCA9IHBsdWdp bkRpdlo7CisKKyAgICAgICAgICAgICAgcm9vdC5hcHBlbmRDaGlsZChwYXJlbnRkaXYpOworICAg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZl KQorICAgICAgICAgICAgICAgICAgcGQuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworICAg ICAgICAgICAgICByb290LmFwcGVuZENoaWxkKHBkKTsKKyAgICAgICAgICB9CiAgICAgICAgIH07 CiAKICAgICAgICAgaWYgKHRhZ3Mub3ZlcmxheUVhcmxpZXIpIHsKQEAgLTE4NCw3ICsyMDEsNyBA QAogICAgICAgICBhZGRDYXNlKDEsIDMsIHsnb3ZlcmxheUVhcmxpZXInOjEsICdwbHVnaW5Ob3Jl bGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2JzoxLCBleHBlY3Q6J292ZXJsYXkgT1ZFUid9KTsK ICAgICAgICAgYWRkQ2FzZSgyLCAzLCB7J3BsdWdpbk5vcmVsYXRpdmUnOjEsICdwbHVnaW5JbnNp ZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVSJ30pOwogICAgICAgICBhZGRDYXNlKDMsIDMs IHsncGx1Z2luTG93ZXJ6JzoxLCAnb3ZlcmxheU9uVGltZW91dCc6MSwgZXhwZWN0OidvdmVybGF5 IE9WRVInfSk7Ci0KKyAgICAgICAgYWRkQ2FzZSg0LCAwLCB7ICdwbHVnaW5FeHBsaWNpdEhpZ2hl clpJbmRleCc6IDEsICdwbHVnaW5Ob3JlbGF0aXZlJzogMSwgJ3BsdWdpbkluc2lkZURpdic6IDEs ICdvdmVybGF5SW5zaWRlRGl2JzogMSwgZXhwZWN0OiAnb3ZlcmxheSBVTkRFUicgfSk7CiAgICAg ICAgIHJ1blRlc3QoKTsKICAgICB9CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODMz NCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxOSBAQAorMjAxMC0wOS0yNSAgQW5hbnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdpbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyAgICAg ICAgCisgICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1lbnRzIHRo ZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3aW5kb3dl ZCBwbHVnaW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNob3VsZAorICAgICAgICBob25vciB0 aGUgei1pbmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6LWluZGV4 CisgICAgICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1lIHNoaW0g dGhlbiB0aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0aGUgaWZy YW1lLiBVcGRhdGVkIHRoZSBsYXlvdXQgdGVzdCB0byB0ZXN0CisgICAgICAgIGZvciB0aGlzIGNh c2UuCisKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisKIDIwMTAt MDktMjUgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQ bHVnaW5Db250YWluZXJJbXBsLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9z cmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHJldmlzaW9uIDY3OTg4KQorKysgV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNTQxLDExICs1NDEsMjAgQEAgc3RhdGljIGJvb2wgY2hlY2tTdGFja09uVG9wKAogICAgICAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAg IC8vIEZvciBjb21wYXRpYmlsaXR5IHdpdGggSUU6IHdoZW4gdGhlIHBsdWdpbiBpcyBub3QgcG9z aXRpb25lZCwKLSAgICAgICAgICAgIC8vIGl0IHN0YWNrcyBiZWhpbmQgdGhlIGlmcmFtZSwgZXZl biBpZiBpdCdzIGxhdGVyIGluIHRoZQotICAgICAgICAgICAgLy8gZG9jdW1lbnQgb3JkZXIuCi0g ICAgICAgICAgICBpZiAocm8yLT5zdHlsZSgpLT5wb3NpdGlvbigpID09IFN0YXRpY1Bvc2l0aW9u KQorICAgICAgICAgICAgLy8gSWYgdGhlIHBsdWdpbiBkb2VzIG5vdCBoYXZlIGFuIGV4cGxpY2l0 IHotaW5kZXggaXQgc3RhY2tzIGJlaGluZCB0aGUgaWZyYW1lLgorICAgICAgICAgICAgLy8gVGhp cyBpcyBmb3IgbWFpbnRhaW5pbmcgY29tcGF0aWJpbGl0eSB3aXRoIElFLgorICAgICAgICAgICAg aWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlvbikgeworICAgICAg ICAgICAgICAgIC8vIFRoZSAwJ3RoIGVsZW1lbnRzIG9mIHRoZXNlIFJlbmRlck9iamVjdCBhcnJh eXMgcmVwcmVzZW50IHRoZSBwbHVnaW4gbm9kZSBhbmQKKyAgICAgICAgICAgICAgICAvLyB0aGUg aWZyYW1lLgorICAgICAgICAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCogcGx1Z2luUmVuZGVy T2JqZWN0ID0gcGx1Z2luWnN0YWNrWzBdOworICAgICAgICAgICAgICAgIGNvbnN0IFJlbmRlck9i amVjdCogaWZyYW1lUmVuZGVyT2JqZWN0ID0gaWZyYW1lWnN0YWNrWzBdOworCisgICAgICAgICAg ICAgICAgaWYgKHBsdWdpblJlbmRlck9iamVjdC0+c3R5bGUoKSAmJiBpZnJhbWVSZW5kZXJPYmpl Y3QtPnN0eWxlKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHBsdWdpblJlbmRlck9iamVj dC0+c3R5bGUoKS0+ekluZGV4KCkgPiBpZnJhbWVSZW5kZXJPYmplY3QtPnN0eWxlKCktPnpJbmRl eCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgLy8gSW5zcGVjdCB0aGUgZG9jdW1lbnQgb3JkZXIuICBMYXRlciBvcmRlciBtZWFu cyBoaWdoZXIKICAgICAgICAgICAgIC8vIHN0YWNraW5nLgo= 68834 2010-09-25 10:34:55 -0700 2010-09-28 03:18:49 -0700 Hopefully the last of the formatting fix. iframe_shim_fix.txt text/plain 4601 ananta SW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCShyZXZpc2lvbiA2Nzk4 OCkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTIwLDYgKzIwLDE0IEBACiAgICAgICAgIHJldHVybiBmOwogICAgIH0KIAorICAgIGZ1 bmN0aW9uIG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpCisgICAgeworICAgICAg ICB2YXIgZiA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgIGYuc3R5bGUuekluZGV4ID0g MTAwMDsKKyAgICAgICAgZi5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7CisgICAgICAgIHJl dHVybiBmOworICAgIH0KKwogICAgIGZ1bmN0aW9uIG1ha2VJZnJhbWVEaXYoKQogICAgIHsKICAg ICAgICAgdmFyIGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTsKQEAgLTEwOSwx MSArMTE3LDIyIEBACiAgICAgICAgICAgICBwbHVnaW5EaXZaID0gMTAwOwogICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAxMDA7CisgICAgICAgIH0gZWxzZSBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRl eCkgeworICAgICAgICAgICAgLy8gRm9yIHRoaXMgdGVzdCBjYXNlIHdlIHNldCB0aGUgei1pbmRl eCBmb3IgdGhlIGlmcmFtZSBhbmQgdGhlIG92ZXJsYXkKKyAgICAgICAgICAgIC8vIHRvIGJlIGxv d2VyIHRoYW4gdGhlIHBsdWdpbi4KKyAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAw OworICAgICAgICAgICAgb3ZlcmxheURpdlpPdmVybGF5ID0gMDsKICAgICAgICAgfQogCiAgICAg ICAgIHZhciBhcHBlbmRQbHVnaW4gPSBmdW5jdGlvbigpCiAgICAgICAgIHsKLSAgICAgICAgICAg IHZhciBwZCA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgICAgICB2YXIgcGQ7CisgICAg ICAgICAgICBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRleCkgeworICAgICAgICAg ICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnRXaXRoSGlnaGVyWkluZGV4KCk7CisgICAgICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsK KyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgaWYgKHRhZ3MucGx1Z2luSW5zaWRlRGl2IHx8 IHBsdWdpbkRpdlopIHsKICAgICAgICAgICAgICAgICB2YXIgcGFyZW50ZGl2ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgnZGl2Jyk7CiAgICAgICAgICAgICAgICAgcGFyZW50ZGl2LmFwcGVuZENo aWxkKHBkKQpAQCAtMTI3LDcgKzE0Niw2IEBACiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAg ICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZlKQogICAgICAgICAgICAgICAgICAg ICBwZC5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7Ci0KICAgICAgICAgICAgICAgICByb290 LmFwcGVuZENoaWxkKHBkKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfTsKQEAgLTE4NCw3ICsy MDIsNyBAQAogICAgICAgICBhZGRDYXNlKDEsIDMsIHsnb3ZlcmxheUVhcmxpZXInOjEsICdwbHVn aW5Ob3JlbGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2JzoxLCBleHBlY3Q6J292ZXJsYXkgT1ZF Uid9KTsKICAgICAgICAgYWRkQ2FzZSgyLCAzLCB7J3BsdWdpbk5vcmVsYXRpdmUnOjEsICdwbHVn aW5JbnNpZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVSJ30pOwogICAgICAgICBhZGRDYXNl KDMsIDMsIHsncGx1Z2luTG93ZXJ6JzoxLCAnb3ZlcmxheU9uVGltZW91dCc6MSwgZXhwZWN0Oidv dmVybGF5IE9WRVInfSk7Ci0KKyAgICAgICAgYWRkQ2FzZSg0LCAwLCB7ICdwbHVnaW5FeHBsaWNp dEhpZ2hlclpJbmRleCc6IDEsICdwbHVnaW5Ob3JlbGF0aXZlJzogMSwgJ3BsdWdpbkluc2lkZURp dic6IDEsICdvdmVybGF5SW5zaWRlRGl2JzogMSwgZXhwZWN0OiAnb3ZlcmxheSBVTkRFUicgfSk7 CiAgICAgICAgIHJ1blRlc3QoKTsKICAgICB9CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lv biA2ODMzNCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxOSBAQAorMjAxMC0wOS0yNSAgQW5hbnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFu YW50YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdp bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMK KyAgICAgICAgCisgICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1l bnRzIHRoZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3 aW5kb3dlZCBwbHVnaW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNob3VsZAorICAgICAgICBo b25vciB0aGUgei1pbmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6 LWluZGV4CisgICAgICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1l IHNoaW0gdGhlbiB0aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0 aGUgaWZyYW1lLiBVcGRhdGVkIHRoZSBsYXlvdXQgdGVzdCB0byB0ZXN0CisgICAgICAgIGZvciB0 aGlzIGNhc2UuCisKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisK IDIwMTAtMDktMjUgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHJldmlzaW9uIDY3OTg4KQorKysg V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTQxLDExICs1NDEsMjAgQEAgc3RhdGljIGJvb2wgY2hlY2tTdGFja09uVG9wKAog ICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9CiAKLSAgICAg ICAgICAgIC8vIEZvciBjb21wYXRpYmlsaXR5IHdpdGggSUU6IHdoZW4gdGhlIHBsdWdpbiBpcyBu b3QgcG9zaXRpb25lZCwKLSAgICAgICAgICAgIC8vIGl0IHN0YWNrcyBiZWhpbmQgdGhlIGlmcmFt ZSwgZXZlbiBpZiBpdCdzIGxhdGVyIGluIHRoZQotICAgICAgICAgICAgLy8gZG9jdW1lbnQgb3Jk ZXIuCi0gICAgICAgICAgICBpZiAocm8yLT5zdHlsZSgpLT5wb3NpdGlvbigpID09IFN0YXRpY1Bv c2l0aW9uKQorICAgICAgICAgICAgLy8gSWYgdGhlIHBsdWdpbiBkb2VzIG5vdCBoYXZlIGFuIGV4 cGxpY2l0IHotaW5kZXggaXQgc3RhY2tzIGJlaGluZCB0aGUgaWZyYW1lLgorICAgICAgICAgICAg Ly8gVGhpcyBpcyBmb3IgbWFpbnRhaW5pbmcgY29tcGF0aWJpbGl0eSB3aXRoIElFLgorICAgICAg ICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlvbikgewor ICAgICAgICAgICAgICAgIC8vIFRoZSAwJ3RoIGVsZW1lbnRzIG9mIHRoZXNlIFJlbmRlck9iamVj dCBhcnJheXMgcmVwcmVzZW50IHRoZSBwbHVnaW4gbm9kZSBhbmQKKyAgICAgICAgICAgICAgICAv LyB0aGUgaWZyYW1lLgorICAgICAgICAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCogcGx1Z2lu UmVuZGVyT2JqZWN0ID0gcGx1Z2luWnN0YWNrWzBdOworICAgICAgICAgICAgICAgIGNvbnN0IFJl bmRlck9iamVjdCogaWZyYW1lUmVuZGVyT2JqZWN0ID0gaWZyYW1lWnN0YWNrWzBdOworCisgICAg ICAgICAgICAgICAgaWYgKHBsdWdpblJlbmRlck9iamVjdC0+c3R5bGUoKSAmJiBpZnJhbWVSZW5k ZXJPYmplY3QtPnN0eWxlKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHBsdWdpblJlbmRl ck9iamVjdC0+c3R5bGUoKS0+ekluZGV4KCkgPiBpZnJhbWVSZW5kZXJPYmplY3QtPnN0eWxlKCkt PnpJbmRleCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgLy8gSW5zcGVjdCB0aGUgZG9jdW1lbnQgb3JkZXIuICBMYXRlciBvcmRl ciBtZWFucyBoaWdoZXIKICAgICAgICAgICAgIC8vIHN0YWNraW5nLgo= 69012 2010-09-27 19:19:26 -0700 2010-09-28 11:11:06 -0700 Updated patch with the iframe-shims.html added to skipped list for mac platforms. iframe_shim_fix.txt text/plain 9699 ananta SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIExheW91dFRlc3Rz L0NoYW5nZUxvZwkocmV2aXNpb24gNjg0NzApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wOS0yNyAgQW5hbnRhbmFyYXlhbmFu IEcgSXllbmdhciAgPGFuYW50YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNp ZmllZCBieSBhIHBsdWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDYyMjMKKyAgICAgICAgCisgICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29k ZSB3aGljaCBpbXBsZW1lbnRzIHRoZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9y IG92ZXJsYXlpbmcgYSB3aW5kb3dlZCBwbHVnaW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNo b3VsZAorICAgICAgICBob25vciB0aGUgei1pbmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3 aWRnZXQuIElmIHRoZSB6LWluZGV4CisgICAgICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBl bmNsb3NpbmcgaWZyYW1lIHNoaW0gdGhlbiB0aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBk aXNwbGF5ZWQgb3ZlciB0aGUgaWZyYW1lLiBVcGRhdGVkIHRoZSBsYXlvdXQgdGVzdCB0byB0ZXN0 CisgICAgICAgIGZvciB0aGlzIGNhc2UuIFRoZSBXZWJLaXQgcGx1Z2luIGltcGxlbWVudGF0aW9u IGRvZXMgbm90IHN1cHBvcnQgaWZyYW1lCisgICAgICAgIHNoaW1zLiBBZGRlZCB0aGUgaWZyYW1l LXNoaW1zLmh0bWwgdGVzdCB0byB0aGUgU2tpcHBlZCBsaXN0IGZvciB0aGUgbWFjCisgICAgICAg IHBsYXRmb3Jtcy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy1sZW9wYXJkL1NraXBwZWQ6Cisg ICAgICAgICogcGxhdGZvcm0vbWFjLXNub3dsZW9wYXJkL1NraXBwZWQ6CisgICAgICAgICogcGxh dGZvcm0vbWFjLXRpZ2VyL1NraXBwZWQ6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1NraXBwZWQ6 CisgICAgICAgICogcGx1Z2lucy9pZnJhbWUtc2hpbXMuaHRtbDoKKwogMjAxMC0wOS0yNyAgTU9S SVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBh ZGQgYW4gZXhwZWN0YXRpb24uCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbGVvcGFy ZC9Ta2lwcGVkDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLWxlb3Bh cmQvU2tpcHBlZAkocmV2aXNpb24gNjg0NjkpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMt bGVvcGFyZC9Ta2lwcGVkCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsMyArMTAwLDcgQEAgbWVkaWEv dmlkZW8tYXV0b3BsYXkuaHRtbAogbWVkaWEvdmlkZW8tYXNwZWN0LXJhdGlvLmh0bWwKIG1lZGlh L3ZpZGVvLXBsYXktcGF1c2UtZXZlbnRzLmh0bWwKIG1lZGlhL3ZpZGVvLXdpZHRoLWhlaWdodC5o dG1sCisKKyMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MjIzCisj IFRoZSBXZWJLaXQgcGx1Z2luIGltcGxlbWVudGF0aW9uIGRvZXMgbm90IHN1cHBvcnQgaWZyYW1l IHNoaW1zLgorcGx1Z2lucy9pZnJhbWUtc2hpbXMuaHRtbApJbmRleDogTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjLXNub3dsZW9wYXJkL1NraXBwZWQNCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZAkocmV2aXNpb24gNjg0NjkpCisrKyBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZAkod29ya2luZyBjb3B5 KQpAQCAtMTM3LDMgKzEzNyw3IEBAIHN0b3JhZ2UvaW5kZXhlZGRiCiAjIFBoaWxpcCdzIGNhbnZh cyB0ZXN0cyB0aGF0IGZhaWwgb24gU25vd0xlb3BhcmQgb25seQogY2FudmFzL3BoaWxpcC90ZXN0 cy8yZC5ncmFkaWVudC5pbnRlcnBvbGF0ZS5vdmVybGFwLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVz dHMvMmQuZ3JhZGllbnQuaW50ZXJwb2xhdGUub3ZlcmxhcDIuaHRtbAorCisjIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjIyMworIyBUaGUgV2ViS2l0IHBsdWdpbiBp bXBsZW1lbnRhdGlvbiBkb2VzIG5vdCBzdXBwb3J0IGlmcmFtZSBzaGltcy4KK3BsdWdpbnMvaWZy YW1lLXNoaW1zLmh0bWwKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy10aWdlci9Ta2lw cGVkDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXRpZ2VyL1NraXBw ZWQJKHJldmlzaW9uIDY4NDY5KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXRpZ2VyL1Nr aXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTIwNiwzICsyMDYsNyBAQCBmYXN0L2hhcm5lc3Mvc2hv dy1tb2RhbC1kaWFsb2cuaHRtbAogCiAjIExvYWRpbmcgZmFpbHMgb24gVGlnZXIgd2l0aCBlcnJv ciAtMTAxMiBhZnRlciBhc2tpbmcgTlNVUkxDb25uZWN0aW9uIHRvIGNvbnRpbnVlIHdpdGhvdXQg Y3JlZGVudGlhbHMuCiBodHRwL3Rlc3RzL21pc2MvNDAxLWFsdGVybmF0aXZlLWNvbnRlbnQucGhw CisKKyMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MjIzCisjIFRo ZSBXZWJLaXQgcGx1Z2luIGltcGxlbWVudGF0aW9uIGRvZXMgbm90IHN1cHBvcnQgaWZyYW1lIHNo aW1zLgorcGx1Z2lucy9pZnJhbWUtc2hpbXMuaHRtbApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL1NraXBwZWQNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv U2tpcHBlZAkocmV2aXNpb24gNjg0NjkpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tp cHBlZAkod29ya2luZyBjb3B5KQpAQCAtMzIwLDMgKzMyMCw3IEBAIGZhc3QvZmlsZXN5c3RlbQog CiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDcxMwogZmFzdC9m cmFtZXMvaWZyYW1lLXJlcGFyZW50aW5nLWFkb3B0LW5vZGUuaHRtbAorCisjIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjIyMworIyBUaGUgV2ViS2l0IHBsdWdpbiBp bXBsZW1lbnRhdGlvbiBkb2VzIG5vdCBzdXBwb3J0IGlmcmFtZSBzaGltcy4KK3BsdWdpbnMvaWZy YW1lLXNoaW1zLmh0bWwKSW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0 bWwNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0NCi0tLSBMYXlvdXRUZXN0cy9wbHVnaW5zL2lmcmFtZS1zaGltcy5odG1s CShyZXZpc2lvbiA2ODQ2OSkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTIwLDYgKzIwLDE0IEBACiAgICAgICAgIHJldHVybiBmOwog ICAgIH0KIAorICAgIGZ1bmN0aW9uIG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgp CisgICAgeworICAgICAgICB2YXIgZiA9IG1ha2VQbHVnaW5FbGVtZW50KCk7CisgICAgICAgIGYu c3R5bGUuekluZGV4ID0gMTAwMDsKKyAgICAgICAgZi5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2 ZSc7CisgICAgICAgIHJldHVybiBmOworICAgIH0KKwogICAgIGZ1bmN0aW9uIG1ha2VJZnJhbWVE aXYoKQogICAgIHsKICAgICAgICAgdmFyIGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJh bWUnKTsKQEAgLTM0LDcgKzQyLDcgQEAKICAgICB9CiAKICAgICBmdW5jdGlvbiBtYWtlT3Zlcmxh eURpdihjb2xvciwgY2FzZUlkKQotICAgIHsKKyAgICB7DQogICAgICAgICB2YXIgbyA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpOwogICAgICAgICBvLnN0eWxlLnBvc2l0aW9uID0gJ2Fi c29sdXRlJzsKICAgICAgICAgby5zdHlsZS50b3AgPSAnMTBweCc7CkBAIC04NCw4ICs5Miw4IEBA CiAgICAgICAgIGl0ZW1zKys7CiAKICAgICAgICAgdmFyIGV4cGVjdENsaWNrYWJsZSA9IHRhZ3Mu ZXhwZWN0ICYmIHRhZ3MuZXhwZWN0LmluZGV4T2YoJ1VOREVSJykgPT0gLTE7Ci0gICAgICAgIGV4 cGVjdGVkQ2xpY2tzW2Nhc2VJZF0gPSBleHBlY3RDbGlja2FibGU7Ci0KKyAgICAgICAgZXhwZWN0 ZWRDbGlja3NbY2FzZUlkXSA9IGV4cGVjdENsaWNrYWJsZTsNCisNCiAgICAgICAgIHZhciBjb250 YWluZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29udGFpbmVyJyk7CiAgICAgICAgIHZh ciByb290ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CiAgICAgICAgIHJvb3Quc3R5 bGUucG9zaXRpb24gPSAnYWJzb2x1dGUnOwpAQCAtMTA5LDExICsxMTcsMjIgQEAKICAgICAgICAg ICAgIHBsdWdpbkRpdlogPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2WklmcmFtZSA9IDEw MDsKICAgICAgICAgICAgIG92ZXJsYXlEaXZaT3ZlcmxheSA9IDEwMDsKKyAgICAgICAgfSBlbHNl IGlmICh0YWdzLnBsdWdpbkV4cGxpY2l0SGlnaGVyWkluZGV4KSB7DQorICAgICAgICAgICAgLy8g Rm9yIHRoaXMgdGVzdCBjYXNlIHdlIHNldCB0aGUgei1pbmRleCBmb3IgdGhlIGlmcmFtZSBhbmQg dGhlIG92ZXJsYXkKKyAgICAgICAgICAgIC8vIHRvIGJlIGxvd2VyIHRoYW4gdGhlIHBsdWdpbi4K KyAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAwOworICAgICAgICAgICAgb3Zlcmxh eURpdlpPdmVybGF5ID0gMDsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBhcHBlbmRQbHVnaW4g PSBmdW5jdGlvbigpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZhciBwZCA9IG1ha2VQbHVnaW5F bGVtZW50KCk7CisgICAgICAgICAgICB2YXIgcGQ7CisgICAgICAgICAgICBpZiAodGFncy5wbHVn aW5FeHBsaWNpdEhpZ2hlclpJbmRleCkgeworICAgICAgICAgICAgICAgIHBkID0gbWFrZVBsdWdp bkVsZW1lbnRXaXRoSGlnaGVyWkluZGV4KCk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAg ICAgICAgICAgIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAgICAgICAgICAgIH0NCisNCiAg ICAgICAgICAgICBpZiAodGFncy5wbHVnaW5JbnNpZGVEaXYgfHwgcGx1Z2luRGl2WikgewogICAg ICAgICAgICAgICAgIHZhciBwYXJlbnRkaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYn KTsKICAgICAgICAgICAgICAgICBwYXJlbnRkaXYuYXBwZW5kQ2hpbGQocGQpCkBAIC0xMjcsNyAr MTQ2LDYgQEAKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgaWYgKCF0YWdz LnBsdWdpbk5vcmVsYXRpdmUpCiAgICAgICAgICAgICAgICAgICAgIHBkLnN0eWxlLnBvc2l0aW9u ID0gJ3JlbGF0aXZlJzsKLQogICAgICAgICAgICAgICAgIHJvb3QuYXBwZW5kQ2hpbGQocGQpOwog ICAgICAgICAgICAgfQogICAgICAgICB9OwpAQCAtMTM1LDE4ICsxNTMsMTggQEAKICAgICAgICAg aWYgKHRhZ3Mub3ZlcmxheUVhcmxpZXIpIHsKICAgICAgICAgICAgIGFwcGVuZE92ZXJsYXkob3Zl cmxheURpdlpJZnJhbWUsIG92ZXJsYXlEaXZaT3ZlcmxheSwgdGFncy5vdmVybGF5SW5zaWRlRGl2 LCBleHBlY3RDbGlja2FibGUsIGNhc2VJZCk7CiAgICAgICAgICAgICBhcHBlbmRQbHVnaW4oKTsK LSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgfSBlbHNlIHsNCiAgICAgICAgICAgICBhcHBlbmRQ bHVnaW4oKTsKICAgICAgICAgICAgIGlmICh0YWdzLm92ZXJsYXlPblRpbWVvdXQpIHsKICAgICAg ICAgICAgICAgICBzZXRUaW1lb3V0KCdhcHBlbmRPdmVybGF5KCcrb3ZlcmxheURpdlpJZnJhbWUr JywgJytvdmVybGF5RGl2Wk92ZXJsYXkgKycsICcgKyB0YWdzLm92ZXJsYXlJbnNpZGVEaXYgKyAn LCAnICsgZXhwZWN0Q2xpY2thYmxlICsgJywgJyArIGNhc2VJZCArICcpJywgMCk7Ci0gICAgICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgfSBlbHNlIHsNCiAgICAgICAgICAgICAgICAgYXBw ZW5kT3ZlcmxheShvdmVybGF5RGl2WklmcmFtZSwgb3ZlcmxheURpdlpPdmVybGF5LCB0YWdzLm92 ZXJsYXlJbnNpZGVEaXYsIGV4cGVjdENsaWNrYWJsZSwgY2FzZUlkKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQogICAgICB9CiAKICAgICBmdW5jdGlvbiBkb0NsaWNrKGlkKQotICAgIHsKKyAg ICB7DQogICAgICAgICBjbGlja3NbaWRdID0gdHJ1ZTsKIAogICAgICAgICAvLyBDaGVjayBzdWNj ZXNzL2ZhaWx1cmUuCkBAIC0xNjAsOCArMTc4LDggQEAKICAgICAgICAgICAgICAgICBvdXRwdXQu aW5uZXJIVE1MID0gJ0ZBSUxVUkUnOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg ICAgIH0KLSAgICAgICAgfQotCisgICAgICAgIH0NCisNCiAgICAgICAgIGlmICghd2FpdGluZ0Zv ck1vcmVDbGlja3MpIHsKICAgICAgICAgICAgIG91dHB1dC5pbm5lckhUTUwgPSAnU1VDQ0VTUyc7 CiAgICAgICAgICAgICByZXR1cm47CkBAIC0xODQsNyArMjAyLDcgQEAKICAgICAgICAgYWRkQ2Fz ZSgxLCAzLCB7J292ZXJsYXlFYXJsaWVyJzoxLCAncGx1Z2luTm9yZWxhdGl2ZSc6MSwgJ3BsdWdp bkluc2lkZURpdic6MSwgZXhwZWN0OidvdmVybGF5IE9WRVInfSk7CiAgICAgICAgIGFkZENhc2Uo MiwgMywgeydwbHVnaW5Ob3JlbGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2JzoxLCBleHBlY3Q6 J292ZXJsYXkgT1ZFUid9KTsKICAgICAgICAgYWRkQ2FzZSgzLCAzLCB7J3BsdWdpbkxvd2Vyeic6 MSwgJ292ZXJsYXlPblRpbWVvdXQnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVSJ30pOwotCisgICAg ICAgIGFkZENhc2UoNCwgMCwgeydwbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRleCc6IDEsICdwbHVn aW5Ob3JlbGF0aXZlJzogMSwgJ3BsdWdpbkluc2lkZURpdic6IDEsICdvdmVybGF5SW5zaWRlRGl2 JzogMSwgZXhwZWN0OiAnb3ZlcmxheSBVTkRFUicgfSk7CiAgICAgICAgIHJ1blRlc3QoKTsKICAg ICB9CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODQ3MCkKKysrIFdlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOS0y NyAgQW5hbnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBI b25vciB6LWluZGV4IHNwZWNpZmllZCBieSBhIHBsdWdpbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyAgICAgICAgCisgICAgICAgIFRoZSBD aHJvbWl1bSBwbHVnaW4gY29kZSB3aGljaCBpbXBsZW1lbnRzIHRoZSBpZnJhbWUgc2hpbSB0ZWNo bmlxdWUKKyAgICAgICAgZm9yIG92ZXJsYXlpbmcgYSB3aW5kb3dlZCBwbHVnaW4gd2l0aCBjb250 ZW50IG9uIHRoZSBwYWdlIHNob3VsZAorICAgICAgICBob25vciB0aGUgei1pbmRleCBzcGVjaWZp ZWQgb24gdGhlIHBsdWdpbiB3aWRnZXQuIElmIHRoZSB6LWluZGV4CisgICAgICAgIGhlcmUgaXMg Z3JlYXRlciB0aGFuIHRoZSBlbmNsb3NpbmcgaWZyYW1lIHNoaW0gdGhlbiB0aGUgcGx1Z2luCisg ICAgICAgIHNob3VsZCBiZSBkaXNwbGF5ZWQgb3ZlciB0aGUgaWZyYW1lLiBVcGRhdGVkIHRoZSBs YXlvdXQgdGVzdCB0byB0ZXN0CisgICAgICAgIGZvciB0aGlzIGNhc2UuCisKKyAgICAgICAgKiBz cmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisKIDIwMTAtMDktMjcgIEFscGhhIExhbSAg PGhjbGFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBCdWlsZCBmaXguIE5vdCByZXZpZXdlZC4K SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHANCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwu Y3BwCShyZXZpc2lvbiA2ODQ2OSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29u dGFpbmVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0MSwxMSArNTQxLDIwIEBAIHN0YXRp YyBib29sIGNoZWNrU3RhY2tPblRvcCgKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAvLyBGb3IgY29tcGF0aWJpbGl0eSB3aXRo IElFOiB3aGVuIHRoZSBwbHVnaW4gaXMgbm90IHBvc2l0aW9uZWQsCi0gICAgICAgICAgICAvLyBp dCBzdGFja3MgYmVoaW5kIHRoZSBpZnJhbWUsIGV2ZW4gaWYgaXQncyBsYXRlciBpbiB0aGUKLSAg ICAgICAgICAgIC8vIGRvY3VtZW50IG9yZGVyLgotICAgICAgICAgICAgaWYgKHJvMi0+c3R5bGUo KS0+cG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlvbikKKyAgICAgICAgICAgIC8vIElmIHRoZSBw bHVnaW4gZG9lcyBub3QgaGF2ZSBhbiBleHBsaWNpdCB6LWluZGV4IGl0IHN0YWNrcyBiZWhpbmQg dGhlIGlmcmFtZS4KKyAgICAgICAgICAgIC8vIFRoaXMgaXMgZm9yIG1haW50YWluaW5nIGNvbXBh dGliaWxpdHkgd2l0aCBJRS4KKyAgICAgICAgICAgIGlmIChybzItPnN0eWxlKCktPnBvc2l0aW9u KCkgPT0gU3RhdGljUG9zaXRpb24pIHsKKyAgICAgICAgICAgICAgICAvLyBUaGUgMCd0aCBlbGVt ZW50cyBvZiB0aGVzZSBSZW5kZXJPYmplY3QgYXJyYXlzIHJlcHJlc2VudCB0aGUgcGx1Z2luIG5v ZGUgYW5kCisgICAgICAgICAgICAgICAgLy8gdGhlIGlmcmFtZS4KKyAgICAgICAgICAgICAgICBj b25zdCBSZW5kZXJPYmplY3QqIHBsdWdpblJlbmRlck9iamVjdCA9IHBsdWdpblpzdGFja1swXTsK KyAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QqIGlmcmFtZVJlbmRlck9iamVjdCA9 IGlmcmFtZVpzdGFja1swXTsKKworICAgICAgICAgICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmpl Y3QtPnN0eWxlKCkgJiYgaWZyYW1lUmVuZGVyT2JqZWN0LT5zdHlsZSgpKSB7CisgICAgICAgICAg ICAgICAgICAgIGlmIChwbHVnaW5SZW5kZXJPYmplY3QtPnN0eWxlKCktPnpJbmRleCgpID4gaWZy YW1lUmVuZGVyT2JqZWN0LT5zdHlsZSgpLT56SW5kZXgoKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIEluc3BlY3QgdGhlIGRv Y3VtZW50IG9yZGVyLiAgTGF0ZXIgb3JkZXIgbWVhbnMgaGlnaGVyCiAgICAgICAgICAgICAvLyBz dGFja2luZy4K 69073 2010-09-28 11:11:06 -0700 2010-09-28 12:21:01 -0700 Updated patch with the iframe-shims.html skipped for mac, win and qt. iframe_shim_fix.txt text/plain 8837 ananta SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIExheW91dFRlc3Rz L0NoYW5nZUxvZwkocmV2aXNpb24gNjg1NDIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOS0yOCAgQW5hbnRhbmFyYXlhbmFu IEcgSXllbmdhciAgPGFuYW50YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNp ZmllZCBieSBhIHBsdWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDYyMjMKKyAgICAgICAgCisgICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29k ZSB3aGljaCBpbXBsZW1lbnRzIHRoZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9y IG92ZXJsYXlpbmcgYSB3aW5kb3dlZCBwbHVnaW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNo b3VsZAorICAgICAgICBob25vciB0aGUgei1pbmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3 aWRnZXQuIElmIHRoZSB6LWluZGV4CisgICAgICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBl bmNsb3NpbmcgaWZyYW1lIHNoaW0gdGhlbiB0aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBk aXNwbGF5ZWQgb3ZlciB0aGUgaWZyYW1lLiBVcGRhdGVkIHRoZSBsYXlvdXQgdGVzdCB0byB0ZXN0 CisgICAgICAgIGZvciB0aGlzIGNhc2UuIFNraXBwZWQgdGhlIHBsdWdpbnMvaWZyYW1lLXNoaW1z Lmh0bWwgbGF5b3V0IHRlc3Qgb24KKyAgICAgICAgcGxhdGZvcm1zIHdoaWNoIGRvbid0IHN1cHBv cnQgaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9xdC9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9Ta2lwcGVkOgorICAgICAg ICAqIHBsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWw6CisKIDIwMTAtMDktMjggIENocmlzIEZsZWl6 YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBCZXRoIERh a2luLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAkocmV2aXNpb24gNjg0NjkpCisr KyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtMzIw LDMgKzMyMCw3IEBAIGZhc3QvZmlsZXN5c3RlbQogCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NDcxMwogZmFzdC9mcmFtZXMvaWZyYW1lLXJlcGFyZW50aW5nLWFk b3B0LW5vZGUuaHRtbAorCisjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NjIyMworIyBUaGUgV2ViS2l0IHBsdWdpbiBpbXBsZW1lbnRhdGlvbiBkb2VzIG5vdCBzdXBw b3J0IGlmcmFtZSBzaGltcy4KK3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwKSW5kZXg6IExheW91 dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9xdC9Ta2lwcGVkCShyZXZpc2lvbiA2ODQ2OSkKKysrIExheW91dFRlc3RzL3BsYXRm b3JtL3F0L1NraXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTU0ODAsMyArNTQ4MCw3IEBAIGZhc3Qv ZmlsZXN5c3RlbQogCiAjIExheW91dFRlc3RDb250cm9sbGVyOjpub2Rlc0Zyb21SZWN0IGlzIG5v dCBzdXBwb3J0ZWQuCiBmYXN0L2RvbS9ub2Rlc0Zyb21SZWN0LWJhc2ljLmh0bWwKKworIyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMKKyMgVGhlIFdlYktpdCBw bHVnaW4gaW1wbGVtZW50YXRpb24gZG9lcyBub3Qgc3VwcG9ydCBpZnJhbWUgc2hpbXMuCitwbHVn aW5zL2lmcmFtZS1zaGltcy5odG1sCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tp cHBlZA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQ0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCShy ZXZpc2lvbiA2ODQ2OSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDA2LDMgKzEwMDYsNyBAQCBmYXN0L2ZpbGVzeXN0ZW0KIAogIyBMYXlv dXRUZXN0Q29udHJvbGxlcjo6bm9kZXNGcm9tUmVjdCBpcyBub3Qgc3VwcG9ydGVkLgogZmFzdC9k b20vbm9kZXNGcm9tUmVjdC1iYXNpYy5odG1sCisKKyMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ2MjIzCisjIFRoZSBXZWJLaXQgcGx1Z2luIGltcGxlbWVudGF0aW9u IGRvZXMgbm90IHN1cHBvcnQgaWZyYW1lIHNoaW1zLgorcGx1Z2lucy9pZnJhbWUtc2hpbXMuaHRt bApJbmRleDogTGF5b3V0VGVzdHMvcGx1Z2lucy9pZnJhbWUtc2hpbXMuaHRtbA0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQ0KLS0tIExheW91dFRlc3RzL3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwJKHJldmlzaW9uIDY4 NDY5KQorKysgTGF5b3V0VGVzdHMvcGx1Z2lucy9pZnJhbWUtc2hpbXMuaHRtbAkod29ya2luZyBj b3B5KQpAQCAtMjAsNiArMjAsMTQgQEAKICAgICAgICAgcmV0dXJuIGY7CiAgICAgfQogCisgICAg ZnVuY3Rpb24gbWFrZVBsdWdpbkVsZW1lbnRXaXRoSGlnaGVyWkluZGV4KCkKKyAgICB7CisgICAg ICAgIHZhciBmID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAgICAgICAgZi5zdHlsZS56SW5kZXgg PSAxMDAwOworICAgICAgICBmLnN0eWxlLnBvc2l0aW9uID0gJ3JlbGF0aXZlJzsKKyAgICAgICAg cmV0dXJuIGY7CisgICAgfQorCiAgICAgZnVuY3Rpb24gbWFrZUlmcmFtZURpdigpCiAgICAgewog ICAgICAgICB2YXIgaSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2lmcmFtZScpOwpAQCAtMzQs NyArNDIsNyBAQAogICAgIH0KIAogICAgIGZ1bmN0aW9uIG1ha2VPdmVybGF5RGl2KGNvbG9yLCBj YXNlSWQpCi0gICAgeworICAgIHsNCiAgICAgICAgIHZhciBvID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgnZGl2Jyk7CiAgICAgICAgIG8uc3R5bGUucG9zaXRpb24gPSAnYWJzb2x1dGUnOwogICAg ICAgICBvLnN0eWxlLnRvcCA9ICcxMHB4JzsKQEAgLTg0LDggKzkyLDggQEAKICAgICAgICAgaXRl bXMrKzsKIAogICAgICAgICB2YXIgZXhwZWN0Q2xpY2thYmxlID0gdGFncy5leHBlY3QgJiYgdGFn cy5leHBlY3QuaW5kZXhPZignVU5ERVInKSA9PSAtMTsKLSAgICAgICAgZXhwZWN0ZWRDbGlja3Nb Y2FzZUlkXSA9IGV4cGVjdENsaWNrYWJsZTsKLQorICAgICAgICBleHBlY3RlZENsaWNrc1tjYXNl SWRdID0gZXhwZWN0Q2xpY2thYmxlOw0KKw0KICAgICAgICAgdmFyIGNvbnRhaW5lciA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCdjb250YWluZXInKTsKICAgICAgICAgdmFyIHJvb3QgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKICAgICAgICAgcm9vdC5zdHlsZS5wb3NpdGlvbiA9 ICdhYnNvbHV0ZSc7CkBAIC0xMDksMTEgKzExNywyMiBAQAogICAgICAgICAgICAgcGx1Z2luRGl2 WiA9IDEwMDsKICAgICAgICAgICAgIG92ZXJsYXlEaXZaSWZyYW1lID0gMTAwOwogICAgICAgICAg ICAgb3ZlcmxheURpdlpPdmVybGF5ID0gMTAwOworICAgICAgICB9IGVsc2UgaWYgKHRhZ3MucGx1 Z2luRXhwbGljaXRIaWdoZXJaSW5kZXgpIHsNCisgICAgICAgICAgICAvLyBGb3IgdGhpcyB0ZXN0 IGNhc2Ugd2Ugc2V0IHRoZSB6LWluZGV4IGZvciB0aGUgaWZyYW1lIGFuZCB0aGUgb3ZlcmxheQor ICAgICAgICAgICAgLy8gdG8gYmUgbG93ZXIgdGhhbiB0aGUgcGx1Z2luLgorICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CisgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAwOwogICAgICAgICB9CiAKICAgICAgICAgdmFyIGFwcGVuZFBsdWdpbiA9IGZ1bmN0aW9uKCkK ICAgICAgICAgewotICAgICAgICAgICAgdmFyIHBkID0gbWFrZVBsdWdpbkVsZW1lbnQoKTsKKyAg ICAgICAgICAgIHZhciBwZDsKKyAgICAgICAgICAgIGlmICh0YWdzLnBsdWdpbkV4cGxpY2l0SGln aGVyWkluZGV4KSB7CisgICAgICAgICAgICAgICAgcGQgPSBtYWtlUGx1Z2luRWxlbWVudFdpdGhI aWdoZXJaSW5kZXgoKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgcGQg PSBtYWtlUGx1Z2luRWxlbWVudCgpOworICAgICAgICAgICAgfQ0KKw0KICAgICAgICAgICAgIGlm ICh0YWdzLnBsdWdpbkluc2lkZURpdiB8fCBwbHVnaW5EaXZaKSB7CiAgICAgICAgICAgICAgICAg dmFyIHBhcmVudGRpdiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpOwogICAgICAgICAg ICAgICAgIHBhcmVudGRpdi5hcHBlbmRDaGlsZChwZCkKQEAgLTEyNyw3ICsxNDYsNiBAQAogICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBpZiAoIXRhZ3MucGx1Z2luTm9yZWxh dGl2ZSkKICAgICAgICAgICAgICAgICAgICAgcGQuc3R5bGUucG9zaXRpb24gPSAncmVsYXRpdmUn OwotCiAgICAgICAgICAgICAgICAgcm9vdC5hcHBlbmRDaGlsZChwZCk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH07CkBAIC0xMzUsMTggKzE1MywxOCBAQAogICAgICAgICBpZiAodGFncy5vdmVy bGF5RWFybGllcikgewogICAgICAgICAgICAgYXBwZW5kT3ZlcmxheShvdmVybGF5RGl2WklmcmFt ZSwgb3ZlcmxheURpdlpPdmVybGF5LCB0YWdzLm92ZXJsYXlJbnNpZGVEaXYsIGV4cGVjdENsaWNr YWJsZSwgY2FzZUlkKTsKICAgICAgICAgICAgIGFwcGVuZFBsdWdpbigpOwotICAgICAgICB9IGVs c2UgeworICAgICAgICB9IGVsc2Ugew0KICAgICAgICAgICAgIGFwcGVuZFBsdWdpbigpOwogICAg ICAgICAgICAgaWYgKHRhZ3Mub3ZlcmxheU9uVGltZW91dCkgewogICAgICAgICAgICAgICAgIHNl dFRpbWVvdXQoJ2FwcGVuZE92ZXJsYXkoJytvdmVybGF5RGl2WklmcmFtZSsnLCAnK292ZXJsYXlE aXZaT3ZlcmxheSArJywgJyArIHRhZ3Mub3ZlcmxheUluc2lkZURpdiArICcsICcgKyBleHBlY3RD bGlja2FibGUgKyAnLCAnICsgY2FzZUlkICsgJyknLCAwKTsKLSAgICAgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICB9IGVsc2Ugew0KICAgICAgICAgICAgICAgICBhcHBlbmRPdmVybGF5KG92 ZXJsYXlEaXZaSWZyYW1lLCBvdmVybGF5RGl2Wk92ZXJsYXksIHRhZ3Mub3ZlcmxheUluc2lkZURp diwgZXhwZWN0Q2xpY2thYmxlLCBjYXNlSWQpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgIH0KIAogICAgIGZ1bmN0aW9uIGRvQ2xpY2soaWQpCi0gICAgeworICAgIHsNCiAgICAgICAg IGNsaWNrc1tpZF0gPSB0cnVlOwogCiAgICAgICAgIC8vIENoZWNrIHN1Y2Nlc3MvZmFpbHVyZS4K QEAgLTE2MCw4ICsxNzgsOCBAQAogICAgICAgICAgICAgICAgIG91dHB1dC5pbm5lckhUTUwgPSAn RkFJTFVSRSc7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQotICAgICAg ICB9Ci0KKyAgICAgICAgfQ0KKw0KICAgICAgICAgaWYgKCF3YWl0aW5nRm9yTW9yZUNsaWNrcykg ewogICAgICAgICAgICAgb3V0cHV0LmlubmVySFRNTCA9ICdTVUNDRVNTJzsKICAgICAgICAgICAg IHJldHVybjsKQEAgLTE4NCw3ICsyMDIsNyBAQAogICAgICAgICBhZGRDYXNlKDEsIDMsIHsnb3Zl cmxheUVhcmxpZXInOjEsICdwbHVnaW5Ob3JlbGF0aXZlJzoxLCAncGx1Z2luSW5zaWRlRGl2Jzox LCBleHBlY3Q6J292ZXJsYXkgT1ZFUid9KTsKICAgICAgICAgYWRkQ2FzZSgyLCAzLCB7J3BsdWdp bk5vcmVsYXRpdmUnOjEsICdwbHVnaW5JbnNpZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVS J30pOwogICAgICAgICBhZGRDYXNlKDMsIDMsIHsncGx1Z2luTG93ZXJ6JzoxLCAnb3ZlcmxheU9u VGltZW91dCc6MSwgZXhwZWN0OidvdmVybGF5IE9WRVInfSk7Ci0KKyAgICAgICAgYWRkQ2FzZSg0 LCAwLCB7J3BsdWdpbkV4cGxpY2l0SGlnaGVyWkluZGV4JzogMSwgJ3BsdWdpbk5vcmVsYXRpdmUn OiAxLCAncGx1Z2luSW5zaWRlRGl2JzogMSwgJ292ZXJsYXlJbnNpZGVEaXYnOiAxLCBleHBlY3Q6 ICdvdmVybGF5IFVOREVSJyB9KTsKICAgICAgICAgcnVuVGVzdCgpOwogICAgIH0KIApJbmRleDog V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY4NTQyKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEwLTA5LTI4ICBBbmFudGFuYXJh eWFuYW4gRyBJeWVuZ2FyICA8YW5hbnRhQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEhvbm9yIHotaW5kZXgg c3BlY2lmaWVkIGJ5IGEgcGx1Z2luCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NjIyMworICAgICAgICAKKyAgICAgICAgVGhlIENocm9taXVtIHBsdWdp biBjb2RlIHdoaWNoIGltcGxlbWVudHMgdGhlIGlmcmFtZSBzaGltIHRlY2huaXF1ZQorICAgICAg ICBmb3Igb3ZlcmxheWluZyBhIHdpbmRvd2VkIHBsdWdpbiB3aXRoIGNvbnRlbnQgb24gdGhlIHBh Z2Ugc2hvdWxkCisgICAgICAgIGhvbm9yIHRoZSB6LWluZGV4IHNwZWNpZmllZCBvbiB0aGUgcGx1 Z2luIHdpZGdldC4gSWYgdGhlIHotaW5kZXgKKyAgICAgICAgaGVyZSBpcyBncmVhdGVyIHRoYW4g dGhlIGVuY2xvc2luZyBpZnJhbWUgc2hpbSB0aGVuIHRoZSBwbHVnaW4KKyAgICAgICAgc2hvdWxk IGJlIGRpc3BsYXllZCBvdmVyIHRoZSBpZnJhbWUuIFVwZGF0ZWQgdGhlIGxheW91dCB0ZXN0IHRv IHRlc3QKKyAgICAgICAgZm9yIHRoaXMgY2FzZS4KKworICAgICAgICAqIHNyYy9XZWJQbHVnaW5D b250YWluZXJJbXBsLmNwcDoKKwogMjAxMC0wOS0yOCAgQW5kcmVpIFBvcGVzY3UgIDxhbmRyZWlw QGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDog V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcA0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHJl dmlzaW9uIDY4NDY5KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJ bXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTQxLDExICs1NDEsMjAgQEAgc3RhdGljIGJvb2wg Y2hlY2tTdGFja09uVG9wKAogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgICAgICB9CiAKLSAgICAgICAgICAgIC8vIEZvciBjb21wYXRpYmlsaXR5IHdpdGggSUU6IHdo ZW4gdGhlIHBsdWdpbiBpcyBub3QgcG9zaXRpb25lZCwKLSAgICAgICAgICAgIC8vIGl0IHN0YWNr cyBiZWhpbmQgdGhlIGlmcmFtZSwgZXZlbiBpZiBpdCdzIGxhdGVyIGluIHRoZQotICAgICAgICAg ICAgLy8gZG9jdW1lbnQgb3JkZXIuCi0gICAgICAgICAgICBpZiAocm8yLT5zdHlsZSgpLT5wb3Np dGlvbigpID09IFN0YXRpY1Bvc2l0aW9uKQorICAgICAgICAgICAgLy8gSWYgdGhlIHBsdWdpbiBk b2VzIG5vdCBoYXZlIGFuIGV4cGxpY2l0IHotaW5kZXggaXQgc3RhY2tzIGJlaGluZCB0aGUgaWZy YW1lLgorICAgICAgICAgICAgLy8gVGhpcyBpcyBmb3IgbWFpbnRhaW5pbmcgY29tcGF0aWJpbGl0 eSB3aXRoIElFLgorICAgICAgICAgICAgaWYgKHJvMi0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBT dGF0aWNQb3NpdGlvbikgeworICAgICAgICAgICAgICAgIC8vIFRoZSAwJ3RoIGVsZW1lbnRzIG9m IHRoZXNlIFJlbmRlck9iamVjdCBhcnJheXMgcmVwcmVzZW50IHRoZSBwbHVnaW4gbm9kZSBhbmQK KyAgICAgICAgICAgICAgICAvLyB0aGUgaWZyYW1lLgorICAgICAgICAgICAgICAgIGNvbnN0IFJl bmRlck9iamVjdCogcGx1Z2luUmVuZGVyT2JqZWN0ID0gcGx1Z2luWnN0YWNrWzBdOworICAgICAg ICAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCogaWZyYW1lUmVuZGVyT2JqZWN0ID0gaWZyYW1l WnN0YWNrWzBdOworCisgICAgICAgICAgICAgICAgaWYgKHBsdWdpblJlbmRlck9iamVjdC0+c3R5 bGUoKSAmJiBpZnJhbWVSZW5kZXJPYmplY3QtPnN0eWxlKCkpIHsKKyAgICAgICAgICAgICAgICAg ICAgaWYgKHBsdWdpblJlbmRlck9iamVjdC0+c3R5bGUoKS0+ekluZGV4KCkgPiBpZnJhbWVSZW5k ZXJPYmplY3QtPnN0eWxlKCktPnpJbmRleCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gSW5zcGVjdCB0aGUgZG9jdW1lbnQg b3JkZXIuICBMYXRlciBvcmRlciBtZWFucyBoaWdoZXIKICAgICAgICAgICAgIC8vIHN0YWNraW5n Lgo= 69085 2010-09-28 12:21:01 -0700 2010-09-29 10:15:14 -0700 Updated patch with style issues and svn conflicts fixed. iframe_shim_fix.txt text/plain 8968 ananta SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIExheW91dFRlc3Rz L0NoYW5nZUxvZwkocmV2aXNpb24gNjg1NDgpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOS0yOCAgQW5hbnRhbmFyYXlhbmFu IEcgSXllbmdhciAgPGFuYW50YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBIb25vciB6LWluZGV4IHNwZWNp ZmllZCBieSBhIHBsdWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDYyMjMKKyAgICAgICAgCisgICAgICAgIFRoZSBDaHJvbWl1bSBwbHVnaW4gY29k ZSB3aGljaCBpbXBsZW1lbnRzIHRoZSBpZnJhbWUgc2hpbSB0ZWNobmlxdWUKKyAgICAgICAgZm9y IG92ZXJsYXlpbmcgYSB3aW5kb3dlZCBwbHVnaW4gd2l0aCBjb250ZW50IG9uIHRoZSBwYWdlIHNo b3VsZAorICAgICAgICBob25vciB0aGUgei1pbmRleCBzcGVjaWZpZWQgb24gdGhlIHBsdWdpbiB3 aWRnZXQuIElmIHRoZSB6LWluZGV4CisgICAgICAgIGhlcmUgaXMgZ3JlYXRlciB0aGFuIHRoZSBl bmNsb3NpbmcgaWZyYW1lIHNoaW0gdGhlbiB0aGUgcGx1Z2luCisgICAgICAgIHNob3VsZCBiZSBk aXNwbGF5ZWQgb3ZlciB0aGUgaWZyYW1lLiBVcGRhdGVkIHRoZSBsYXlvdXQgdGVzdCB0byB0ZXN0 CisgICAgICAgIGZvciB0aGlzIGNhc2UuIFNraXBwZWQgdGhlIHBsdWdpbnMvaWZyYW1lLXNoaW1z Lmh0bWwgbGF5b3V0IHRlc3Qgb24KKyAgICAgICAgcGxhdGZvcm1zIHdoaWNoIGRvbid0IHN1cHBv cnQgaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9xdC9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9Ta2lwcGVkOgorICAgICAg ICAqIHBsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWw6CisKIDIwMTAtMDktMjggIEFuZHJlaSBQb3Bl c2N1ICA8YW5kcmVpcEBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBP cmxvdy4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQJKHJldmlzaW9uIDY4NTQ3KQor KysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTMy MCwzICszMjAsNyBAQCBmYXN0L2ZpbGVzeXN0ZW0KIAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDQ3MTMKIGZhc3QvZnJhbWVzL2lmcmFtZS1yZXBhcmVudGluZy1h ZG9wdC1ub2RlLmh0bWwKKworIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDYyMjMKKyMgVGhlIFdlYktpdCBwbHVnaW4gaW1wbGVtZW50YXRpb24gZG9lcyBub3Qgc3Vw cG9ydCBpZnJhbWUgc2hpbXMuCitwbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCkluZGV4OiBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gTGF5b3V0VGVzdHMv cGxhdGZvcm0vcXQvU2tpcHBlZAkocmV2aXNpb24gNjg1NDcpCisrKyBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkCSh3b3JraW5nIGNvcHkpCkBAIC01NDg5LDMgKzU0ODksNyBAQCBodHRw L3Rlc3RzL2NhbnZhcy93ZWJnbC9vcmlnaW4tY2xlYW4tY29uCiBtZWRpYS9yZXN0b3JlLWZyb20t cGFnZS1jYWNoZS5odG1sCiBtZWRpYS92aWRlby1jYW4tcGxheS10eXBlLmh0bWwKIG1lZGlhL3Zp ZGVvLWRlbGF5LWxvYWQtZXZlbnQuaHRtbAorCisjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NjIyMworIyBUaGUgV2ViS2l0IHBsdWdpbiBpbXBsZW1lbnRhdGlvbiBk b2VzIG5vdCBzdXBwb3J0IGlmcmFtZSBzaGltcy4KK3BsdWdpbnMvaWZyYW1lLXNoaW1zLmh0bWwK SW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQJKHJldmlzaW9uIDY4NTQ3KQorKysgTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTEwMDYsMyAr MTAwNiw3IEBAIGZhc3QvZmlsZXN5c3RlbQogCiAjIExheW91dFRlc3RDb250cm9sbGVyOjpub2Rl c0Zyb21SZWN0IGlzIG5vdCBzdXBwb3J0ZWQuCiBmYXN0L2RvbS9ub2Rlc0Zyb21SZWN0LWJhc2lj Lmh0bWwKKworIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYyMjMK KyMgVGhlIFdlYktpdCBwbHVnaW4gaW1wbGVtZW50YXRpb24gZG9lcyBub3Qgc3VwcG9ydCBpZnJh bWUgc2hpbXMuCitwbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCkluZGV4OiBMYXlvdXRUZXN0cy9w bHVnaW5zL2lmcmFtZS1zaGltcy5odG1sDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gTGF5b3V0VGVzdHMvcGx1 Z2lucy9pZnJhbWUtc2hpbXMuaHRtbAkocmV2aXNpb24gNjg1NDcpCisrKyBMYXlvdXRUZXN0cy9w bHVnaW5zL2lmcmFtZS1zaGltcy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0yMCw2ICsyMCwxNCBA QAogICAgICAgICByZXR1cm4gZjsKICAgICB9CiAKKyAgICBmdW5jdGlvbiBtYWtlUGx1Z2luRWxl bWVudFdpdGhIaWdoZXJaSW5kZXgoKQorICAgIHsKKyAgICAgICAgdmFyIGYgPSBtYWtlUGx1Z2lu RWxlbWVudCgpOworICAgICAgICBmLnN0eWxlLnpJbmRleCA9IDEwMDA7CisgICAgICAgIGYuc3R5 bGUucG9zaXRpb24gPSAncmVsYXRpdmUnOworICAgICAgICByZXR1cm4gZjsKKyAgICB9CisKICAg ICBmdW5jdGlvbiBtYWtlSWZyYW1lRGl2KCkKICAgICB7CiAgICAgICAgIHZhciBpID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgnaWZyYW1lJyk7CkBAIC0zNCw3ICs0Miw3IEBACiAgICAgfQogCiAg ICAgZnVuY3Rpb24gbWFrZU92ZXJsYXlEaXYoY29sb3IsIGNhc2VJZCkKLSAgICB7CisgICAgew0K ICAgICAgICAgdmFyIG8gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKICAgICAgICAg by5zdHlsZS5wb3NpdGlvbiA9ICdhYnNvbHV0ZSc7CiAgICAgICAgIG8uc3R5bGUudG9wID0gJzEw cHgnOwpAQCAtODQsOCArOTIsOCBAQAogICAgICAgICBpdGVtcysrOwogCiAgICAgICAgIHZhciBl eHBlY3RDbGlja2FibGUgPSB0YWdzLmV4cGVjdCAmJiB0YWdzLmV4cGVjdC5pbmRleE9mKCdVTkRF UicpID09IC0xOwotICAgICAgICBleHBlY3RlZENsaWNrc1tjYXNlSWRdID0gZXhwZWN0Q2xpY2th YmxlOwotCisgICAgICAgIGV4cGVjdGVkQ2xpY2tzW2Nhc2VJZF0gPSBleHBlY3RDbGlja2FibGU7 DQorDQogICAgICAgICB2YXIgY29udGFpbmVyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2Nv bnRhaW5lcicpOwogICAgICAgICB2YXIgcm9vdCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2Rp dicpOwogICAgICAgICByb290LnN0eWxlLnBvc2l0aW9uID0gJ2Fic29sdXRlJzsKQEAgLTEwOSwx MSArMTE3LDIyIEBACiAgICAgICAgICAgICBwbHVnaW5EaXZaID0gMTAwOwogICAgICAgICAgICAg b3ZlcmxheURpdlpJZnJhbWUgPSAxMDA7CiAgICAgICAgICAgICBvdmVybGF5RGl2Wk92ZXJsYXkg PSAxMDA7CisgICAgICAgIH0gZWxzZSBpZiAodGFncy5wbHVnaW5FeHBsaWNpdEhpZ2hlclpJbmRl eCkgew0KKyAgICAgICAgICAgIC8vIEZvciB0aGlzIHRlc3QgY2FzZSB3ZSBzZXQgdGhlIHotaW5k ZXggZm9yIHRoZSBpZnJhbWUgYW5kIHRoZSBvdmVybGF5CisgICAgICAgICAgICAvLyB0byBiZSBs b3dlciB0aGFuIHRoZSBwbHVnaW4uCisgICAgICAgICAgICBvdmVybGF5RGl2WklmcmFtZSA9IDEw MDsKKyAgICAgICAgICAgIG92ZXJsYXlEaXZaT3ZlcmxheSA9IDA7CiAgICAgICAgIH0KIAogICAg ICAgICB2YXIgYXBwZW5kUGx1Z2luID0gZnVuY3Rpb24oKQogICAgICAgICB7Ci0gICAgICAgICAg ICB2YXIgcGQgPSBtYWtlUGx1Z2luRWxlbWVudCgpOworICAgICAgICAgICAgdmFyIHBkOworICAg ICAgICAgICAgaWYgKHRhZ3MucGx1Z2luRXhwbGljaXRIaWdoZXJaSW5kZXgpIHsKKyAgICAgICAg ICAgICAgICBwZCA9IG1ha2VQbHVnaW5FbGVtZW50V2l0aEhpZ2hlclpJbmRleCgpOworICAgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBwZCA9IG1ha2VQbHVnaW5FbGVtZW50KCk7 CisgICAgICAgICAgICB9DQorDQogICAgICAgICAgICAgaWYgKHRhZ3MucGx1Z2luSW5zaWRlRGl2 IHx8IHBsdWdpbkRpdlopIHsKICAgICAgICAgICAgICAgICB2YXIgcGFyZW50ZGl2ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CiAgICAgICAgICAgICAgICAgcGFyZW50ZGl2LmFwcGVu ZENoaWxkKHBkKQpAQCAtMTI3LDcgKzE0Niw2IEBACiAgICAgICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgICAgIGlmICghdGFncy5wbHVnaW5Ob3JlbGF0aXZlKQogICAgICAgICAgICAgICAg ICAgICBwZC5zdHlsZS5wb3NpdGlvbiA9ICdyZWxhdGl2ZSc7Ci0KICAgICAgICAgICAgICAgICBy b290LmFwcGVuZENoaWxkKHBkKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfTsKQEAgLTEzNSwx OCArMTUzLDE4IEBACiAgICAgICAgIGlmICh0YWdzLm92ZXJsYXlFYXJsaWVyKSB7CiAgICAgICAg ICAgICBhcHBlbmRPdmVybGF5KG92ZXJsYXlEaXZaSWZyYW1lLCBvdmVybGF5RGl2Wk92ZXJsYXks IHRhZ3Mub3ZlcmxheUluc2lkZURpdiwgZXhwZWN0Q2xpY2thYmxlLCBjYXNlSWQpOwogICAgICAg ICAgICAgYXBwZW5kUGx1Z2luKCk7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZSB7 DQogICAgICAgICAgICAgYXBwZW5kUGx1Z2luKCk7CiAgICAgICAgICAgICBpZiAodGFncy5vdmVy bGF5T25UaW1lb3V0KSB7CiAgICAgICAgICAgICAgICAgc2V0VGltZW91dCgnYXBwZW5kT3Zlcmxh eSgnK292ZXJsYXlEaXZaSWZyYW1lKycsICcrb3ZlcmxheURpdlpPdmVybGF5ICsnLCAnICsgdGFn cy5vdmVybGF5SW5zaWRlRGl2ICsgJywgJyArIGV4cGVjdENsaWNrYWJsZSArICcsICcgKyBjYXNl SWQgKyAnKScsIDApOwotICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIH0gZWxzZSB7 DQogICAgICAgICAgICAgICAgIGFwcGVuZE92ZXJsYXkob3ZlcmxheURpdlpJZnJhbWUsIG92ZXJs YXlEaXZaT3ZlcmxheSwgdGFncy5vdmVybGF5SW5zaWRlRGl2LCBleHBlY3RDbGlja2FibGUsIGNh c2VJZCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgfQogCiAgICAgZnVuY3Rpb24g ZG9DbGljayhpZCkKLSAgICB7CisgICAgew0KICAgICAgICAgY2xpY2tzW2lkXSA9IHRydWU7CiAK ICAgICAgICAgLy8gQ2hlY2sgc3VjY2Vzcy9mYWlsdXJlLgpAQCAtMTYwLDggKzE3OCw4IEBACiAg ICAgICAgICAgICAgICAgb3V0cHV0LmlubmVySFRNTCA9ICdGQUlMVVJFJzsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0KLQorICAgICAgICB9DQorDQog ICAgICAgICBpZiAoIXdhaXRpbmdGb3JNb3JlQ2xpY2tzKSB7CiAgICAgICAgICAgICBvdXRwdXQu aW5uZXJIVE1MID0gJ1NVQ0NFU1MnOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTg0LDcgKzIw Miw3IEBACiAgICAgICAgIGFkZENhc2UoMSwgMywgeydvdmVybGF5RWFybGllcic6MSwgJ3BsdWdp bk5vcmVsYXRpdmUnOjEsICdwbHVnaW5JbnNpZGVEaXYnOjEsIGV4cGVjdDonb3ZlcmxheSBPVkVS J30pOwogICAgICAgICBhZGRDYXNlKDIsIDMsIHsncGx1Z2luTm9yZWxhdGl2ZSc6MSwgJ3BsdWdp bkluc2lkZURpdic6MSwgZXhwZWN0OidvdmVybGF5IE9WRVInfSk7CiAgICAgICAgIGFkZENhc2Uo MywgMywgeydwbHVnaW5Mb3dlcnonOjEsICdvdmVybGF5T25UaW1lb3V0JzoxLCBleHBlY3Q6J292 ZXJsYXkgT1ZFUid9KTsKLQorICAgICAgICBhZGRDYXNlKDQsIDAsIHsncGx1Z2luRXhwbGljaXRI aWdoZXJaSW5kZXgnOiAxLCAncGx1Z2luTm9yZWxhdGl2ZSc6IDEsICdwbHVnaW5JbnNpZGVEaXYn OiAxLCAnb3ZlcmxheUluc2lkZURpdic6IDEsIGV4cGVjdDogJ292ZXJsYXkgVU5ERVInIH0pOwog ICAgICAgICBydW5UZXN0KCk7CiAgICAgfQogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24g Njg1NDgpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTAtMDktMjggIEFuYW50YW5hcmF5YW5hbiBHIEl5ZW5nYXIgIDxhbmFu dGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtjaHJvbWl1bV0gSG9ub3Igei1pbmRleCBzcGVjaWZpZWQgYnkgYSBwbHVnaW4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MjIzCisg ICAgICAgIAorICAgICAgICBUaGUgQ2hyb21pdW0gcGx1Z2luIGNvZGUgd2hpY2ggaW1wbGVtZW50 cyB0aGUgaWZyYW1lIHNoaW0gdGVjaG5pcXVlCisgICAgICAgIGZvciBvdmVybGF5aW5nIGEgd2lu ZG93ZWQgcGx1Z2luIHdpdGggY29udGVudCBvbiB0aGUgcGFnZSBzaG91bGQKKyAgICAgICAgaG9u b3IgdGhlIHotaW5kZXggc3BlY2lmaWVkIG9uIHRoZSBwbHVnaW4gd2lkZ2V0LiBJZiB0aGUgei1p bmRleAorICAgICAgICBoZXJlIGlzIGdyZWF0ZXIgdGhhbiB0aGUgZW5jbG9zaW5nIGlmcmFtZSBz aGltIHRoZW4gdGhlIHBsdWdpbgorICAgICAgICBzaG91bGQgYmUgZGlzcGxheWVkIG92ZXIgdGhl IGlmcmFtZS4gVXBkYXRlZCB0aGUgbGF5b3V0IHRlc3QgdG8gdGVzdAorICAgICAgICBmb3IgdGhp cyBjYXNlLiBTa2lwcGVkIHRoZSBwbHVnaW5zL2lmcmFtZS1zaGltcy5odG1sIGxheW91dCB0ZXN0 IG9uCisgICAgICAgIHBsYXRmb3JtcyB3aGljaCBkb24ndCBzdXBwb3J0IGl0LgorCisgICAgICAg ICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorCiAyMDEwLTA5LTI4ICBBbmRyZWkg UG9wZXNjdSAgPGFuZHJlaXBAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKZXJl bXkgT3Jsb3cuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250 YWluZXJJbXBsLmNwcAkocmV2aXNpb24gNjg1NDcpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NDEsMTEgKzU0MSwy MCBAQCBzdGF0aWMgYm9vbCBjaGVja1N0YWNrT25Ub3AoCiAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgLy8gRm9yIGNvbXBhdGli aWxpdHkgd2l0aCBJRTogd2hlbiB0aGUgcGx1Z2luIGlzIG5vdCBwb3NpdGlvbmVkLAotICAgICAg ICAgICAgLy8gaXQgc3RhY2tzIGJlaGluZCB0aGUgaWZyYW1lLCBldmVuIGlmIGl0J3MgbGF0ZXIg aW4gdGhlCi0gICAgICAgICAgICAvLyBkb2N1bWVudCBvcmRlci4KLSAgICAgICAgICAgIGlmIChy bzItPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gU3RhdGljUG9zaXRpb24pCisgICAgICAgICAgICAv LyBJZiB0aGUgcGx1Z2luIGRvZXMgbm90IGhhdmUgYW4gZXhwbGljaXQgei1pbmRleCBpdCBzdGFj a3MgYmVoaW5kIHRoZSBpZnJhbWUuCisgICAgICAgICAgICAvLyBUaGlzIGlzIGZvciBtYWludGFp bmluZyBjb21wYXRpYmlsaXR5IHdpdGggSUUuCisgICAgICAgICAgICBpZiAocm8yLT5zdHlsZSgp LT5wb3NpdGlvbigpID09IFN0YXRpY1Bvc2l0aW9uKSB7CisgICAgICAgICAgICAgICAgLy8gVGhl IDAndGggZWxlbWVudHMgb2YgdGhlc2UgUmVuZGVyT2JqZWN0IGFycmF5cyByZXByZXNlbnQgdGhl IHBsdWdpbiBub2RlIGFuZAorICAgICAgICAgICAgICAgIC8vIHRoZSBpZnJhbWUuCisgICAgICAg ICAgICAgICAgY29uc3QgUmVuZGVyT2JqZWN0KiBwbHVnaW5SZW5kZXJPYmplY3QgPSBwbHVnaW5a c3RhY2tbMF07CisgICAgICAgICAgICAgICAgY29uc3QgUmVuZGVyT2JqZWN0KiBpZnJhbWVSZW5k ZXJPYmplY3QgPSBpZnJhbWVac3RhY2tbMF07CisKKyAgICAgICAgICAgICAgICBpZiAocGx1Z2lu UmVuZGVyT2JqZWN0LT5zdHlsZSgpICYmIGlmcmFtZVJlbmRlck9iamVjdC0+c3R5bGUoKSkgewor ICAgICAgICAgICAgICAgICAgICBpZiAocGx1Z2luUmVuZGVyT2JqZWN0LT5zdHlsZSgpLT56SW5k ZXgoKSA+IGlmcmFtZVJlbmRlck9iamVjdC0+c3R5bGUoKS0+ekluZGV4KCkpCisgICAgICAgICAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBJbnNw ZWN0IHRoZSBkb2N1bWVudCBvcmRlci4gIExhdGVyIG9yZGVyIG1lYW5zIGhpZ2hlcgogICAgICAg ICAgICAgLy8gc3RhY2tpbmcuCg==