33887 2010-01-20 01:39:19 -0800 [Qt] QGraphicsWebView shows combo box popups in the wrong position 2011-10-21 09:04:16 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 33418 1 girish girish commit-queue hausmann kenneth luiz zanga.mail oldest_to_newest 182666 0 girish 2010-01-20 01:39:19 -0800 The popup position is incorrect and works only when the QGraphicsWebView's coordinates matches exactly with the QGraphicsView coordinates. In addition, more complex cases like transformation of the QGraphicsWebView does not work. Tested with Qt 4.6.1. 182667 1 girish 2010-01-20 01:41:15 -0800 Test case: #include <QtGui> #include <QtWebKit> int main(int argc, char **argv) { QApplication app(argc, argv); QGraphicsScene *scene = new QGraphicsScene; QGraphicsWebView *webView = new QGraphicsWebView; webView->load(QUrl("http://www.tizag.com/htmlT/htmlselect.php")); scene->addItem(webView); QGraphicsView *view = new QGraphicsView; view->setScene(scene); view->show(); return app.exec(); } 182728 2 47006 girish 2010-01-20 03:51:17 -0800 Created attachment 47006 Patch against 4.6.1 182731 3 47007 girish 2010-01-20 03:57:20 -0800 Created attachment 47007 Patch against 4.6.1 (clean up PopupMenu::~PopupMenu) Clean up as suggested by Simon. 182747 4 girish 2010-01-20 04:56:06 -0800 Luiz Agostini is working on the same part of the code and my commit will probably break his ongoing work. So, I am waiting for him to finish his patch series, before I commit this one. The patch attached will not apply against webkit-trunk, it's 4.6.x only. 183173 5 hausmann 2010-01-21 05:46:24 -0800 (In reply to comment #3) > Created an attachment (id=47007) [details] > Patch against 4.6.1 (clean up PopupMenu::~PopupMenu) > > Clean up as suggested by Simon. Cherry-picked into qtwebkit-4.6 as commit 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 183594 6 47188 girish 2010-01-22 04:21:09 -0800 Created attachment 47188 Make the proxy widget a child of the QGraphicsWebView 183984 7 47271 girish 2010-01-23 06:31:52 -0800 Created attachment 47271 Patch against webkit-trubk Note on the destructor part: In the case of QGraphicsWebView, the proxy is gets already deleted by the time it hits the QtFallbackPopup destructor. I am unable to create a debug build of Qt (it say out of memory!). But with qDebug() I have verified that there is no leak and m_proxy indeed gets deleted (I made it a QPointer and it printed out as 0 in the QtFallbackPopup destructor). We probably need the above check for the patches against 4.6.1 too. (But from what I saw QtFallbackPopup destructor was _never_ called in the 4.6.x WebKit). 183991 8 47271 kenneth 2010-01-23 08:11:34 -0800 Comment on attachment 47271 Patch against webkit-trubk LGTM 183994 9 47271 commit-queue 2010-01-23 08:37:49 -0800 Comment on attachment 47271 Patch against webkit-trubk Clearing flags on attachment: 47271 Committed r53769: <http://trac.webkit.org/changeset/53769> 183995 10 commit-queue 2010-01-23 08:37:55 -0800 All reviewed patches have been landed. Closing bug. 184258 11 hausmann 2010-01-25 05:51:54 -0800 (In reply to comment #6) > Created an attachment (id=47188) [details] > Make the proxy widget a child of the QGraphicsWebView Cherry-picked into qtwebkit-4.6 with commit f2e94404e9b723442aa2d4eae5399014d763fb6d 488420 12 zanga.mail 2011-10-21 09:04:16 -0700 This still happens to me from time to time with Qt 4.7.4 on ArchLinux 64 bit. Offending page: <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>FreeADSP</title> <link rel="icon" href="icon.png" type="image/png" /> <link rel="stylesheet" type="text/css" href="main.css" /> <script type="text/javascript"> function adjustPluginHeight() { var plugin = document.getElementById('plugin'); var statusbar = document.getElementById('statusbar'); plugin.style.marginBottom = (statusbar.offsetHeight + 2) + 'px'; } </script> </head> <body onload="adjustPluginHeight();"> <div id="toolbar"> <table> <tr> <td><button><div class="nowrap">Load plugin</div></button></td> <td><button>Mute</button></td> <td><button>Bypass</button></td> <td><div class="nowrap">Bank: <select><option>1</option><option>2</option><option>3</option><option>4</option><option>5</option></select></div></td> <td><div class="nowrap">Program: <select><option>1</option><option>2</option><option>3</option></select></div></td> </tr> </table> </div> <div id="plugin"> No plugin loaded </div> <div id="statusbar"> status </div> </body> </html> (It happens also with no style sheet, just click several times on one of the two selects and from time to time the misplacement happens). 47006 2010-01-20 03:51:17 -0800 2010-01-20 03:57:20 -0800 Patch against 4.6.1 4.6.1_patch text/plain 3740 girish Y29tbWl0IDVjMTY1ODBjNzQwNzM4NjlkZjNiYTExMjE4YTIyZTdjYjY4MTU2MDAKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgV2VkIEph biAyMCAxNzowMzoyMiAyMDEwICswNTMwCgogICAgRml4IHBvc2l0aW9uaW5nIG9mIENvbWJvQm94 IHBvcHVwIGluIFFHcmFwaGljc1dlYlZpZXcuCiAgICAKICAgIFdyYXAgdGhlIHBvcHVwIGluIGEg UUdyYXBoaWNzUHJveHlXaWRnZXQsIHNvIHRoYXQgdGhlCiAgICBwb3B1cCB0cmFuc2Zvcm1zIHdp dGggdGhlIGl0ZW0uCiAgICAKICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zMzg4NwoKZGlmZiAtLWdpdCBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0 Zm9ybS9Qb3B1cE1lbnUuaCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0Zm9ybS9Q b3B1cE1lbnUuaAppbmRleCAyMzE1ZjAyLi5mMmZmZmI1IDEwMDY0NAotLS0gYS9zcmMvM3JkcGFy dHkvd2Via2l0L1dlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51LmgKKysrIGIvc3JjLzNyZHBhcnR5 L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudS5oCkBAIC00NCw2ICs0NCw3IEBAIHR5 cGVkZWYgc3RydWN0IEhCSVRNQVBfXyogSEJJVE1BUDsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICBjbGFzcyBRV2ViUG9wdXA7CiB9CitjbGFzcyBRR3JhcGhpY3NQcm94eVdpZGdldDsKICNlbGlm IFBMQVRGT1JNKEdUSykKIHR5cGVkZWYgc3RydWN0IF9HdGtNZW51IEd0a01lbnU7CiB0eXBlZGVm IHN0cnVjdCBfR3RrTWVudUl0ZW0gR3RrTWVudUl0ZW07CkBAIC0xNDcsNiArMTQ4LDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIGNsZWFyKCk7CiAgICAgdm9pZCBwb3B1bGF0ZShjb25zdCBJbnRSZWN0 Jik7CiAgICAgUVdlYlBvcHVwKiBtX3BvcHVwOworICAgIFFHcmFwaGljc1Byb3h5V2lkZ2V0KiBt X3Byb3h5OwogI2VsaWYgUExBVEZPUk0oV0lOKQogICAgIC8vIFNjcm9sbEJhckNsaWVudAogICAg IHZpcnR1YWwgdm9pZCB2YWx1ZUNoYW5nZWQoU2Nyb2xsYmFyKik7CmRpZmYgLS1naXQgYS9zcmMv M3JkcGFydHkvd2Via2l0L1dlYkNvcmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwIGIvc3Jj LzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1BvcHVwTWVudVF0LmNwcAppbmRl eCBmNmVjNGY3Li5jMzAzZjRlIDEwMDY0NAotLS0gYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNv cmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwCisrKyBiL3NyYy8zcmRwYXJ0eS93ZWJraXQv V2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKQEAgLTEsNiArMSw3IEBACiAvKgog ICogVGhpcyBmaWxlIGlzIHBhcnQgb2YgdGhlIHBvcHVwIG1lbnUgaW1wbGVtZW50YXRpb24gZm9y IDxzZWxlY3Q+IGVsZW1lbnRzIGluIFdlYkNvcmUuCiAgKgorICogQ29weXJpZ2h0IChDKSAyMDA5 IEdpcmlzaCBSYW1ha3Jpc2huYW4gPGdpcmlzaEBmb3J3YXJkYmlhcy5pbj4KICAqIENvcHlyaWdo dCAoQykgMjAwOCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykK ICAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBDb21wdXRlciwgSW5jLgogICogQ29weXJpZ2h0 IChDKSAyMDA2IE1pY2hhZWwgRW1tZWwgbWlrZS5lbW1lbEBnbWFpbC5jb20gCkBAIC0zNSw2ICsz Niw5IEBACiAKICNpbmNsdWRlIDxRQWN0aW9uPgogI2luY2x1ZGUgPFFEZWJ1Zz4KKyNpbmNsdWRl IDxRR3JhcGhpY3NQcm94eVdpZGdldD4KKyNpbmNsdWRlIDxRR3JhcGhpY3NTY2VuZT4KKyNpbmNs dWRlIDxRR3JhcGhpY3NWaWV3PgogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0PgogI2luY2x1ZGUgPFFM aXN0V2lkZ2V0SXRlbT4KICNpbmNsdWRlIDxRTWVudT4KQEAgLTQ2LDEzICs1MCwxNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIFBvcHVwTWVudTo6UG9wdXBNZW51KFBvcHVwTWVudUNsaWVudCog Y2xpZW50KQogICAgIDogbV9wb3B1cENsaWVudChjbGllbnQpCisgICAgLCBtX3Byb3h5KDApCiB7 CiAgICAgbV9wb3B1cCA9IG5ldyBRV2ViUG9wdXAoY2xpZW50KTsKIH0KIAogUG9wdXBNZW51Ojp+ UG9wdXBNZW51KCkKIHsKLSAgICBkZWxldGUgbV9wb3B1cDsKKyAgICBpZiAobV9wcm94eSkKKyAg ICAgICAgZGVsZXRlIG1fcHJveHk7IC8vIHRoaXMgd2lsbCBhbHNvIGRlbGV0ZSB0aGUgbV9wb3B1 cAorICAgIGVsc2UKKyAgICAgICAgZGVsZXRlIG1fcG9wdXA7CiB9CiAKIHZvaWQgUG9wdXBNZW51 OjpjbGVhcigpCkBAIC05Miw4ICsxMDAsMTkgQEAgdm9pZCBQb3B1cE1lbnU6OnNob3coY29uc3Qg SW50UmVjdCYgciwgRnJhbWVWaWV3KiB2LCBpbnQgaW5kZXgpCiAgICAgcmVjdC5tb3ZlVG9wTGVm dCh2LT5jb250ZW50c1RvV2luZG93KHIudG9wTGVmdCgpKSk7CiAgICAgcmVjdC5zZXRIZWlnaHQo bV9wb3B1cC0+c2l6ZUhpbnQoKS5oZWlnaHQoKSk7CiAKLSAgICBtX3BvcHVwLT5zZXRQYXJlbnQo Y2xpZW50LT5vd25lcldpZGdldCgpKTsKLSAgICBtX3BvcHVwLT5zZXRHZW9tZXRyeShyZWN0KTsK KyAgICBpZiAoUUdyYXBoaWNzVmlldyogdmlldyA9IHFvYmplY3RfY2FzdDxRR3JhcGhpY3NWaWV3 Kj4oY2xpZW50LT5vd25lcldpZGdldCgpKSkgeworICAgICAgICBpZiAoIW1fcHJveHkpIHsKKyAg ICAgICAgICAgIG1fcHJveHkgPSBuZXcgUUdyYXBoaWNzUHJveHlXaWRnZXQ7CisgICAgICAgICAg ICBtX3Byb3h5LT5zZXRXaWRnZXQobV9wb3B1cCk7CisgICAgICAgICAgICB2aWV3LT5zY2VuZSgp LT5hZGRJdGVtKG1fcHJveHkpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIG1fcHJveHkt PnNldFZpc2libGUodHJ1ZSk7CisgICAgICAgIG1fcHJveHktPnNldEdlb21ldHJ5KHJlY3QpOwor ICAgIH0gZWxzZSB7CisgICAgICAgIG1fcG9wdXAtPnNldFBhcmVudChjbGllbnQtPm93bmVyV2lk Z2V0KCkpOworICAgICAgICBtX3BvcHVwLT5zZXRHZW9tZXRyeShyZWN0KTsKKyAgICB9CisKICAg ICBtX3BvcHVwLT5zZXRDdXJyZW50SW5kZXgoaW5kZXgpOwogICAgIG1fcG9wdXAtPmV4ZWMoKTsK IH0KZGlmZiAtLWdpdCBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0Zm9ybS9xdC9R V2ViUG9wdXAuY3BwIGIvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1FX ZWJQb3B1cC5jcHAKaW5kZXggZDA3NzA3OS4uZjdlYmJjNyAxMDA2NDQKLS0tIGEvc3JjLzNyZHBh cnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQb3B1cC5jcHAKKysrIGIvc3JjLzNy ZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQb3B1cC5jcHAKQEAgLTI2LDYg KzI2LDcgQEAKICNpbmNsdWRlIDxRQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UUlucHV0Q29udGV4 dD4KICNpbmNsdWRlIDxRTW91c2VFdmVudD4KKyNpbmNsdWRlIDxRR3JhcGhpY3NQcm94eVdpZGdl dD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02Nyw2ICs2OCwxMCBAQCB2b2lkIFFXZWJQ b3B1cDo6aGlkZVBvcHVwKCkKICAgICB9CiAKICAgICBRQ29tYm9Cb3g6OmhpZGVQb3B1cCgpOwor ICAgIAorICAgIGlmIChRR3JhcGhpY3NQcm94eVdpZGdldCogcHJveHkgPSBncmFwaGljc1Byb3h5 V2lkZ2V0KCkpCisgICAgICAgIHByb3h5LT5zZXRWaXNpYmxlKGZhbHNlKTsKKwogICAgIGlmICgh bV9wb3B1cFZpc2libGUpCiAgICAgICAgIHJldHVybjsKIAo= 47007 2010-01-20 03:57:20 -0800 2010-01-20 03:57:20 -0800 Patch against 4.6.1 (clean up PopupMenu::~PopupMenu) 4.6.1_patch2 text/plain 3705 girish Y29tbWl0IDliZDAxZWZmOGU3MDIxMzFlODYxN2UzYjcxNGZiZjkyYTc1MDEyY2MKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgV2VkIEph biAyMCAxNzowMzoyMiAyMDEwICswNTMwCgogICAgRml4IHBvc2l0aW9uaW5nIG9mIENvbWJvQm94 IHBvcHVwIGluIFFHcmFwaGljc1dlYlZpZXcuCiAgICAKICAgIFdyYXAgdGhlIHBvcHVwIGluIGEg UUdyYXBoaWNzUHJveHlXaWRnZXQsIHNvIHRoYXQgdGhlCiAgICBwb3B1cCB0cmFuc2Zvcm1zIHdp dGggdGhlIGl0ZW0uCiAgICAKICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zMzg4NwoKZGlmZiAtLWdpdCBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0 Zm9ybS9Qb3B1cE1lbnUuaCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0Zm9ybS9Q b3B1cE1lbnUuaAppbmRleCAyMzE1ZjAyLi5mMmZmZmI1IDEwMDY0NAotLS0gYS9zcmMvM3JkcGFy dHkvd2Via2l0L1dlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51LmgKKysrIGIvc3JjLzNyZHBhcnR5 L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudS5oCkBAIC00NCw2ICs0NCw3IEBAIHR5 cGVkZWYgc3RydWN0IEhCSVRNQVBfXyogSEJJVE1BUDsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICBjbGFzcyBRV2ViUG9wdXA7CiB9CitjbGFzcyBRR3JhcGhpY3NQcm94eVdpZGdldDsKICNlbGlm IFBMQVRGT1JNKEdUSykKIHR5cGVkZWYgc3RydWN0IF9HdGtNZW51IEd0a01lbnU7CiB0eXBlZGVm IHN0cnVjdCBfR3RrTWVudUl0ZW0gR3RrTWVudUl0ZW07CkBAIC0xNDcsNiArMTQ4LDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIGNsZWFyKCk7CiAgICAgdm9pZCBwb3B1bGF0ZShjb25zdCBJbnRSZWN0 Jik7CiAgICAgUVdlYlBvcHVwKiBtX3BvcHVwOworICAgIFFHcmFwaGljc1Byb3h5V2lkZ2V0KiBt X3Byb3h5OwogI2VsaWYgUExBVEZPUk0oV0lOKQogICAgIC8vIFNjcm9sbEJhckNsaWVudAogICAg IHZpcnR1YWwgdm9pZCB2YWx1ZUNoYW5nZWQoU2Nyb2xsYmFyKik7CmRpZmYgLS1naXQgYS9zcmMv M3JkcGFydHkvd2Via2l0L1dlYkNvcmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwIGIvc3Jj LzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1BvcHVwTWVudVF0LmNwcAppbmRl eCBmNmVjNGY3Li45ODliMzRjIDEwMDY0NAotLS0gYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNv cmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwCisrKyBiL3NyYy8zcmRwYXJ0eS93ZWJraXQv V2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKQEAgLTEsNiArMSw3IEBACiAvKgog ICogVGhpcyBmaWxlIGlzIHBhcnQgb2YgdGhlIHBvcHVwIG1lbnUgaW1wbGVtZW50YXRpb24gZm9y IDxzZWxlY3Q+IGVsZW1lbnRzIGluIFdlYkNvcmUuCiAgKgorICogQ29weXJpZ2h0IChDKSAyMDA5 IEdpcmlzaCBSYW1ha3Jpc2huYW4gPGdpcmlzaEBmb3J3YXJkYmlhcy5pbj4KICAqIENvcHlyaWdo dCAoQykgMjAwOCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykK ICAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBDb21wdXRlciwgSW5jLgogICogQ29weXJpZ2h0 IChDKSAyMDA2IE1pY2hhZWwgRW1tZWwgbWlrZS5lbW1lbEBnbWFpbC5jb20gCkBAIC0zNSw2ICsz Niw5IEBACiAKICNpbmNsdWRlIDxRQWN0aW9uPgogI2luY2x1ZGUgPFFEZWJ1Zz4KKyNpbmNsdWRl IDxRR3JhcGhpY3NQcm94eVdpZGdldD4KKyNpbmNsdWRlIDxRR3JhcGhpY3NTY2VuZT4KKyNpbmNs dWRlIDxRR3JhcGhpY3NWaWV3PgogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0PgogI2luY2x1ZGUgPFFM aXN0V2lkZ2V0SXRlbT4KICNpbmNsdWRlIDxRTWVudT4KQEAgLTQ2LDYgKzUwLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiBQb3B1cE1lbnU6OlBvcHVwTWVudShQb3B1cE1lbnVDbGllbnQqIGNs aWVudCkKICAgICA6IG1fcG9wdXBDbGllbnQoY2xpZW50KQorICAgICwgbV9wcm94eSgwKQogewog ICAgIG1fcG9wdXAgPSBuZXcgUVdlYlBvcHVwKGNsaWVudCk7CiB9CkBAIC01Myw2ICs1OCw3IEBA IFBvcHVwTWVudTo6UG9wdXBNZW51KFBvcHVwTWVudUNsaWVudCogY2xpZW50KQogUG9wdXBNZW51 Ojp+UG9wdXBNZW51KCkKIHsKICAgICBkZWxldGUgbV9wb3B1cDsKKyAgICBkZWxldGUgbV9wcm94 eTsKIH0KIAogdm9pZCBQb3B1cE1lbnU6OmNsZWFyKCkKQEAgLTkyLDggKzk4LDE5IEBAIHZvaWQg UG9wdXBNZW51OjpzaG93KGNvbnN0IEludFJlY3QmIHIsIEZyYW1lVmlldyogdiwgaW50IGluZGV4 KQogICAgIHJlY3QubW92ZVRvcExlZnQodi0+Y29udGVudHNUb1dpbmRvdyhyLnRvcExlZnQoKSkp OwogICAgIHJlY3Quc2V0SGVpZ2h0KG1fcG9wdXAtPnNpemVIaW50KCkuaGVpZ2h0KCkpOwogCi0g ICAgbV9wb3B1cC0+c2V0UGFyZW50KGNsaWVudC0+b3duZXJXaWRnZXQoKSk7Ci0gICAgbV9wb3B1 cC0+c2V0R2VvbWV0cnkocmVjdCk7CisgICAgaWYgKFFHcmFwaGljc1ZpZXcqIHZpZXcgPSBxb2Jq ZWN0X2Nhc3Q8UUdyYXBoaWNzVmlldyo+KGNsaWVudC0+b3duZXJXaWRnZXQoKSkpIHsKKyAgICAg ICAgaWYgKCFtX3Byb3h5KSB7CisgICAgICAgICAgICBtX3Byb3h5ID0gbmV3IFFHcmFwaGljc1By b3h5V2lkZ2V0OworICAgICAgICAgICAgbV9wcm94eS0+c2V0V2lkZ2V0KG1fcG9wdXApOworICAg ICAgICAgICAgdmlldy0+c2NlbmUoKS0+YWRkSXRlbShtX3Byb3h5KTsKKyAgICAgICAgfSBlbHNl CisgICAgICAgICAgICBtX3Byb3h5LT5zZXRWaXNpYmxlKHRydWUpOworICAgICAgICBtX3Byb3h5 LT5zZXRHZW9tZXRyeShyZWN0KTsKKyAgICB9IGVsc2UgeworICAgICAgICBtX3BvcHVwLT5zZXRQ YXJlbnQoY2xpZW50LT5vd25lcldpZGdldCgpKTsKKyAgICAgICAgbV9wb3B1cC0+c2V0R2VvbWV0 cnkocmVjdCk7CisgICAgfQorCiAgICAgbV9wb3B1cC0+c2V0Q3VycmVudEluZGV4KGluZGV4KTsK ICAgICBtX3BvcHVwLT5leGVjKCk7CiB9CmRpZmYgLS1naXQgYS9zcmMvM3JkcGFydHkvd2Via2l0 L1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBvcHVwLmNwcCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQv V2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUG9wdXAuY3BwCmluZGV4IGQwNzcwNzkuLmY3ZWJiYzcg MTAwNjQ0Ci0tLSBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2Vi UG9wdXAuY3BwCisrKyBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0Zm9ybS9xdC9R V2ViUG9wdXAuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSA8UUFwcGxpY2F0aW9uPgog I2luY2x1ZGUgPFFJbnB1dENvbnRleHQ+CiAjaW5jbHVkZSA8UU1vdXNlRXZlbnQ+CisjaW5jbHVk ZSA8UUdyYXBoaWNzUHJveHlXaWRnZXQ+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNjcs NiArNjgsMTAgQEAgdm9pZCBRV2ViUG9wdXA6OmhpZGVQb3B1cCgpCiAgICAgfQogCiAgICAgUUNv bWJvQm94OjpoaWRlUG9wdXAoKTsKKyAgICAKKyAgICBpZiAoUUdyYXBoaWNzUHJveHlXaWRnZXQq IHByb3h5ID0gZ3JhcGhpY3NQcm94eVdpZGdldCgpKQorICAgICAgICBwcm94eS0+c2V0VmlzaWJs ZShmYWxzZSk7CisKICAgICBpZiAoIW1fcG9wdXBWaXNpYmxlKQogICAgICAgICByZXR1cm47CiAK 47188 2010-01-22 04:21:09 -0800 2010-01-22 04:21:09 -0800 Make the proxy widget a child of the QGraphicsWebView child text/plain 1352 girish Y29tbWl0IGIyYzM3MGQ3ZDBmOWRiYzAzYmZlMDNkYWJhZTE3YjNlNjVkMTllMTAKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgRnJpIEph biAyMiAxNzo0Nzo0MiAyMDEwICswNTMwCgogICAgTWFrZSB0aGUgcHJveHkgd2lkZ2V0IGEgY2hp bGQgb2YgdGhlIFFHcmFwaGljc1dlYlZpZXcuCiAgICAKICAgIEN1cnJlbnRseSwgdGhlIHBvcHVw IGRvZXMgbm90IHRyYW5zZm9ybSBhbG9uZyB3aXRoIHRoZSBRR3JhcGhpY3NXZWJWaWV3LAogICAg c2luY2UgaXQgaXMgbm90IGEgY2hpbGQgb2YgdGhlIFFHcmFwaGljc1dlYlZpZXcuCgpkaWZmIC0t Z2l0IGEvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1BvcHVwTWVudVF0 LmNwcCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVR dC5jcHAKaW5kZXggOTg5YjM0Yy4uMWJkNTk3NiAxMDA2NDQKLS0tIGEvc3JjLzNyZHBhcnR5L3dl YmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1BvcHVwTWVudVF0LmNwcAorKysgYi9zcmMvM3JkcGFy dHkvd2Via2l0L1dlYkNvcmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwCkBAIC0zOSw2ICsz OSw3IEBACiAjaW5jbHVkZSA8UUdyYXBoaWNzUHJveHlXaWRnZXQ+CiAjaW5jbHVkZSA8UUdyYXBo aWNzU2NlbmU+CiAjaW5jbHVkZSA8UUdyYXBoaWNzVmlldz4KKyNpbmNsdWRlIDxRR3JhcGhpY3NX ZWJWaWV3PgogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0PgogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0SXRl bT4KICNpbmNsdWRlIDxRTWVudT4KQEAgLTEwMCw5ICsxMDEsOCBAQCB2b2lkIFBvcHVwTWVudTo6 c2hvdyhjb25zdCBJbnRSZWN0JiByLCBGcmFtZVZpZXcqIHYsIGludCBpbmRleCkKIAogICAgIGlm IChRR3JhcGhpY3NWaWV3KiB2aWV3ID0gcW9iamVjdF9jYXN0PFFHcmFwaGljc1ZpZXcqPihjbGll bnQtPm93bmVyV2lkZ2V0KCkpKSB7CiAgICAgICAgIGlmICghbV9wcm94eSkgewotICAgICAgICAg ICAgbV9wcm94eSA9IG5ldyBRR3JhcGhpY3NQcm94eVdpZGdldDsKKyAgICAgICAgICAgIG1fcHJv eHkgPSBuZXcgUUdyYXBoaWNzUHJveHlXaWRnZXQocW9iamVjdF9jYXN0PFFHcmFwaGljc1dlYlZp ZXcqPihjbGllbnQtPnBsdWdpblBhcmVudCgpKSk7CiAgICAgICAgICAgICBtX3Byb3h5LT5zZXRX aWRnZXQobV9wb3B1cCk7Ci0gICAgICAgICAgICB2aWV3LT5zY2VuZSgpLT5hZGRJdGVtKG1fcHJv eHkpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG1fcHJveHktPnNldFZpc2libGUodHJ1 ZSk7CiAgICAgICAgIG1fcHJveHktPnNldEdlb21ldHJ5KHJlY3QpOwo= 47271 2010-01-23 06:31:52 -0800 2010-01-23 08:37:49 -0800 Patch against webkit-trubk trunk-patch text/plain 4546 girish Y29tbWl0IDRjNzZlNWU5NGI0NzNlNmE4MmM1MTIyYzA1OTVhM2VhYTZkZWI4M2MKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgRnJpIEph biAyMiAxODozMToxMSAyMDEwICswNTMwCgogICAgW1F0XSBGaXggcG9zaXRpb25pbmcgb2YgQ29t Ym9Cb3ggcG9wdXAgaW4gUUdyYXBoaWNzV2ViVmlldy4KICAgIAogICAgV3JhcCB0aGUgcG9wdXAg aW4gYSBRR3JhcGhpY3NQcm94eVdpZGdldCwgc28gdGhhdCB0aGUgcG9wdXAKICAgIHRyYW5zZm9y bXMgd2l0aCB0aGUgaXRlbS4KICAgIAogICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMzODg3CgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktp dC9xdC9DaGFuZ2VMb2cKaW5kZXggODkyMDBmYy4uMjIxODRlNyAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMDEtMjMgIEdpcmlzaCBSYW1ha3Jpc2huYW4gIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBG aXggcG9zaXRpb25pbmcgb2YgQ29tYm9Cb3ggcG9wdXAgaW4gUUdyYXBoaWNzV2ViVmlldy4KKyAg ICAgICAgCisgICAgICAgIFdyYXAgdGhlIHBvcHVwIGluIGEgUUdyYXBoaWNzUHJveHlXaWRnZXQs IHNvIHRoYXQgdGhlIHBvcHVwCisgICAgICAgIHRyYW5zZm9ybXMgd2l0aCB0aGUgaXRlbS4KKyAg ICAgICAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z Mzg4NworCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlF0RmFsbGJhY2tXZWJQb3B1cENvbWJvOjpoaWRlUG9wdXApOgor ICAgICAgICAoV2ViQ29yZTo6UXRGYWxsYmFja1dlYlBvcHVwOjpRdEZhbGxiYWNrV2ViUG9wdXAp OgorICAgICAgICAoV2ViQ29yZTo6UXRGYWxsYmFja1dlYlBvcHVwOjp+UXRGYWxsYmFja1dlYlBv cHVwKToKKyAgICAgICAgKFdlYkNvcmU6OlF0RmFsbGJhY2tXZWJQb3B1cDo6c2hvdyk6CisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmg6CisKIDIwMTAtMDEtMjIg IFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgogCiAgICAgICAgIE5vdCByZXZp ZXdlZCwgYmFja291dC4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZh bGxiYWNrV2ViUG9wdXAuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tX ZWJQb3B1cC5jcHAKaW5kZXggMWVkYmNlMy4uNTVhYjY3MSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAKKysrIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAKQEAgLTEsNCArMSw1IEBACiAvKgor ICogQ29weXJpZ2h0IChDKSAyMDEwIEdpcmlzaCBSYW1ha3Jpc2huYW4gPGdpcmlzaEBmb3J3YXJk Ymlhcy5pbj4KICAqIENvcHlyaWdodCAoQykgMjAwOSBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3Ig aXRzIHN1YnNpZGlhcnkoLWllcykKICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCkBAIC0yMiw5ICsyMywxMyBAQAogCiAj aW5jbHVkZSAiSG9zdFdpbmRvdy5oIgogI2luY2x1ZGUgIlBvcHVwTWVudUNsaWVudC5oIgorI2lu Y2x1ZGUgInFncmFwaGljc3dlYnZpZXcuaCIKICNpbmNsdWRlICJRV2ViUGFnZUNsaWVudC5oIgog I2luY2x1ZGUgPFFBYnN0cmFjdEl0ZW1WaWV3PgogI2luY2x1ZGUgPFFBcHBsaWNhdGlvbj4KKyNp bmNsdWRlIDxRR3JhcGhpY3NQcm94eVdpZGdldD4KKyNpbmNsdWRlIDxRR3JhcGhpY3NTY2VuZT4K KyNpbmNsdWRlIDxRR3JhcGhpY3NWaWV3PgogI2luY2x1ZGUgPFFJbnB1dENvbnRleHQ+CiAjaW5j bHVkZSA8UU1vdXNlRXZlbnQ+CiAjaW5jbHVkZSA8UVN0YW5kYXJkSXRlbU1vZGVsPgpAQCAtNTUs NiArNjAsMTAgQEAgdm9pZCBRdEZhbGxiYWNrV2ViUG9wdXBDb21ibzo6aGlkZVBvcHVwKCkKICAg ICB9CiAKICAgICBRQ29tYm9Cb3g6OmhpZGVQb3B1cCgpOworCisgICAgaWYgKFFHcmFwaGljc1By b3h5V2lkZ2V0KiBwcm94eSA9IGdyYXBoaWNzUHJveHlXaWRnZXQoKSkKKyAgICAgICAgcHJveHkt PnNldFZpc2libGUoZmFsc2UpOworCiAgICAgaWYgKCFtX293bmVyUG9wdXAubV9wb3B1cFZpc2li bGUpCiAgICAgICAgIHJldHVybjsKIApAQCAtNjgsNiArNzcsNyBAQCBRdEZhbGxiYWNrV2ViUG9w dXA6OlF0RmFsbGJhY2tXZWJQb3B1cCgpCiAgICAgOiBRdEFic3RyYWN0V2ViUG9wdXAoKQogICAg ICwgbV9wb3B1cFZpc2libGUoZmFsc2UpCiAgICAgLCBtX2NvbWJvKG5ldyBRdEZhbGxiYWNrV2Vi UG9wdXBDb21ibygqdGhpcykpCisgICAgLCBtX3Byb3h5KDApCiB7CiAgICAgY29ubmVjdChtX2Nv bWJvLCBTSUdOQUwoYWN0aXZhdGVkKGludCkpLAogICAgICAgICAgICAgU0xPVChhY3RpdmVDaGFu Z2VkKGludCkpLCBRdDo6UXVldWVkQ29ubmVjdGlvbik7CkBAIC03NSwxOSArODUsMzEgQEAgUXRG YWxsYmFja1dlYlBvcHVwOjpRdEZhbGxiYWNrV2ViUG9wdXAoKQogCiBRdEZhbGxiYWNrV2ViUG9w dXA6On5RdEZhbGxiYWNrV2ViUG9wdXAoKQogewotICAgIGRlbGV0ZSBtX2NvbWJvOworICAgIC8v IElmIHdlIGNyZWF0ZSBhIHByb3h5LCB0aGVuIHRoZSBkZWxldGlvbiBvZiB0aGUgcHJveHkgYW5k IHRoZQorICAgIC8vIGNvbWJvIHdpbGwgYmUgZG9uZSBieSB0aGUgcHJveHkncyBwYXJlbnQgKFFH cmFwaGljc1dlYlZpZXcpCisgICAgaWYgKCFtX3Byb3h5KQorICAgICAgICBkZWxldGUgbV9jb21i bzsKIH0KIAogdm9pZCBRdEZhbGxiYWNrV2ViUG9wdXA6OnNob3coKQogewogICAgIHBvcHVsYXRl KCk7Ci0gICAgbV9jb21iby0+c2V0UGFyZW50KHBhZ2VDbGllbnQoKS0+b3duZXJXaWRnZXQoKSk7 CiAgICAgbV9jb21iby0+c2V0Q3VycmVudEluZGV4KGN1cnJlbnRJbmRleCgpKTsKLQogICAgIFFS ZWN0IHJlY3QgPSBnZW9tZXRyeSgpOwotICAgIG1fY29tYm8tPnNldEdlb21ldHJ5KFFSZWN0KHJl Y3QubGVmdCgpLCByZWN0LnRvcCgpLAorICAgIGlmIChRR3JhcGhpY3NXZWJWaWV3ICp3ZWJWaWV3 ID0gcW9iamVjdF9jYXN0PFFHcmFwaGljc1dlYlZpZXcqPihwYWdlQ2xpZW50KCktPnBsdWdpblBh cmVudCgpKSkgeworICAgICAgICBpZiAoIW1fcHJveHkpIHsKKyAgICAgICAgICAgIG1fcHJveHkg PSBuZXcgUUdyYXBoaWNzUHJveHlXaWRnZXQod2ViVmlldyk7CisgICAgICAgICAgICBtX3Byb3h5 LT5zZXRXaWRnZXQobV9jb21ibyk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbV9wcm94 eS0+c2V0VmlzaWJsZSh0cnVlKTsKKyAgICAgICAgbV9wcm94eS0+c2V0R2VvbWV0cnkocmVjdCk7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgbV9jb21iby0+c2V0UGFyZW50KHBhZ2VDbGllbnQoKS0+ b3duZXJXaWRnZXQoKSk7CisgICAgICAgIG1fY29tYm8tPnNldEdlb21ldHJ5KFFSZWN0KHJlY3Qu bGVmdCgpLCByZWN0LnRvcCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlY3Qu d2lkdGgoKSwgbV9jb21iby0+c2l6ZUhpbnQoKS5oZWlnaHQoKSkpOwogCisgICAgfQorCiAgICAg UU1vdXNlRXZlbnQgZXZlbnQoUUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzLCBRQ3Vyc29yOjpwb3Mo KSwgUXQ6OkxlZnRCdXR0b24sCiAgICAgICAgICAgICAgICAgICAgICAgUXQ6OkxlZnRCdXR0b24s IFF0OjpOb01vZGlmaWVyKTsKICAgICBRQ29yZUFwcGxpY2F0aW9uOjpzZW5kRXZlbnQobV9jb21i bywgJmV2ZW50KTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxi YWNrV2ViUG9wdXAuaCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9w dXAuaAppbmRleCA4ZmJlYzZmLi4zOTI0YmY2IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmgKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBw b3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5oCkBAIC0yMyw2ICsyMyw4IEBACiAjaW5jbHVkZSAiUXRB YnN0cmFjdFdlYlBvcHVwLmgiCiAjaW5jbHVkZSA8UUNvbWJvQm94PgogCitjbGFzcyBRR3JhcGhp Y3NQcm94eVdpZGdldDsKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBRdEZhbGxiYWNr V2ViUG9wdXBDb21ibzsKQEAgLTQzLDYgKzQ1LDcgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xh c3MgUXRGYWxsYmFja1dlYlBvcHVwQ29tYm87CiAgICAgYm9vbCBtX3BvcHVwVmlzaWJsZTsKICAg ICBRdEZhbGxiYWNrV2ViUG9wdXBDb21ibyogbV9jb21ibzsKKyAgICBRR3JhcGhpY3NQcm94eVdp ZGdldCogbV9wcm94eTsKIAogICAgIHZvaWQgcG9wdWxhdGUoKTsKIH07Cg==