40983 2010-06-22 06:37:06 -0700 [Qt] - Context menu needs "Copy" as well when the selected text is a link. 2011-02-07 22:59:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED http://bugreports.qt.nokia.com/browse/QTBUG-11478 EasyFix, Qt, QtTriaged P5 Enhancement --- 0 karsten.heimrich manish.5.gupta aparna.nand benjamin commit-queue cshu karsten.heimrich mrobinson oldest_to_newest 241231 0 karsten.heimrich 2010-06-22 06:37:06 -0700 Description from the original issue: If a selection contains a link, the context menu contains, "Open Link, Open Link in New Tab, and Copy Link" If the selection does not contain a link, I get, "Copy". 100% of the time, when I have a link selected, I'm just trying to copy a prototype or example to a source file. The link menus do absolutely nothing but waste my time. I just get i.e "qthelp://com.trolltech.qt.460/qdoc/qwidget.html#focusPreviousChild". Add a "copy" action to the first element of the context menu so that I can just copy the text and not the link. Maybe the link information is useful to someone, but I doubt it is useful to any developers using Assistant. 241232 1 karsten.heimrich 2010-06-22 06:38:26 -0700 http://bugreports.qt.nokia.com/browse/QTBUG-11478 341941 2 benjamin 2011-01-28 19:02:32 -0800 Please follow http://trac.webkit.org/wiki/QtWebKitBugs when reporing bugs (missing Qt keyword). 345415 3 81202 aparna.nand 2011-02-04 02:40:09 -0800 Created attachment 81202 Patch for review Modified to have Copy as a default option in context menu when the selection is a url. 345426 4 81203 aparna.nand 2011-02-04 02:51:30 -0800 Created attachment 81203 Patch for review with changelogs Adding Copy to context menu 345432 5 81203 benjamin 2011-02-04 03:19:50 -0800 Comment on attachment 81203 Patch for review with changelogs View in context: https://bugs.webkit.org/attachment.cgi?id=81203&action=review Shouldn't this code be part of ContextMenu.cpp in WebCore? > Source/WebKit/qt/ChangeLog:11 > + selection is a url. Adding this option to QWebPage Dot at the end of the sentence. 345539 6 81203 benjamin 2011-02-04 09:39:27 -0800 Comment on attachment 81203 Patch for review with changelogs r- Unless there is a good reason, this kind of code should be in a place where other ports can use it. It can be #ifdef for Qt for now. 345633 7 81251 aparna.nand 2011-02-04 11:26:30 -0800 Created attachment 81251 Patch with corrected code Added the fix in underlying layer. 346148 8 81251 benjamin 2011-02-05 08:33:35 -0800 Comment on attachment 81251 Patch with corrected code View in context: https://bugs.webkit.org/attachment.cgi?id=81251&action=review Almost there I think. > Source/WebCore/ChangeLog:5 > + Copy menu option to be shown in context menu ? > Source/WebCore/ChangeLog:11 > + a link. Added a test in tst_qwebpage.cpp Dot at the end of the sentence or Kenneth will kill you. ;) > Source/WebCore/page/ContextMenuController.cpp:714 > +#if PLATFORM(QT) > + if (m_hitTestResult.isSelected()) > + appendItem(CopyItem, m_contextMenu.get()); > +#endif This seems reasonable. I did not remember ContextMenuController was so messy. :) > Source/WebKit/qt/ChangeLog:12 > + selects a link and opens context menu <Kenneth>Missing dot.</Kenneth> :) > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2770 > + QContextMenuEvent event(QContextMenuEvent::Mouse, QPoint(71, 15)); > + view.page()->swallowContextMenuEvent(&event); > + view.page()->updatePositionDependentActions(QPoint(71, 15)); I don't like the hard coded position. That can make the test flaky depending on other conditions. Why not used QWebElement's rect to find the center of the link? > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2777 > + foreach (QObject* child, view.children()) { > + contextMenu = qobject_cast<QMenu*>(child); > + if (contextMenu) > + break; > + } Can't you use view.findChildren<QMenu*>() here? 346671 9 81492 aparna.nand 2011-02-07 10:47:53 -0800 Created attachment 81492 Patch for review Added full stop in ChangeLog and edited test file. 346695 10 81492 kling 2011-02-07 11:36:39 -0800 Comment on attachment 81492 Patch for review r=me :) 347130 11 81492 commit-queue 2011-02-07 22:59:18 -0800 Comment on attachment 81492 Patch for review Clearing flags on attachment: 81492 Committed r77906: <http://trac.webkit.org/changeset/77906> 347131 12 commit-queue 2011-02-07 22:59:23 -0800 All reviewed patches have been landed. Closing bug. 81202 2011-02-04 02:40:09 -0800 2011-02-04 02:51:30 -0800 Patch for review patch_40983 text/plain 2641 aparna.nand ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCBlODBhYWM1Li5jMjQxMDJhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0zMjc3LDYgKzMyNzcsMTYgQEAgdm9pZCBRV2ViUGFn ZTo6dXBkYXRlUG9zaXRpb25EZXBlbmRlbnRBY3Rpb25zKGNvbnN0IFFQb2ludCAmcG9zKQogCiAg ICAgLy8gVGhlbiB3ZSBsZXQgY3JlYXRlQ29udGV4dE1lbnUoKSBlbmFibGUgdGhlIGFjdGlvbnMg dGhhdCBhcmUgcHV0IGludG8gdGhlIG1lbnUKICAgICBkLT5jdXJyZW50Q29udGV4dE1lbnUgPSBk LT5jcmVhdGVDb250ZXh0TWVudShkLT5wYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS0+Y29u dGV4dE1lbnUoKSwgZC0+cGFnZS0+Y29udGV4dE1lbnVDb250cm9sbGVyKCktPmNvbnRleHRNZW51 KCktPnBsYXRmb3JtRGVzY3JpcHRpb24oKSwgJnZpc2l0ZWRXZWJBY3Rpb25zKTsKKworICAgIC8v IEJ5IGRlZmF1bHQgY29weSBpcyBkaXNhYmxlZCBpZiB0aGUgc2VsZWN0aW9uIGlzIGEgdXJsLiBU byBlbmFibGUgaXQKKyAgICAvLyBnZXQgdGhlIHBvc2l0aW9uIG9mICdDb3B5IExpbmsnIGFuZCBp bnNlcnQgY29weSBpbiB0aGUgc2FtZSBwb3NpdGlvbgorICAgIC8vIFNvIGNvcHkgYW5kIGNvcHkg bGluayBtZW51IG9wdGlvbnMgYXJlIGFkamFjZW50IHRvIGVhY2ggb3RoZXIKKyAgICBpZiAoIWQt PmhpdFRlc3RSZXN1bHQubGlua1VybCgpLmlzRW1wdHkoKSAmJiAhc2VsZWN0ZWRUZXh0KCkuaXNF bXB0eSgpKSB7CisgICAgICAgIFFMaXN0PFFBY3Rpb24gKj4gbGlzdCA9IGQtPmN1cnJlbnRDb250 ZXh0TWVudS0+YWN0aW9ucygpOworICAgICAgICAgICAgaW50IGluZGV4ID0gbGlzdC5pbmRleE9m KGFjdGlvbihRV2ViUGFnZTo6Q29weUxpbmtUb0NsaXBib2FyZCkpOyAKKyAgICAgICAgICAgIGlm IChpbmRleCAhPSAtMSkKKyAgICAgICAgICAgICAgICBkLT5jdXJyZW50Q29udGV4dE1lbnUtPmlu c2VydEFjdGlvbihsaXN0LmF0KGluZGV4KSwgYWN0aW9uKFFXZWJQYWdlOjpDb3B5KSk7CisgICAg fQogI2VuZGlmIC8vIFFUX05PX0NPTlRFWFRNRU5VCiAKICNpZm5kZWYgUVRfTk9fQUNUSU9OCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5k ZXggZWMxZjMzNi4uOGVmMWViYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtNzgsNiArNzgsNyBAQCBwcml2YXRlIHNsb3RzOgog ICAgIHZvaWQgaW5pdFRlc3RDYXNlKCk7CiAgICAgdm9pZCBjbGVhbnVwVGVzdENhc2UoKTsKIAor ICAgIHZvaWQgY29udGV4dE1lbnVDb3B5KCk7CiAgICAgdm9pZCBhY2NlcHROYXZpZ2F0aW9uUmVx dWVzdCgpOwogICAgIHZvaWQgZ2VvbG9jYXRpb25SZXF1ZXN0SlMoKTsKICAgICB2b2lkIGxvYWRG aW5pc2hlZCgpOwpAQCAtMjc1NSw1ICsyNzU2LDMyIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjptYWND b3B5VW5pY29kZVRvQ2xpcGJvYXJkKCkKIH0KICNlbmRpZgogCit2b2lkIHRzdF9RV2ViUGFnZTo6 Y29udGV4dE1lbnVDb3B5KCkKK3sKKyAgICBRV2ViVmlldyB2aWV3OworCisgICAgdmlldy5zZXRI dG1sKCI8YSBocmVmPVwiaHR0cDovL3d3dy5nb29nbGUuY29tXCI+WW91IGNhbnQgbWlzcyB0aGlz PC9hPiIpOworCisgICAgdmlldy5wYWdlKCktPnRyaWdnZXJBY3Rpb24oUVdlYlBhZ2U6OlNlbGVj dEFsbCk7CisgICAgUVZFUklGWSghdmlldy5wYWdlKCktPnNlbGVjdGVkVGV4dCgpLmlzRW1wdHko KSk7CisKKyAgICBRQ29udGV4dE1lbnVFdmVudCBldmVudChRQ29udGV4dE1lbnVFdmVudDo6TW91 c2UsIFFQb2ludCg3MSwgMTUpKTsKKyAgICB2aWV3LnBhZ2UoKS0+c3dhbGxvd0NvbnRleHRNZW51 RXZlbnQoJmV2ZW50KTsKKyAgICB2aWV3LnBhZ2UoKS0+dXBkYXRlUG9zaXRpb25EZXBlbmRlbnRB Y3Rpb25zKFFQb2ludCg3MSwgMTUpKTsKKworICAgIFFNZW51KiBjb250ZXh0TWVudSA9IDA7Cisg ICAgZm9yZWFjaCAoUU9iamVjdCogY2hpbGQsIHZpZXcuY2hpbGRyZW4oKSkgeworICAgICAgICBj b250ZXh0TWVudSA9IHFvYmplY3RfY2FzdDxRTWVudSo+KGNoaWxkKTsKKyAgICAgICAgaWYgKGNv bnRleHRNZW51KQorICAgICAgICAgICAgYnJlYWs7CisgICAgfQorICAgIFFWRVJJRlkoY29udGV4 dE1lbnUpOworICAgIAorICAgIFFMaXN0PFFBY3Rpb24gKj4gbGlzdCA9IGNvbnRleHRNZW51LT5h Y3Rpb25zKCk7CisgICAgaW50IGluZGV4ID0gbGlzdC5pbmRleE9mKHZpZXcucGFnZSgpLT5hY3Rp b24oUVdlYlBhZ2U6OkNvcHkpKTsKKyAgICBRVkVSSUZZKGluZGV4ICE9IC0xKTsKKworICAgIGRl bGV0ZSBjb250ZXh0TWVudTsKK30KIFFURVNUX01BSU4odHN0X1FXZWJQYWdlKQogI2luY2x1ZGUg InRzdF9xd2VicGFnZS5tb2MiCg== 81203 2011-02-04 02:51:30 -0800 2011-02-04 11:26:30 -0800 Patch for review with changelogs copy_patch text/plain 3492 aparna.nand ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCBlODBhYWM1Li5jMjQxMDJhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0zMjc3LDYgKzMyNzcsMTYgQEAgdm9pZCBRV2ViUGFn ZTo6dXBkYXRlUG9zaXRpb25EZXBlbmRlbnRBY3Rpb25zKGNvbnN0IFFQb2ludCAmcG9zKQogCiAg ICAgLy8gVGhlbiB3ZSBsZXQgY3JlYXRlQ29udGV4dE1lbnUoKSBlbmFibGUgdGhlIGFjdGlvbnMg dGhhdCBhcmUgcHV0IGludG8gdGhlIG1lbnUKICAgICBkLT5jdXJyZW50Q29udGV4dE1lbnUgPSBk LT5jcmVhdGVDb250ZXh0TWVudShkLT5wYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS0+Y29u dGV4dE1lbnUoKSwgZC0+cGFnZS0+Y29udGV4dE1lbnVDb250cm9sbGVyKCktPmNvbnRleHRNZW51 KCktPnBsYXRmb3JtRGVzY3JpcHRpb24oKSwgJnZpc2l0ZWRXZWJBY3Rpb25zKTsKKworICAgIC8v IEJ5IGRlZmF1bHQgY29weSBpcyBkaXNhYmxlZCBpZiB0aGUgc2VsZWN0aW9uIGlzIGEgdXJsLiBU byBlbmFibGUgaXQKKyAgICAvLyBnZXQgdGhlIHBvc2l0aW9uIG9mICdDb3B5IExpbmsnIGFuZCBp bnNlcnQgY29weSBpbiB0aGUgc2FtZSBwb3NpdGlvbgorICAgIC8vIFNvIGNvcHkgYW5kIGNvcHkg bGluayBtZW51IG9wdGlvbnMgYXJlIGFkamFjZW50IHRvIGVhY2ggb3RoZXIKKyAgICBpZiAoIWQt PmhpdFRlc3RSZXN1bHQubGlua1VybCgpLmlzRW1wdHkoKSAmJiAhc2VsZWN0ZWRUZXh0KCkuaXNF bXB0eSgpKSB7CisgICAgICAgIFFMaXN0PFFBY3Rpb24gKj4gbGlzdCA9IGQtPmN1cnJlbnRDb250 ZXh0TWVudS0+YWN0aW9ucygpOworICAgICAgICAgICAgaW50IGluZGV4ID0gbGlzdC5pbmRleE9m KGFjdGlvbihRV2ViUGFnZTo6Q29weUxpbmtUb0NsaXBib2FyZCkpOyAKKyAgICAgICAgICAgIGlm IChpbmRleCAhPSAtMSkKKyAgICAgICAgICAgICAgICBkLT5jdXJyZW50Q29udGV4dE1lbnUtPmlu c2VydEFjdGlvbihsaXN0LmF0KGluZGV4KSwgYWN0aW9uKFFXZWJQYWdlOjpDb3B5KSk7CisgICAg fQogI2VuZGlmIC8vIFFUX05PX0NPTlRFWFRNRU5VCiAKICNpZm5kZWYgUVRfTk9fQUNUSU9OCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCmluZGV4IDFiNTZkYTkuLmZjY2NiYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDItMDQgIEFwYXJuYSBOYW5keWFsICA8YXBhcm5hLm5hbmRAd2lwcm8u Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZGluZyBjb3B5IG9wdGlvbiB0byBjb250ZXh0IG1lbnUKKworICAgICAgICBbUXRdIC0gQ29udGV4 dCBtZW51IG5lZWRzICJDb3B5IiBhcyB3ZWxsIHdoZW4gdGhlIHNlbGVjdGVkIHRleHQgaXMgYSBs aW5rLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5 ODMKKworICAgICAgICBDb3B5IG9wdGlvbiBpbiBjb250ZXh0IG1lbnUgaXMgZGlzYWJsZWQgaWYg dGhlCisgICAgICAgIHNlbGVjdGlvbiBpcyBhIHVybC4gQWRkaW5nIHRoaXMgb3B0aW9uIHRvIFFX ZWJQYWdlIAorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdl Ojp1cGRhdGVQb3NpdGlvbkRlcGVuZGVudEFjdGlvbnMpOgorICAgICAgICAqIHRlc3RzL3F3ZWJw YWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmNvbnRleHRNZW51 Q29weSk6CisKIDIwMTEtMDItMDEgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkIFF0IGJ1aWxkZml4IGFmdGVyIHI3NzI4Ni4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBi L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCBl YzFmMzM2Li44ZWYxZWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJw YWdlL3RzdF9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwCkBAIC03OCw2ICs3OCw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAg dm9pZCBpbml0VGVzdENhc2UoKTsKICAgICB2b2lkIGNsZWFudXBUZXN0Q2FzZSgpOwogCisgICAg dm9pZCBjb250ZXh0TWVudUNvcHkoKTsKICAgICB2b2lkIGFjY2VwdE5hdmlnYXRpb25SZXF1ZXN0 KCk7CiAgICAgdm9pZCBnZW9sb2NhdGlvblJlcXVlc3RKUygpOwogICAgIHZvaWQgbG9hZEZpbmlz aGVkKCk7CkBAIC0yNzU1LDUgKzI3NTYsMzIgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6Om1hY0NvcHlV bmljb2RlVG9DbGlwYm9hcmQoKQogfQogI2VuZGlmCiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjpjb250 ZXh0TWVudUNvcHkoKQoreworICAgIFFXZWJWaWV3IHZpZXc7CisKKyAgICB2aWV3LnNldEh0bWwo IjxhIGhyZWY9XCJodHRwOi8vd3d3Lmdvb2dsZS5jb21cIj5Zb3UgY2FudCBtaXNzIHRoaXM8L2E+ Iik7CisKKyAgICB2aWV3LnBhZ2UoKS0+dHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6U2VsZWN0QWxs KTsKKyAgICBRVkVSSUZZKCF2aWV3LnBhZ2UoKS0+c2VsZWN0ZWRUZXh0KCkuaXNFbXB0eSgpKTsK KworICAgIFFDb250ZXh0TWVudUV2ZW50IGV2ZW50KFFDb250ZXh0TWVudUV2ZW50OjpNb3VzZSwg UVBvaW50KDcxLCAxNSkpOworICAgIHZpZXcucGFnZSgpLT5zd2FsbG93Q29udGV4dE1lbnVFdmVu dCgmZXZlbnQpOworICAgIHZpZXcucGFnZSgpLT51cGRhdGVQb3NpdGlvbkRlcGVuZGVudEFjdGlv bnMoUVBvaW50KDcxLCAxNSkpOworCisgICAgUU1lbnUqIGNvbnRleHRNZW51ID0gMDsKKyAgICBm b3JlYWNoIChRT2JqZWN0KiBjaGlsZCwgdmlldy5jaGlsZHJlbigpKSB7CisgICAgICAgIGNvbnRl eHRNZW51ID0gcW9iamVjdF9jYXN0PFFNZW51Kj4oY2hpbGQpOworICAgICAgICBpZiAoY29udGV4 dE1lbnUpCisgICAgICAgICAgICBicmVhazsKKyAgICB9CisgICAgUVZFUklGWShjb250ZXh0TWVu dSk7CisgICAgCisgICAgUUxpc3Q8UUFjdGlvbiAqPiBsaXN0ID0gY29udGV4dE1lbnUtPmFjdGlv bnMoKTsKKyAgICBpbnQgaW5kZXggPSBsaXN0LmluZGV4T2Yodmlldy5wYWdlKCktPmFjdGlvbihR V2ViUGFnZTo6Q29weSkpOworICAgIFFWRVJJRlkoaW5kZXggIT0gLTEpOworCisgICAgZGVsZXRl IGNvbnRleHRNZW51OworfQogUVRFU1RfTUFJTih0c3RfUVdlYlBhZ2UpCiAjaW5jbHVkZSAidHN0 X3F3ZWJwYWdlLm1vYyIK 81251 2011-02-04 11:26:30 -0800 2011-02-07 10:47:53 -0800 Patch with corrected code patch_copy_menu text/plain 3721 aparna.nand ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YmY3ZTlkLi45YWQ5MzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDItMDQgIEFwYXJuYSBOYW5keWFsICA8YXBhcm5hLm5hbmRAd2lwcm8uY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcHkgbWVu dSBvcHRpb24gdG8gYmUgc2hvd24gaW4gY29udGV4dCBtZW51CisKKyAgICAgICAgW1F0XSAtIENv bnRleHQgbWVudSBuZWVkcyAiQ29weSIgYXMgd2VsbCB3aGVuIHRoZSBzZWxlY3RlZCB0ZXh0IGlz IGEgbGluay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQwOTgzCisKKyAgICAgICAgQWRkZWQgY29weSBvcHRpb24gZm9yIFF0IHBsYXRmb3JtIGlmIHNl bGVjdGlvbiBpcyBhIAorICAgICAgICBhIGxpbmsuIEFkZGVkIGEgdGVzdCBpbiB0c3RfcXdlYnBh Z2UuY3BwCisgICAgICAgIAorICAgICAgICAqIHBhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUpOgor CiAyMDExLTAyLTAyICBMZXZpIFdlaW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nv bnRleHRNZW51Q29udHJvbGxlci5jcHAKaW5kZXggMDkwOWY3MC4uYzA1M2Y1ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApAQCAtNzA4LDYgKzcw OCwxMCBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUoKQogICAgICAgICAg ICAgICAgIGFwcGVuZEl0ZW0oT3BlbkxpbmtJbk5ld1dpbmRvd0l0ZW0sIG1fY29udGV4dE1lbnUu Z2V0KCkpOwogICAgICAgICAgICAgICAgIGFwcGVuZEl0ZW0oRG93bmxvYWRGaWxlSXRlbSwgbV9j b250ZXh0TWVudS5nZXQoKSk7CiAgICAgICAgICAgICB9CisjaWYgUExBVEZPUk0oUVQpCisgICAg ICAgICAgICBpZiAobV9oaXRUZXN0UmVzdWx0LmlzU2VsZWN0ZWQoKSkgCisgICAgICAgICAgICAg ICAgYXBwZW5kSXRlbShDb3B5SXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CisjZW5kaWYKICAg ICAgICAgICAgIGFwcGVuZEl0ZW0oQ29weUxpbmtJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsK ICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDFiNTZkYTkuLmNiOTk4MzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMDQgIEFwYXJuYSBOYW5keWFsICA8YXBh cm5hLm5hbmRAd2lwcm8uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENvcHkgbWVudSBvcHRpb24gdG8gYmUgc2hvd24gaW4gY29udGV4dCBtZW51 CisKKyAgICAgICAgW1F0XSAtIENvbnRleHQgbWVudSBuZWVkcyAiQ29weSIgYXMgd2VsbCB3aGVu IHRoZSBzZWxlY3RlZCB0ZXh0IGlzIGEgbGluay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTgzCisgICAgCisgICAgICAgIEFkZGVkIGEgdGVzdCBj YXNlIHRvIGNyZWF0ZSBhIGNvbnRleHQgc2Vuc2l0aXZlIG1lbnUuCisgICAgICAgIEEgY2hlY2sg aXMgbWFkZSBpZiBpdCBoYXMgQ29weSBtZW51IGl0ZW0gd2hlbiB1c2VyCisgICAgICAgIHNlbGVj dHMgYSBsaW5rIGFuZCBvcGVucyBjb250ZXh0IG1lbnUgCisKKyAgICAgICAgKiB0ZXN0cy9xd2Vi cGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpjb250ZXh0TWVu dUNvcHkpOgorCiAyMDExLTAyLTAxICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBRdCBidWlsZGZpeCBhZnRlciByNzcyODYuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXgg ZWMxZjMzNi4uOGVmMWViYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vi cGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBh Z2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtNzgsNiArNzgsNyBAQCBwcml2YXRlIHNsb3RzOgogICAg IHZvaWQgaW5pdFRlc3RDYXNlKCk7CiAgICAgdm9pZCBjbGVhbnVwVGVzdENhc2UoKTsKIAorICAg IHZvaWQgY29udGV4dE1lbnVDb3B5KCk7CiAgICAgdm9pZCBhY2NlcHROYXZpZ2F0aW9uUmVxdWVz dCgpOwogICAgIHZvaWQgZ2VvbG9jYXRpb25SZXF1ZXN0SlMoKTsKICAgICB2b2lkIGxvYWRGaW5p c2hlZCgpOwpAQCAtMjc1NSw1ICsyNzU2LDMyIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjptYWNDb3B5 VW5pY29kZVRvQ2xpcGJvYXJkKCkKIH0KICNlbmRpZgogCit2b2lkIHRzdF9RV2ViUGFnZTo6Y29u dGV4dE1lbnVDb3B5KCkKK3sKKyAgICBRV2ViVmlldyB2aWV3OworCisgICAgdmlldy5zZXRIdG1s KCI8YSBocmVmPVwiaHR0cDovL3d3dy5nb29nbGUuY29tXCI+WW91IGNhbnQgbWlzcyB0aGlzPC9h PiIpOworCisgICAgdmlldy5wYWdlKCktPnRyaWdnZXJBY3Rpb24oUVdlYlBhZ2U6OlNlbGVjdEFs bCk7CisgICAgUVZFUklGWSghdmlldy5wYWdlKCktPnNlbGVjdGVkVGV4dCgpLmlzRW1wdHkoKSk7 CisKKyAgICBRQ29udGV4dE1lbnVFdmVudCBldmVudChRQ29udGV4dE1lbnVFdmVudDo6TW91c2Us IFFQb2ludCg3MSwgMTUpKTsKKyAgICB2aWV3LnBhZ2UoKS0+c3dhbGxvd0NvbnRleHRNZW51RXZl bnQoJmV2ZW50KTsKKyAgICB2aWV3LnBhZ2UoKS0+dXBkYXRlUG9zaXRpb25EZXBlbmRlbnRBY3Rp b25zKFFQb2ludCg3MSwgMTUpKTsKKworICAgIFFNZW51KiBjb250ZXh0TWVudSA9IDA7CisgICAg Zm9yZWFjaCAoUU9iamVjdCogY2hpbGQsIHZpZXcuY2hpbGRyZW4oKSkgeworICAgICAgICBjb250 ZXh0TWVudSA9IHFvYmplY3RfY2FzdDxRTWVudSo+KGNoaWxkKTsKKyAgICAgICAgaWYgKGNvbnRl eHRNZW51KQorICAgICAgICAgICAgYnJlYWs7CisgICAgfQorICAgIFFWRVJJRlkoY29udGV4dE1l bnUpOworICAgIAorICAgIFFMaXN0PFFBY3Rpb24gKj4gbGlzdCA9IGNvbnRleHRNZW51LT5hY3Rp b25zKCk7CisgICAgaW50IGluZGV4ID0gbGlzdC5pbmRleE9mKHZpZXcucGFnZSgpLT5hY3Rpb24o UVdlYlBhZ2U6OkNvcHkpKTsKKyAgICBRVkVSSUZZKGluZGV4ICE9IC0xKTsKKworICAgIGRlbGV0 ZSBjb250ZXh0TWVudTsKK30KIFFURVNUX01BSU4odHN0X1FXZWJQYWdlKQogI2luY2x1ZGUgInRz dF9xd2VicGFnZS5tb2MiCg== 81492 2011-02-07 10:47:53 -0800 2011-02-07 22:59:18 -0800 Patch for review patch_40983 text/plain 3616 aparna.nand ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMDE4MDUwLi5iM2M0NDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDItMDcgIEFwYXJuYSBOYW5keWFsICA8YXBhcm5hLm5hbmRAd2lwcm8uY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gLSBD b250ZXh0IG1lbnUgbmVlZHMgIkNvcHkiIGFzIHdlbGwgd2hlbiB0aGUgc2VsZWN0ZWQgdGV4dCBp cyBhIGxpbmsuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MDk4MworCisgICAgICAgIEFkZGVkIGNvcHkgb3B0aW9uIGZvciBRdCBwbGF0Zm9ybSBpZiBz ZWxlY3Rpb24gaXMgYSBsaW5rLiAKKyAgICAgICAgQWRkZWQgYSB0ZXN0IGluIHRzdF9xd2VicGFn ZS5jcHAuIAorCisgICAgICAgICogcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250cm9sbGVyOjpwb3B1bGF0ZSk6CisKIDIwMTEt MDItMDYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl eHRNZW51Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29u dHJvbGxlci5jcHAKaW5kZXggMDkwOWY3MC4uYzA1M2Y1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApAQCAtNzA4LDYgKzcwOCwxMCBAQCB2b2lk IENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUoKQogICAgICAgICAgICAgICAgIGFwcGVu ZEl0ZW0oT3BlbkxpbmtJbk5ld1dpbmRvd0l0ZW0sIG1fY29udGV4dE1lbnUuZ2V0KCkpOwogICAg ICAgICAgICAgICAgIGFwcGVuZEl0ZW0oRG93bmxvYWRGaWxlSXRlbSwgbV9jb250ZXh0TWVudS5n ZXQoKSk7CiAgICAgICAgICAgICB9CisjaWYgUExBVEZPUk0oUVQpCisgICAgICAgICAgICBpZiAo bV9oaXRUZXN0UmVzdWx0LmlzU2VsZWN0ZWQoKSkgCisgICAgICAgICAgICAgICAgYXBwZW5kSXRl bShDb3B5SXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CisjZW5kaWYKICAgICAgICAgICAgIGFw cGVuZEl0ZW0oQ29weUxpbmtJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsKICAgICAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv cXQvQ2hhbmdlTG9nCmluZGV4IDkzYTdjZjguLjA3ZDQ4ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTEtMDItMDcgIEFwYXJuYSBOYW5keWFsICA8YXBhcm5hLm5hbmRAd2lw cm8uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gLSBDb250ZXh0IG1lbnUgbmVlZHMgIkNvcHkiIGFzIHdlbGwgd2hlbiB0aGUgc2VsZWN0 ZWQgdGV4dCBpcyBhIGxpbmsuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MDk4MworICAgIAorICAgICAgICBBZGRlZCBhIHRlc3QgY2FzZSB0byBjcmVh dGUgYSBjb250ZXh0IHNlbnNpdGl2ZSBtZW51LgorICAgICAgICBBIGNoZWNrIGlzIG1hZGUgaWYg aXQgaGFzIENvcHkgbWVudSBpdGVtIHdoZW4gdXNlcgorICAgICAgICBzZWxlY3RzIGEgbGluayBh bmQgb3BlbnMgY29udGV4dCBtZW51LgorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3 ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y29udGV4dE1lbnVDb3B5KToKKwog MjAxMS0wMi0wNiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv dGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCBlYzFmMzM2Li45ZmFlYzRjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCkBAIC03 OCw2ICs3OCw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBpbml0VGVzdENhc2UoKTsKICAg ICB2b2lkIGNsZWFudXBUZXN0Q2FzZSgpOwogCisgICAgdm9pZCBjb250ZXh0TWVudUNvcHkoKTsK ICAgICB2b2lkIGFjY2VwdE5hdmlnYXRpb25SZXF1ZXN0KCk7CiAgICAgdm9pZCBnZW9sb2NhdGlv blJlcXVlc3RKUygpOwogICAgIHZvaWQgbG9hZEZpbmlzaGVkKCk7CkBAIC0yNzU1LDUgKzI3NTYs MjkgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6Om1hY0NvcHlVbmljb2RlVG9DbGlwYm9hcmQoKQogfQog I2VuZGlmCiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjpjb250ZXh0TWVudUNvcHkoKQoreworICAgIFFX ZWJWaWV3IHZpZXc7CisKKyAgICB2aWV3LnNldEh0bWwoIjxhIGhyZWY9XCJodHRwOi8vd3d3Lmdv b2dsZS5jb21cIj5Zb3UgY2FudCBtaXNzIHRoaXM8L2E+Iik7CisKKyAgICB2aWV3LnBhZ2UoKS0+ dHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6U2VsZWN0QWxsKTsKKyAgICBRVkVSSUZZKCF2aWV3LnBh Z2UoKS0+c2VsZWN0ZWRUZXh0KCkuaXNFbXB0eSgpKTsKKworICAgIFFXZWJFbGVtZW50IGxpbmsg PSB2aWV3LnBhZ2UoKS0+bWFpbkZyYW1lKCktPmZpbmRGaXJzdEVsZW1lbnQoImEiKTsKKyAgICBR UG9pbnQgcG9zKGxpbmsuZ2VvbWV0cnkoKS5jZW50ZXIoKSk7CisgICAgUUNvbnRleHRNZW51RXZl bnQgZXZlbnQoUUNvbnRleHRNZW51RXZlbnQ6Ok1vdXNlLCBwb3MpOworICAgIHZpZXcucGFnZSgp LT5zd2FsbG93Q29udGV4dE1lbnVFdmVudCgmZXZlbnQpOworICAgIHZpZXcucGFnZSgpLT51cGRh dGVQb3NpdGlvbkRlcGVuZGVudEFjdGlvbnMocG9zKTsKKworICAgIFFMaXN0PFFNZW51Kj4gY29u dGV4dE1lbnVzID0gdmlldy5maW5kQ2hpbGRyZW48UU1lbnUqPigpOworICAgIFFWRVJJRlkoIWNv bnRleHRNZW51cy5pc0VtcHR5KCkpOworICAgIFFNZW51KiBjb250ZXh0TWVudSA9IGNvbnRleHRN ZW51cy5maXJzdCgpOworICAgIFFWRVJJRlkoY29udGV4dE1lbnUpOworICAgIAorICAgIFFMaXN0 PFFBY3Rpb24gKj4gbGlzdCA9IGNvbnRleHRNZW51LT5hY3Rpb25zKCk7CisgICAgaW50IGluZGV4 ID0gbGlzdC5pbmRleE9mKHZpZXcucGFnZSgpLT5hY3Rpb24oUVdlYlBhZ2U6OkNvcHkpKTsKKyAg ICBRVkVSSUZZKGluZGV4ICE9IC0xKTsKK30KIFFURVNUX01BSU4odHN0X1FXZWJQYWdlKQogI2lu Y2x1ZGUgInRzdF9xd2VicGFnZS5tb2MiCg==