68969 2011-09-27 22:24:42 -0700 [GTK] need iframe shim support for Gtk webkit 2015-05-07 18:06:57 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED DUPLICATE 132180 EasyFix, Gtk P2 Normal --- 0 jane.xia2009 webkit-unassigned darin gtk-ews gustavo jane.xia2009 mrobinson pnormand robert xan.lopez oldest_to_newest 474495 0 jane.xia2009 2011-09-27 22:24:42 -0700 chromium iframe shim code has been moved to cross-platform file, and supported it in Qt webkit. We are using Gtk webkit, and need to put html overlaying html on windowed plugin.Can you support iframe shim for Gtk webkit? 475510 1 robert 2011-09-29 10:34:01 -0700 Why not experiment with adding the getPluginOcclusions() call to PluginViewGtk.cpp. PluginView::updateWidgetAllocationAndClip() looks like the place to start. 476053 2 jane.xia2009 2011-09-30 06:17:17 -0700 I will try,thanks a lot. (In reply to comment #1) > Why not experiment with adding the getPluginOcclusions() call to PluginViewGtk.cpp. PluginView::updateWidgetAllocationAndClip() looks like the place to start. 486592 3 jane.xia2009 2011-10-19 00:23:37 -0700 (In reply to comment #2) > I will try,thanks a lot. > (In reply to comment #1) > > Why not experiment with adding the getPluginOcclusions() call to PluginViewGtk.cpp. PluginView::updateWidgetAllocationAndClip() looks like the place to start. I added getPluginOcclusions() call in PluginView::updateWidgetAllocationAndClip() in PluginViewGtk.cpp and it works well to use iframe shims to put html overlaying html on windowed plugin. 486604 4 111572 jane.xia2009 2011-10-19 01:04:34 -0700 Created attachment 111572 iframe shims support in Gtk webkit This patch use getPluginOcclusions() in IFrameShimSupport.cpp to support overlay html on windowed plugin in Gtk webkit using iframe shims. 486606 5 111572 webkit.review.bot 2011-10-19 01:09:14 -0700 Comment on attachment 111572 iframe shims support in Gtk webkit Rejecting attachment 111572 from review queue. jane.xia2009@gmail.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 486607 6 111572 webkit.review.bot 2011-10-19 01:09:56 -0700 Comment on attachment 111572 iframe shims support in Gtk webkit Rejecting attachment 111572 from commit-queue. jane.xia2009@gmail.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 486769 7 111572 mrobinson 2011-10-19 07:19:14 -0700 Comment on attachment 111572 iframe shims support in Gtk webkit View in context: https://bugs.webkit.org/attachment.cgi?id=111572&action=review Thanks for your contribution! This looks like a good change. Are there any tests that cover it that we can unskip? Your patch is also missing a ChangeLog, see http://www.webkit.org/coding/contributing.html. > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:568 > + // Cut out areas of the plugin occluded by iframe shims > + Vector<IntRect> cutOutRects; > + getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects); You indentation looks off here. Be sure to use spaces. All comments that are complete sentences should end with a period. > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:574 > + cutOutRects[i].move(-frameRect().x(), -frameRect().y()); > + GdkRectangle cutOutRect=cutOutRects[i]; > + gdk_region_subtract(clipRegion,gdk_region_rectangle(&cutOutRect)); Looks like the indentation is off below as well. 486770 8 mrobinson 2011-10-19 07:20:14 -0700 Oh, by the way, once you have uploaded your patch, set the review flag to ? and the commit-queue flag to ?. This says: "This patch needs a review and if it passes review should be landed by the commit bot." 487313 9 111723 jane.xia2009 2011-10-19 21:41:18 -0700 Created attachment 111723 iframe shims support in Gtk webkit. 487318 10 jane.xia2009 2011-10-19 21:53:15 -0700 (In reply to comment #8) > Oh, by the way, once you have uploaded your patch, set the review flag to ? and the commit-queue flag to ?. This says: "This patch needs a review and if it passes review should be landed by the commit bot." I test my build with iframe-shims.html in LayoutTests/plugins/iframe-shims.html and it works.(In reply to comment #7) > (From update of attachment 111572 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111572&action=review > > Thanks for your contribution! This looks like a good change. Are there any tests that cover it that we can unskip? Your patch is also missing a ChangeLog, see http://www.webkit.org/coding/contributing.html. > > > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:568 > > + // Cut out areas of the plugin occluded by iframe shims > > + Vector<IntRect> cutOutRects; > > + getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects); > > You indentation looks off here. Be sure to use spaces. All comments that are complete sentences should end with a period. > > > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:574 > > + cutOutRects[i].move(-frameRect().x(), -frameRect().y()); > > + GdkRectangle cutOutRect=cutOutRects[i]; > > + gdk_region_subtract(clipRegion,gdk_region_rectangle(&cutOutRect)); > > Looks like the indentation is off below as well. Thanks, I've changed the comment and the indentation.You can unskip iframe-shims.html in LayoutTests/plugins/iframe-shims.html to test it, I run this case by hand. I didn't see any test case available for iframe shims in Gtk webkit. 487328 11 jane.xia2009 2011-10-19 22:05:08 -0700 (In reply to comment #8) > Oh, by the way, once you have uploaded your patch, set the review flag to ? and the commit-queue flag to ?. This says: "This patch needs a review and if it passes review should be landed by the commit bot." I test my build with iframe-shims.html in LayoutTests/plugins/iframe-shims.html and it works.(In reply to comment #7) > (From update of attachment 111572 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111572&action=review > > Thanks for your contribution! This looks like a good change. Are there any tests that cover it that we can unskip? Your patch is also missing a ChangeLog, see http://www.webkit.org/coding/contributing.html. > > > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:568 > > + // Cut out areas of the plugin occluded by iframe shims > > + Vector<IntRect> cutOutRects; > > + getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects); > > You indentation looks off here. Be sure to use spaces. All comments that are complete sentences should end with a period. > > > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:574 > > + cutOutRects[i].move(-frameRect().x(), -frameRect().y()); > > + GdkRectangle cutOutRect=cutOutRects[i]; > > + gdk_region_subtract(clipRegion,gdk_region_rectangle(&cutOutRect)); > > Looks like the indentation is off below as well. Thanks, I've changed the comment and the indentation.You can unskip iframe-shims.html in LayoutTests/plugins/iframe-shims.html to test it, I run this case by hand. I didn't see any test case available for iframe shims in Gtk webkit. 488906 12 robert 2011-10-22 01:39:32 -0700 The annoying thing about the layout test is that it passes even without the shin support. See bug 3778. I think it needs a layouttestcontroller.repaint test to test the paint areas properly. 524172 13 111572 eric 2011-12-19 14:01:24 -0800 Comment on attachment 111572 iframe shims support in Gtk webkit Please obsolete your old patches when uploading new ones, or use webkit-patch upload which will do that for you. :) 524175 14 111723 eric 2011-12-19 14:02:30 -0800 Comment on attachment 111723 iframe shims support in Gtk webkit. View in context: https://bugs.webkit.org/attachment.cgi?id=111723&action=review > Source/WebCore/ChangeLog:8 > + Amend PluginViewGtk use IFframeShimSupport.h and IFframeShimSupport.cpp to handle shims correctly. IFframe? > Source/WebCore/GNUmakefile.list.am:4086 > + Source/WebCore/plugins/IFrameShimSupport.cpp \ > + Source/WebCore/plugins/IFrameShimSupport.h Are these new files? If so, they're missing from your patch. 524189 15 robert 2011-12-19 14:24:45 -0800 (In reply to comment #14) > > Source/WebCore/GNUmakefile.list.am:4086 > > + Source/WebCore/plugins/IFrameShimSupport.cpp \ > > + Source/WebCore/plugins/IFrameShimSupport.h > > Are these new files? If so, they're missing from your patch. No, they're only used by chromium and qt at the moment though. Note that the layout tests don't actually work for this shim testing, on any platform. They pass even without iframe shims implemented. The test plugin needs to paint itself in order to show up properly in the hit testing I think. 524194 16 111723 mrobinson 2011-12-19 14:32:55 -0800 Comment on attachment 111723 iframe shims support in Gtk webkit. View in context: https://bugs.webkit.org/attachment.cgi?id=111723&action=review I think with the typo fix and the minor change below this patch looks okay. > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:586 > + cairo_region_t* cutOutRegion = cairo_region_create_rectangle(&cutOutRect); > + cairo_region_subtract(clipRegion, cutOutRegion); Why not just do: cairo_rectangle_int_t cutOutRect = cutOutRects[i]; cairo_region_subtract_rectangle(clipRegion, cutOutRegion); 618219 17 140648 jane.xia2009 2012-05-07 19:07:34 -0700 Created attachment 140648 iframe shims support in Gtk webkit Replace cairo_region_subtract with cairo_region_subtract_rectangle according to Martin Robinson's advice, thanks a lot. 745602 18 140648 mrobinson 2012-10-18 14:59:11 -0700 Comment on attachment 140648 iframe shims support in Gtk webkit View in context: https://bugs.webkit.org/attachment.cgi?id=140648&action=review Sorry for letting this one go for so long. Do you mind fixing the ChangeLog so that I can land it with the commit-queue. > ChangeLog:13 > +10 * GNUmakefile.list.am: > +11 * plugins/gtk/PluginViewGtk.cpp: > +12 (WebCore::PluginView::updateWidgetAllocationAndClip): > + There are line numbers in the ChangeLog here. 745629 19 169487 xan.lopez 2012-10-18 15:21:54 -0700 Created attachment 169487 shims.diff Went ahead and made a proper ChangeLog for the patch, plus kept the files in alphabetical order in the Makefile. 745641 20 169487 gtk-ews 2012-10-18 15:31:19 -0700 Comment on attachment 169487 shims.diff Attachment 169487 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/14460166 745647 21 xan.lopez 2012-10-18 15:35:06 -0700 OK, seems this actually needed more than a new ChangeLog. 745656 22 mrobinson 2012-10-18 15:44:46 -0700 Xan, thanks for fixing the ChangeLog. Looks like we cannot cq+ this because it broke the build though. 753030 23 jane.xia2009 2012-10-28 19:50:30 -0700 No, I don't mind.Please go ahead. (In reply to comment #18) > (From update of attachment 140648 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140648&action=review > > Sorry for letting this one go for so long. Do you mind fixing the ChangeLog so that I can land it with the commit-queue. > > > ChangeLog:13 > > +10 * GNUmakefile.list.am: > > +11 * plugins/gtk/PluginViewGtk.cpp: > > +12 (WebCore::PluginView::updateWidgetAllocationAndClip): > > + > > There are line numbers in the ChangeLog here. 799978 24 140648 eric 2013-01-04 00:40:32 -0800 Comment on attachment 140648 iframe shims support in Gtk webkit Cleared Martin Robinson's review+ from obsolete attachment 140648 so that this bug does not appear in http://webkit.org/pending-commit. 874897 25 pnormand 2013-04-12 12:24:25 -0700 Ping Xan! 976980 26 169487 andersca 2014-02-05 11:17:00 -0800 Comment on attachment 169487 shims.diff Clearing review flag on patches from before 2014. If this patch is still relevant, please reset the r? flag. 1092931 27 mrobinson 2015-05-07 18:06:57 -0700 *** This bug has been marked as a duplicate of bug 132180 *** 111572 2011-10-19 01:04:34 -0700 2011-12-19 14:01:24 -0800 iframe shims support in Gtk webkit Patch text/plain 2436 jane.xia2009 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbQkocmV2aXNpb24gOTc4MzYpCisrKyBT b3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCSh3b3JraW5nIGNvcHkpCkBAIC00MDgx LDcgKzQwODEsOSBAQCB3ZWJjb3JlZ3RrX3NvdXJjZXMgKz0gXAogCVNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9XaWRnZXRSZW5kZXJpbmdDb250ZXh0LmNwcCBcCiAJU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1dpZGdldFJlbmRlcmluZ0NvbnRleHQuaCBcCiAJU291cmNlL1dlYkNvcmUv cGx1Z2lucy9ndGsvUGx1Z2luUGFja2FnZUd0ay5jcHAgXAotCVNvdXJjZS9XZWJDb3JlL3BsdWdp bnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCisJU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1 Z2luVmlld0d0ay5jcHAgXAorCVNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvSUZyYW1lU2hpbVN1cHBv cnQuY3BwIFwKKwlTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL0lGcmFtZVNoaW1TdXBwb3J0LmgKIAog aWYgVEFSR0VUX1gxMQogd2ViY29yZWd0a19zb3VyY2VzICs9IFwKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCShyZXZpc2lvbiA5NzgzNikKKysr IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00NSw2ICs0NSw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAi SFRNTFBsdWdJbkVsZW1lbnQuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCisjaW5jbHVkZSAi SUZyYW1lU2hpbVN1cHBvcnQuaCIKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIktleWJv YXJkRXZlbnQuaCIKICNpbmNsdWRlICJNb3VzZUV2ZW50LmgiCkBAIC01NjIsMTIgKzU2MywyNSBA QCB2b2lkIFBsdWdpblZpZXc6OnVwZGF0ZVdpZGdldEFsbG9jYXRpb25BCiAgICAgR3RrV2lkZ2V0 KiB3aWRnZXQgPSBwbGF0Zm9ybVBsdWdpbldpZGdldCgpOwogICAgIGlmIChndGtfd2lkZ2V0X2dl dF9yZWFsaXplZCh3aWRnZXQpKSB7CiAgICAgICAgIEdka1JlY3RhbmdsZSBjbGlwUmVjdCA9IG1f Y2xpcFJlY3Q7CisJCS8vIEN1dCBvdXQgYXJlYXMgb2YgdGhlIHBsdWdpbiBvY2NsdWRlZCBieSBp ZnJhbWUgc2hpbXMKKwkJVmVjdG9yPEludFJlY3Q+IGN1dE91dFJlY3RzOworCQlnZXRQbHVnaW5P Y2NsdXNpb25zKG1fZWxlbWVudCwgdGhpcy0+cGFyZW50KCksIGZyYW1lUmVjdCgpLCBjdXRPdXRS ZWN0cyk7CiAjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKICAgICAgICAgR2RrUmVnaW9uKiBjbGlw UmVnaW9uID0gZ2RrX3JlZ2lvbl9yZWN0YW5nbGUoJmNsaXBSZWN0KTsKKyAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBjdXRPdXRSZWN0cy5zaXplKCk7IGkrKykgeworCQkJCWN1dE91dFJl Y3RzW2ldLm1vdmUoLWZyYW1lUmVjdCgpLngoKSwgLWZyYW1lUmVjdCgpLnkoKSk7CisJCQkJR2Rr UmVjdGFuZ2xlIGN1dE91dFJlY3Q9Y3V0T3V0UmVjdHNbaV07CisJCQkJZ2RrX3JlZ2lvbl9zdWJ0 cmFjdChjbGlwUmVnaW9uLGdka19yZWdpb25fcmVjdGFuZ2xlKCZjdXRPdXRSZWN0KSk7CisgICAg ICAgIH0KICAgICAgICAgZ2RrX3dpbmRvd19zaGFwZV9jb21iaW5lX3JlZ2lvbihndGtfd2lkZ2V0 X2dldF93aW5kb3cod2lkZ2V0KSwgY2xpcFJlZ2lvbiwgMCwgMCk7CiAgICAgICAgIGdka19yZWdp b25fZGVzdHJveShjbGlwUmVnaW9uKTsKICNlbHNlCiAgICAgICAgIGNhaXJvX3JlZ2lvbl90KiBj bGlwUmVnaW9uID0gY2Fpcm9fcmVnaW9uX2NyZWF0ZV9yZWN0YW5nbGUoJmNsaXBSZWN0KTsKKyAg ICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjdXRPdXRSZWN0cy5zaXplKCk7IGkrKykgewor CQkJCWN1dE91dFJlY3RzW2ldLm1vdmUoLWZyYW1lUmVjdCgpLngoKSwgLWZyYW1lUmVjdCgpLnko KSk7CisJCQkJR2RrUmVjdGFuZ2xlIGN1dE91dFJlY3Q9Y3V0T3V0UmVjdHNbaV07CisJCQkJY2Fp cm9fcmVnaW9uX3N1YnRyYWN0X3JlY3RhbmdsZShjbGlwUmVnaW9uLCZjdXRPdXRSZWN0KTsgICAg IAorICAgICAgICB9CiAgICAgICAgIGdka193aW5kb3dfc2hhcGVfY29tYmluZV9yZWdpb24oZ3Rr X3dpZGdldF9nZXRfd2luZG93KHdpZGdldCksIGNsaXBSZWdpb24sIDAsIDApOwogICAgICAgICBj YWlyb19yZWdpb25fZGVzdHJveShjbGlwUmVnaW9uKTsKICNlbmRpZgoK 111723 2011-10-19 21:41:18 -0700 2012-05-07 19:07:34 -0700 iframe shims support in Gtk webkit. Patch text/plain 3523 jane.xia2009 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3ODQzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTAtMTkgIFpoZW4gWGlh ICA8amFuZS54aWEyMDA5QGdtYWlsLmNvbT4KKworICAgICAgICBuZWVkIGlmcmFtZSBzaGltIHN1 cHBvcnQgZm9yIEd0ayB3ZWJraXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY4OTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQW1lbmQgUGx1Z2luVmlld0d0ayB1c2UgSUZmcmFtZVNoaW1TdXBwb3J0Lmgg YW5kIElGZnJhbWVTaGltU3VwcG9ydC5jcHAgdG8gaGFuZGxlIHNoaW1zIGNvcnJlY3RseS4KKwor ICAgICAgICAqIEdOVW1ha2VmaWxlLmxpc3QuYW06CisgICAgICAgICogcGx1Z2lucy9ndGsvUGx1 Z2luVmlld0d0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojp1cGRhdGVXaWRn ZXRBbGxvY2F0aW9uQW5kQ2xpcCk6CisKIDIwMTEtMTAtMTMgIFBhdmVsIFBvZGl2aWxvdiAgPHBv ZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBKUyBz cGVjaWZpYyBwb3BvdmVyIGhhbmRsaW5nIHRvIEphdmFTY3JpcHRTb3VyY2VGcmFtZS4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbQkocmV2aXNpb24gOTc4NDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCSh3b3JraW5nIGNvcHkpCkBAIC00MDgxLDcgKzQw ODEsOSBAQCB3ZWJjb3JlZ3RrX3NvdXJjZXMgKz0gXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9XaWRnZXRSZW5kZXJpbmdDb250ZXh0LmNwcCBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1dpZGdldFJlbmRlcmluZ0NvbnRleHQuaCBcCiAJU291cmNlL1dlYkNvcmUvcGx1Z2lu cy9ndGsvUGx1Z2luUGFja2FnZUd0ay5jcHAgXAotCVNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3Rr L1BsdWdpblZpZXdHdGsuY3BwCisJU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmll d0d0ay5jcHAgXAorCVNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvSUZyYW1lU2hpbVN1cHBvcnQuY3Bw IFwKKwlTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL0lGcmFtZVNoaW1TdXBwb3J0LmgKIAogaWYgVEFS R0VUX1gxMQogd2ViY29yZWd0a19zb3VyY2VzICs9IFwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs dWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCShyZXZpc2lvbiA5Nzg0MykKKysrIFNvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00NSw2ICs0NSw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRNTFBs dWdJbkVsZW1lbnQuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCisjaW5jbHVkZSAiSUZyYW1l U2hpbVN1cHBvcnQuaCIKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIktleWJvYXJkRXZl bnQuaCIKICNpbmNsdWRlICJNb3VzZUV2ZW50LmgiCkBAIC01NjIsMTIgKzU2MywyOSBAQCB2b2lk IFBsdWdpblZpZXc6OnVwZGF0ZVdpZGdldEFsbG9jYXRpb25BCiAgICAgR3RrV2lkZ2V0KiB3aWRn ZXQgPSBwbGF0Zm9ybVBsdWdpbldpZGdldCgpOwogICAgIGlmIChndGtfd2lkZ2V0X2dldF9yZWFs aXplZCh3aWRnZXQpKSB7CiAgICAgICAgIEdka1JlY3RhbmdsZSBjbGlwUmVjdCA9IG1fY2xpcFJl Y3Q7CisgICAgICAgIC8vIEN1dCBvdXQgYXJlYXMgb2YgdGhlIHBsdWdpbiBvY2NsdWRlZCBieSBp ZnJhbWUgc2hpbXMuCisgICAgICAgIFZlY3RvcjxJbnRSZWN0PiBjdXRPdXRSZWN0czsKKyAgICAg ICAgZ2V0UGx1Z2luT2NjbHVzaW9ucyhtX2VsZW1lbnQsIHRoaXMtPnBhcmVudCgpLCBmcmFtZVJl Y3QoKSwgY3V0T3V0UmVjdHMpOwogI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCiAgICAgICAgIEdk a1JlZ2lvbiogY2xpcFJlZ2lvbiA9IGdka19yZWdpb25fcmVjdGFuZ2xlKCZjbGlwUmVjdCk7Cisg ICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY3V0T3V0UmVjdHMuc2l6ZSgpOyBpKyspIHsK KyAgICAgICAgICAgIGN1dE91dFJlY3RzW2ldLm1vdmUoLWZyYW1lUmVjdCgpLngoKSwgLWZyYW1l UmVjdCgpLnkoKSk7CisgICAgICAgICAgICBHZGtSZWN0YW5nbGUgY3V0T3V0UmVjdCA9IGN1dE91 dFJlY3RzW2ldOworICAgICAgICAgICAgR2RrUmVnaW9uKiBjdXRPdXRSZWdpb24gPSBnZGtfcmVn aW9uX3JlY3RhbmdsZSgmY3V0T3V0UmVjdCk7CisgICAgICAgICAgICBnZGtfcmVnaW9uX3N1YnRy YWN0KGNsaXBSZWdpb24sIGN1dE91dFJlZ2lvbik7CisgICAgICAgICAgICBnZGtfcmVnaW9uX2Rl c3Ryb3koY3V0T3V0UmVnaW9uKTsKKyAgICAgICAgfQogICAgICAgICBnZGtfd2luZG93X3NoYXBl X2NvbWJpbmVfcmVnaW9uKGd0a193aWRnZXRfZ2V0X3dpbmRvdyh3aWRnZXQpLCBjbGlwUmVnaW9u LCAwLCAwKTsKICAgICAgICAgZ2RrX3JlZ2lvbl9kZXN0cm95KGNsaXBSZWdpb24pOwogI2Vsc2UK ICAgICAgICAgY2Fpcm9fcmVnaW9uX3QqIGNsaXBSZWdpb24gPSBjYWlyb19yZWdpb25fY3JlYXRl X3JlY3RhbmdsZSgmY2xpcFJlY3QpOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGN1 dE91dFJlY3RzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAgICBjdXRPdXRSZWN0c1tpXS5tb3Zl KC1mcmFtZVJlY3QoKS54KCksIC1mcmFtZVJlY3QoKS55KCkpOworICAgICAgICAgICAgR2RrUmVj dGFuZ2xlIGN1dE91dFJlY3QgPSBjdXRPdXRSZWN0c1tpXTsKKyAgICAgICAgICAgIGNhaXJvX3Jl Z2lvbl90KiBjdXRPdXRSZWdpb24gPSBjYWlyb19yZWdpb25fY3JlYXRlX3JlY3RhbmdsZSgmY3V0 T3V0UmVjdCk7CisgICAgICAgICAgICBjYWlyb19yZWdpb25fc3VidHJhY3QoY2xpcFJlZ2lvbiwg Y3V0T3V0UmVnaW9uKTsKKyAgICAgICAgICAgIGNhaXJvX3JlZ2lvbl9kZXN0cm95KGN1dE91dFJl Z2lvbik7CisgICAgICAgIH0KICAgICAgICAgZ2RrX3dpbmRvd19zaGFwZV9jb21iaW5lX3JlZ2lv bihndGtfd2lkZ2V0X2dldF93aW5kb3cod2lkZ2V0KSwgY2xpcFJlZ2lvbiwgMCwgMCk7CiAgICAg ICAgIGNhaXJvX3JlZ2lvbl9kZXN0cm95KGNsaXBSZWdpb24pOwogI2VuZGlmCg== 140648 2012-05-07 19:07:34 -0700 2013-01-04 00:40:32 -0800 iframe shims support in Gtk webkit iframeShimsGtk.patch text/plain 3241 jane.xia2009 SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIENoYW5nZUxvZwkocmV2aXNpb24gMTE2 MjgwKQ0KKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQ0KQEAgLTEsMyArMSwxNiBAQA0KKzIw MTItMDUtMDcgIFpoZW4gWGlhICA8amFuZS54aWEyMDA5QGdtYWlsLmNvbT4KKzIJCiszCSAgICAg ICAgbmVlZCBpZnJhbWUgc2hpbSBzdXBwb3J0IGZvciBHdGsgd2Via2l0Cis0CSAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4OTY5Cis1CQorNgkgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorNwkKKzgJICAgICAgICBBbWVuZCBQbHVnaW5W aWV3R3RrIHVzZSBJRmZyYW1lU2hpbVN1cHBvcnQuaCBhbmQgSUZmcmFtZVNoaW1TdXBwb3J0LmNw cCB0byBoYW5kbGUgc2hpbXMgY29ycmVjdGx5LgorOQkKKzEwCSAgICAgICAgKiBHTlVtYWtlZmls ZS5saXN0LmFtOgorMTEJICAgICAgICAqIHBsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwOgor MTIJICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6dXBkYXRlV2lkZ2V0QWxsb2NhdGlvbkFu ZENsaXApOgorCiAyMDEyLTA1LTA2ICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBDbGVhbnVwOiBNb3ZlIEZpbGVTeXN0ZW0gQVBJIHR5cGUgZGVmaW5pdGlv bnMgaW50byBhIHNlcGFyYXRlIGhlYWRlciBmaWxlCkluZGV4OiBHTlVtYWtlZmlsZS5saXN0LmFt DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09DQotLS0gR05VbWFrZWZpbGUubGlzdC5hbQkocmV2aXNpb24gMTE2MjgwKQ0K KysrIEdOVW1ha2VmaWxlLmxpc3QuYW0JKHdvcmtpbmcgY29weSkNCkBAIC00NzU5LDcgKzQ3NTks OSBAQA0KIAlTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4 dC5jcHAgXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRSZW5kZXJpbmdDb250 ZXh0LmggXAogCVNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblBhY2thZ2VHdGsuY3Bw IFwKLQlTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcAorCVNvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwIFwKKwlTb3VyY2UvV2ViQ29y ZS9wbHVnaW5zL0lGcmFtZVNoaW1TdXBwb3J0LmNwcCBcCisJU291cmNlL1dlYkNvcmUvcGx1Z2lu cy9JRnJhbWVTaGltU3VwcG9ydC5oCiAKIGlmIFRBUkdFVF9YMTEKIHdlYmNvcmVndGtfc291cmNl cyArPSBcCkluZGV4OiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcA0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K LS0tIHBsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCShyZXZpc2lvbiAxMTYyODApDQorKysg cGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC00NSw2ICs0 NSw3IEBADQogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxQbHVnSW5FbGVt ZW50LmgiCiAjaW5jbHVkZSAiSG9zdFdpbmRvdy5oIgorI2luY2x1ZGUgIklGcmFtZVNoaW1TdXBw b3J0LmgiCiAjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNsdWRlICJLZXlib2FyZEV2ZW50LmgiCiAj aW5jbHVkZSAiTW91c2VFdmVudC5oIgpAQCAtNTY3LDEyICs1NjgsMjcgQEANCiAgICAgR3RrV2lk Z2V0KiB3aWRnZXQgPSBwbGF0Zm9ybVBsdWdpbldpZGdldCgpOwogICAgIGlmIChndGtfd2lkZ2V0 X2dldF9yZWFsaXplZCh3aWRnZXQpKSB7CiAgICAgICAgIEdka1JlY3RhbmdsZSBjbGlwUmVjdCA9 IG1fY2xpcFJlY3Q7CisgICAgICAgIC8vIEN1dCBvdXQgYXJlYXMgb2YgdGhlIHBsdWdpbiBvY2Ns dWRlZCBieSBpZnJhbWUgc2hpbXMuCisgICAgICAgIFZlY3RvcjxJbnRSZWN0PiBjdXRPdXRSZWN0 czsKKyAgICAgICAgZ2V0UGx1Z2luT2NjbHVzaW9ucyhtX2VsZW1lbnQsIHRoaXMtPnBhcmVudCgp LCBmcmFtZVJlY3QoKSwgY3V0T3V0UmVjdHMpOwogI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCiAg ICAgICAgIEdka1JlZ2lvbiogY2xpcFJlZ2lvbiA9IGdka19yZWdpb25fcmVjdGFuZ2xlKCZjbGlw UmVjdCk7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY3V0T3V0UmVjdHMuc2l6ZSgp OyBpKyspIHsKKyAgICAgICAgICAgIGN1dE91dFJlY3RzW2ldLm1vdmUoLWZyYW1lUmVjdCgpLngo KSwgLWZyYW1lUmVjdCgpLnkoKSk7CisgICAgICAgICAgICBHZGtSZWN0YW5nbGUgY3V0T3V0UmVj dCA9IGN1dE91dFJlY3RzW2ldOworICAgICAgICAgICAgR2RrUmVnaW9uKiBjdXRPdXRSZWdpb24g PSBnZGtfcmVnaW9uX3JlY3RhbmdsZSgmY3V0T3V0UmVjdCk7CisgICAgICAgICAgICBnZGtfcmVn aW9uX3N1YnRyYWN0KGNsaXBSZWdpb24sIGN1dE91dFJlZ2lvbik7CisgICAgICAgICAgICBnZGtf cmVnaW9uX2Rlc3Ryb3koY3V0T3V0UmVnaW9uKTsKKyAgICAgICAgfQogICAgICAgICBnZGtfd2lu ZG93X3NoYXBlX2NvbWJpbmVfcmVnaW9uKGd0a193aWRnZXRfZ2V0X3dpbmRvdyh3aWRnZXQpLCBj bGlwUmVnaW9uLCAwLCAwKTsKICAgICAgICAgZ2RrX3JlZ2lvbl9kZXN0cm95KGNsaXBSZWdpb24p OwogI2Vsc2UKICAgICAgICAgY2Fpcm9fcmVnaW9uX3QqIGNsaXBSZWdpb24gPSBjYWlyb19yZWdp b25fY3JlYXRlX3JlY3RhbmdsZSgmY2xpcFJlY3QpOworICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGN1dE91dFJlY3RzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAgICBjdXRPdXRSZWN0 c1tpXS5tb3ZlKC1mcmFtZVJlY3QoKS54KCksIC1mcmFtZVJlY3QoKS55KCkpOworICAgICAgICAg ICAgY2Fpcm9fcmVjdGFuZ2xlX2ludF90IGN1dE91dFJlY3QgPSBjdXRPdXRSZWN0c1tpXTsKKyAg ICAgICAgICAgIGNhaXJvX3JlZ2lvbl9zdWJ0cmFjdF9yZWN0YW5nbGUoY2xpcFJlZ2lvbiwgY3V0 T3V0UmVjdCk7CisgICAgICAgIH0KICAgICAgICAgZ2RrX3dpbmRvd19zaGFwZV9jb21iaW5lX3Jl Z2lvbihndGtfd2lkZ2V0X2dldF93aW5kb3cod2lkZ2V0KSwgY2xpcFJlZ2lvbiwgMCwgMCk7CiAg ICAgICAgIGNhaXJvX3JlZ2lvbl9kZXN0cm95KGNsaXBSZWdpb24pOwogI2VuZGlmCg== 169487 2012-10-18 15:21:54 -0700 2014-02-05 11:17:00 -0800 shims.diff shims.diff text/plain 4353 xan.lopez RnJvbSA1OTM0OWI1Y2VkMTU0MWIxNWFkZTZjYTYxYmE4YTdkMWExM2UzMmUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBaaGVuIFhpYSA8amFuZS54aWEyMDA5QGdtYWlsLmNvbT4KRGF0 ZTogRnJpLCAxOSBPY3QgMjAxMiAwMDoxODo0NSArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTIt MTAtMTggIFpoZW4gWGlhICA8amFuZS54aWEyMDA5QGdtYWlsLmNvbT4KCiAgICAgICAgbmVlZCBp ZnJhbWUgc2hpbSBzdXBwb3J0IGZvciBHdGsgd2Via2l0CiAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4OTY5CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgoKICAgICAgICBNYWtlIFBsdWdpblZpZXdHdGsrIHVzZSBJRnJhbWVTaGltU3Vw cG9ydCB0byBoYW5kbGUgc2hpbXMKICAgICAgICBjb3JyZWN0bHkuCgogICAgICAgICogR05VbWFr ZWZpbGUubGlzdC5hbToKICAgICAgICAqIHBsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwOgog ICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojp1cGRhdGVXaWRnZXRBbGxvY2F0aW9uQW5kQ2xp cCk6Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgfCAg IDE0ICsrKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtICAg ICAgICAgICB8ICAgIDYgKysrKy0tCiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5W aWV3R3RrLmNwcCB8ICAgMTYgKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAzNCBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwODg3ZjU5Li43MDll NDc4IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMTAtMTggIFpoZW4gWGlhICA8 amFuZS54aWEyMDA5QGdtYWlsLmNvbT4KKworICAgICAgICBuZWVkIGlmcmFtZSBzaGltIHN1cHBv cnQgZm9yIEd0ayB3ZWJraXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY4OTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTWFrZSBQbHVnaW5WaWV3R3RrKyB1c2UgSUZyYW1lU2hpbVN1cHBvcnQgdG8gaGFu ZGxlIHNoaW1zCisgICAgICAgIGNvcnJlY3RseS4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmxp c3QuYW06CisgICAgICAgICogcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQbHVnaW5WaWV3Ojp1cGRhdGVXaWRnZXRBbGxvY2F0aW9uQW5kQ2xpcCk6CisK IDIwMTItMTAtMTggIEFscGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Y2hyb21pdW1dIEltcGxlbWVudCBkZWZlcnJlZCBpbWFnZSBkZWNvZGluZwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbSBiL1NvdXJjZS9XZWJDb3JlL0dOVW1h a2VmaWxlLmxpc3QuYW0KaW5kZXggZWEyYjIyZS4uYzg0YzczZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtl ZmlsZS5saXN0LmFtCkBAIC02MDM3LDEwICs2MDM3LDEyIEBAIHdlYmNvcmVndGtfc291cmNlcyAr PSBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1dpZGdldEJhY2tpbmdTdG9yZVgx MS5jcHAgXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0 ZVdpbmRvdy5jcHAgXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZWRpcmVjdGVkWENv bXBvc2l0ZVdpbmRvdy5oIFwKLQlTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4u YyBcCi0JU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmggXAorCVNvdXJjZS9X ZWJDb3JlL3BsdWdpbnMvSUZyYW1lU2hpbVN1cHBvcnQuY3BwIFwKKwlTb3VyY2UvV2ViQ29yZS9w bHVnaW5zL0lGcmFtZVNoaW1TdXBwb3J0LmggXAogCVNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3Rr L1BsdWdpblBhY2thZ2VHdGsuY3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVn aW5WaWV3R3RrLmNwcCBcCisJU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMg XAorCVNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5oIFwKIAlTb3VyY2UvV2Vi Q29yZS9wbHVnaW5zL2d0ay94ZW1iZWQuaAogaWYgVVNFX0VHTAogd2ViY29yZWd0a19zb3VyY2Vz ICs9IFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdH dGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKaW5k ZXggNDAwNjA0MC4uZTM5Y2ZkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9n dGsvUGx1Z2luVmlld0d0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1 Z2luVmlld0d0ay5jcHAKQEAgLTQ1LDYgKzQ1LDcgQEAKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIK ICNpbmNsdWRlICJIVE1MUGx1Z0luRWxlbWVudC5oIgogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIK KyNpbmNsdWRlICJJRnJhbWVTaGltU3VwcG9ydC5oIgogI2luY2x1ZGUgIkltYWdlLmgiCiAjaW5j bHVkZSAiS2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIKQEAgLTU0NCwx MiArNTQ1LDI3IEBAIHZvaWQgUGx1Z2luVmlldzo6dXBkYXRlV2lkZ2V0QWxsb2NhdGlvbkFuZENs aXAoKQogICAgIEd0a1dpZGdldCogd2lkZ2V0ID0gcGxhdGZvcm1QbHVnaW5XaWRnZXQoKTsKICAg ICBpZiAoZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQod2lkZ2V0KSkgewogICAgICAgICBHZGtSZWN0 YW5nbGUgY2xpcFJlY3QgPSBtX2NsaXBSZWN0OworICAgICAgICAvLyBDdXQgb3V0IGFyZWFzIG9m IHRoZSBwbHVnaW4gb2NjbHVkZWQgYnkgaWZyYW1lIHNoaW1zLgorICAgICAgICBWZWN0b3I8SW50 UmVjdD4gY3V0T3V0UmVjdHM7CisgICAgICAgIGdldFBsdWdpbk9jY2x1c2lvbnMobV9lbGVtZW50 LCB0aGlzLT5wYXJlbnQoKSwgZnJhbWVSZWN0KCksIGN1dE91dFJlY3RzKTsKICNpZmRlZiBHVEtf QVBJX1ZFUlNJT05fMgogICAgICAgICBHZGtSZWdpb24qIGNsaXBSZWdpb24gPSBnZGtfcmVnaW9u X3JlY3RhbmdsZSgmY2xpcFJlY3QpOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGN1 dE91dFJlY3RzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAgICBjdXRPdXRSZWN0c1tpXS5tb3Zl KC1mcmFtZVJlY3QoKS54KCksIC1mcmFtZVJlY3QoKS55KCkpOworICAgICAgICAgICAgR2RrUmVj dGFuZ2xlIGN1dE91dFJlY3QgPSBjdXRPdXRSZWN0c1tpXTsKKyAgICAgICAgICAgIEdka1JlZ2lv biogY3V0T3V0UmVnaW9uID0gZ2RrX3JlZ2lvbl9yZWN0YW5nbGUoJmN1dE91dFJlY3QpOworICAg ICAgICAgICAgZ2RrX3JlZ2lvbl9zdWJ0cmFjdChjbGlwUmVnaW9uLCBjdXRPdXRSZWdpb24pOwor ICAgICAgICAgICAgZ2RrX3JlZ2lvbl9kZXN0cm95KGN1dE91dFJlZ2lvbik7CisgICAgICAgIH0K ICAgICAgICAgZ2RrX3dpbmRvd19zaGFwZV9jb21iaW5lX3JlZ2lvbihndGtfd2lkZ2V0X2dldF93 aW5kb3cod2lkZ2V0KSwgY2xpcFJlZ2lvbiwgMCwgMCk7CiAgICAgICAgIGdka19yZWdpb25fZGVz dHJveShjbGlwUmVnaW9uKTsKICNlbHNlCiAgICAgICAgIGNhaXJvX3JlZ2lvbl90KiBjbGlwUmVn aW9uID0gY2Fpcm9fcmVnaW9uX2NyZWF0ZV9yZWN0YW5nbGUoJmNsaXBSZWN0KTsKKyAgICAgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBjdXRPdXRSZWN0cy5zaXplKCk7IGkrKykgeworICAgICAg ICAgICAgY3V0T3V0UmVjdHNbaV0ubW92ZSgtZnJhbWVSZWN0KCkueCgpLCAtZnJhbWVSZWN0KCku eSgpKTsKKyAgICAgICAgICAgIGNhaXJvX3JlY3RhbmdsZV9pbnRfdCBjdXRPdXRSZWN0ID0gY3V0 T3V0UmVjdHNbaV07CisgICAgICAgICAgICBjYWlyb19yZWdpb25fc3VidHJhY3RfcmVjdGFuZ2xl KGNsaXBSZWdpb24sIGN1dE91dFJlY3QpOworICAgICAgICB9CiAgICAgICAgIGdka193aW5kb3df c2hhcGVfY29tYmluZV9yZWdpb24oZ3RrX3dpZGdldF9nZXRfd2luZG93KHdpZGdldCksIGNsaXBS ZWdpb24sIDAsIDApOwogICAgICAgICBjYWlyb19yZWdpb25fZGVzdHJveShjbGlwUmVnaW9uKTsK ICNlbmRpZgotLSAKMS43LjcuNgoK