36561 2010-03-24 15:16:30 -0700 [Qt] Make QWebPage not depend on view() but use the client->ownerWidget() instead 2010-03-26 08:34:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All CLOSED FIXED Qt P3 Normal --- 35784 1 kenneth kenneth commit-queue hausmann tonikitoo oldest_to_newest 203645 0 51558 kenneth 2010-03-24 15:16:30 -0700 Created attachment 51558 Patch Make QWebPage not depend on view() but use the client->ownerWidget() instead. Also, handle the case where there is not page client. 203656 1 tonikitoo 2010-03-24 15:37:49 -0700 style nit: + QStyle *style = d->client ? d->client->style() : qApp->style(); 203877 2 51558 eric 2010-03-25 00:47:54 -0700 Comment on attachment 51558 Patch OK. 203992 3 51558 commit-queue 2010-03-25 04:23:31 -0700 Comment on attachment 51558 Patch Clearing flags on attachment: 51558 Committed r56529: <http://trac.webkit.org/changeset/56529> 203993 4 commit-queue 2010-03-25 04:23:36 -0700 All reviewed patches have been landed. Closing bug. 204587 5 hausmann 2010-03-26 08:34:24 -0700 Revision r56529 cherry-picked into qtwebkit-2.0 with commit af7794bb8c23783a5a1dd5e5aadab33125fe543b 51558 2010-03-24 15:16:30 -0700 2010-03-25 04:23:31 -0700 Patch 0001-Make-QWebPage-not-depend-on-view-but-use-the-client-.patch text/plain 7446 kenneth RnJvbSBjZjRkZjk5MDdkYjFlOWEyODZiYzlhMTJmNWU3NWJkMGZjMGFkMGRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBXZWQsIDI0IE1hciAyMDEwIDE5OjA4OjU1IC0wMzAwClN1YmplY3Q6 IFtQQVRDSF0gTWFrZSBRV2ViUGFnZSBub3QgZGVwZW5kIG9uIHZpZXcoKSBidXQgdXNlIHRoZSBj bGllbnQtPm93bmVyV2lkZ2V0KCkKIGluc3RlYWQuIEFsc28sIGhhbmRsZSB0aGUgY2FzZSB3aGVy ZSB0aGVyZSBpcyBub3QgcGFnZSBjbGllbnQuCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CiogQXBpL3F3ZWJwYWdlLmNwcDoKKFFXZWJQYWdlUHJpdmF0ZTo6Y3JlYXRlQ29udGV4dE1lbnUp OgooUVdlYlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KToKKFFXZWJQYWdlOjpqYXZhU2NyaXB0 QWxlcnQpOgooUVdlYlBhZ2U6OmphdmFTY3JpcHRDb25maXJtKToKKFFXZWJQYWdlOjpqYXZhU2Ny aXB0UHJvbXB0KToKKFFXZWJQYWdlOjpzaG91bGRJbnRlcnJ1cHRKYXZhU2NyaXB0KToKKFFXZWJQ YWdlOjpjcmVhdGVXaW5kb3cpOgooUVdlYlBhZ2U6OmFjdGlvbik6CihRV2ViUGFnZTo6ZXh0ZW5z aW9uKToKKFFXZWJQYWdlOjpjaG9vc2VGaWxlKToKKFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwp OgotLS0KIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIHwgICAzNSArKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLQogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgfCAgIDIwICsr KysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDEz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIv V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggYWQxMjVhNC4uNmQ1MWMwZSAxMDA2NDQK LS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vi cGFnZS5jcHAKQEAgLTU0Nyw3ICs1NDcsMTAgQEAgc3RhdGljIFFXZWJQYWdlOjpXZWJBY3Rpb24g d2ViQWN0aW9uRm9yQ29udGV4dE1lbnVBY3Rpb24oV2ViQ29yZTo6Q29udGV4dE1lbnVBY3QKIFFN ZW51ICpRV2ViUGFnZVByaXZhdGU6OmNyZWF0ZUNvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkNv bnRleHRNZW51ICp3ZWJjb3JlTWVudSwKICAgICAgICAgY29uc3QgUUxpc3Q8V2ViQ29yZTo6Q29u dGV4dE1lbnVJdGVtPiAqaXRlbXMsIFFCaXRBcnJheSAqdmlzaXRlZFdlYkFjdGlvbnMpCiB7Ci0g ICAgUU1lbnUqIG1lbnUgPSBuZXcgUU1lbnUocS0+dmlldygpKTsKKyAgICBpZiAoIWNsaWVudCkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBRTWVudSogbWVudSA9IG5ldyBRTWVudShjbGllbnQt Pm93bmVyV2lkZ2V0KCkpOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgaXRlbXMtPmNvdW50KCk7 ICsraSkgewogICAgICAgICBjb25zdCBDb250ZXh0TWVudUl0ZW0gJml0ZW0gPSBpdGVtcy0+YXQo aSk7CiAgICAgICAgIHN3aXRjaCAoaXRlbS50eXBlKCkpIHsKQEAgLTEwODEsOCArMTA4NCw4IEBA IHZvaWQgUVdlYlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KFFLZXlFdmVudCAqZXYpCiAgICAg aWYgKCFoYW5kbGVkKSB7CiAgICAgICAgIGhhbmRsZWQgPSB0cnVlOwogICAgICAgICBRRm9udCBk ZWZhdWx0Rm9udDsKLSAgICAgICAgaWYgKHEtPnZpZXcoKSkKLSAgICAgICAgICAgIGRlZmF1bHRG b250ID0gcS0+dmlldygpLT5mb250KCk7CisgICAgICAgIGlmIChjbGllbnQpCisgICAgICAgICAg ICBkZWZhdWx0Rm9udCA9IGNsaWVudC0+b3duZXJXaWRnZXQoKS0+Zm9udCgpOwogICAgICAgICBR Rm9udE1ldHJpY3MgZm0oZGVmYXVsdEZvbnQpOwogICAgICAgICBpZiAoIWhhbmRsZVNjcm9sbGlu ZyhldiwgZnJhbWUpKSB7CiAgICAgICAgICAgICBzd2l0Y2ggKGV2LT5rZXkoKSkgewpAQCAtMTky Niw3ICsxOTI5LDggQEAgdm9pZCBRV2ViUGFnZTo6amF2YVNjcmlwdEFsZXJ0KFFXZWJGcmFtZSAq ZnJhbWUsIGNvbnN0IFFTdHJpbmcmIG1zZykKIHsKICAgICBRX1VOVVNFRChmcmFtZSkKICNpZm5k ZWYgUVRfTk9fTUVTU0FHRUJPWAotICAgIFFNZXNzYWdlQm94OjppbmZvcm1hdGlvbih2aWV3KCks IHRyKCJKYXZhU2NyaXB0IEFsZXJ0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3Qo KSksIFF0Ojplc2NhcGUobXNnKSwgUU1lc3NhZ2VCb3g6Ok9rKTsKKyAgICBRV2lkZ2V0KiBwYXJl bnQgPSAoZC0+Y2xpZW50KSA/IGQtPmNsaWVudC0+b3duZXJXaWRnZXQoKSA6IDA7CisgICAgUU1l c3NhZ2VCb3g6OmluZm9ybWF0aW9uKHBhcmVudCwgdHIoIkphdmFTY3JpcHQgQWxlcnQgLSAlMSIp LmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgUXQ6OmVzY2FwZShtc2cpLCBRTWVzc2Fn ZUJveDo6T2spOwogI2VuZGlmCiB9CiAKQEAgLTE5NDIsNyArMTk0Niw4IEBAIGJvb2wgUVdlYlBh Z2U6OmphdmFTY3JpcHRDb25maXJtKFFXZWJGcmFtZSAqZnJhbWUsIGNvbnN0IFFTdHJpbmcmIG1z ZykKICNpZmRlZiBRVF9OT19NRVNTQUdFQk9YCiAgICAgcmV0dXJuIHRydWU7CiAjZWxzZQotICAg IHJldHVybiBRTWVzc2FnZUJveDo6WWVzID09IFFNZXNzYWdlQm94OjppbmZvcm1hdGlvbih2aWV3 KCksIHRyKCJKYXZhU2NyaXB0IENvbmZpcm0gLSAlMSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCku aG9zdCgpKSwgUXQ6OmVzY2FwZShtc2cpLCBRTWVzc2FnZUJveDo6WWVzLCBRTWVzc2FnZUJveDo6 Tm8pOworICAgIFFXaWRnZXQqIHBhcmVudCA9IChkLT5jbGllbnQpID8gZC0+Y2xpZW50LT5vd25l cldpZGdldCgpIDogMDsKKyAgICByZXR1cm4gUU1lc3NhZ2VCb3g6OlllcyA9PSBRTWVzc2FnZUJv eDo6aW5mb3JtYXRpb24ocGFyZW50LCB0cigiSmF2YVNjcmlwdCBDb25maXJtIC0gJTEiKS5hcmco bWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIFF0Ojplc2NhcGUobXNnKSwgUU1lc3NhZ2VCb3g6 OlllcywgUU1lc3NhZ2VCb3g6Ok5vKTsKICNlbmRpZgogfQogCkBAIC0xOTYxLDcgKzE5NjYsOCBA QCBib29sIFFXZWJQYWdlOjpqYXZhU2NyaXB0UHJvbXB0KFFXZWJGcmFtZSAqZnJhbWUsIGNvbnN0 IFFTdHJpbmcmIG1zZywgY29uc3QgUVN0cgogICAgIFFfVU5VU0VEKGZyYW1lKQogICAgIGJvb2wg b2sgPSBmYWxzZTsKICNpZm5kZWYgUVRfTk9fSU5QVVRESUFMT0cKLSAgICBRU3RyaW5nIHggPSBR SW5wdXREaWFsb2c6OmdldFRleHQodmlldygpLCB0cigiSmF2YVNjcmlwdCBQcm9tcHQgLSAlMSIp LmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgUXQ6OmVzY2FwZShtc2cpLCBRTGluZUVk aXQ6Ok5vcm1hbCwgZGVmYXVsdFZhbHVlLCAmb2spOworICAgIFFXaWRnZXQqIHBhcmVudCA9IChk LT5jbGllbnQpID8gZC0+Y2xpZW50LT5vd25lcldpZGdldCgpIDogMDsKKyAgICBRU3RyaW5nIHgg PSBRSW5wdXREaWFsb2c6OmdldFRleHQocGFyZW50LCB0cigiSmF2YVNjcmlwdCBQcm9tcHQgLSAl MSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgUXQ6OmVzY2FwZShtc2cpLCBRTGlu ZUVkaXQ6Ok5vcm1hbCwgZGVmYXVsdFZhbHVlLCAmb2spOwogICAgIGlmIChvayAmJiByZXN1bHQp CiAgICAgICAgICpyZXN1bHQgPSB4OwogI2VuZGlmCkBAIC0xOTg2LDcgKzE5OTIsOCBAQCBib29s IFFXZWJQYWdlOjpzaG91bGRJbnRlcnJ1cHRKYXZhU2NyaXB0KCkKICNpZmRlZiBRVF9OT19NRVNT QUdFQk9YCiAgICAgcmV0dXJuIGZhbHNlOwogI2Vsc2UKLSAgICByZXR1cm4gUU1lc3NhZ2VCb3g6 OlllcyA9PSBRTWVzc2FnZUJveDo6aW5mb3JtYXRpb24odmlldygpLCB0cigiSmF2YVNjcmlwdCBQ cm9ibGVtIC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIHRyKCJUaGUgc2Ny aXB0IG9uIHRoaXMgcGFnZSBhcHBlYXJzIHRvIGhhdmUgYSBwcm9ibGVtLiBEbyB5b3Ugd2FudCB0 byBzdG9wIHRoZSBzY3JpcHQ/IiksIFFNZXNzYWdlQm94OjpZZXMsIFFNZXNzYWdlQm94OjpObyk7 CisgICAgUVdpZGdldCogcGFyZW50ID0gKGQtPmNsaWVudCkgPyBkLT5jbGllbnQtPm93bmVyV2lk Z2V0KCkgOiAwOworICAgIHJldHVybiBRTWVzc2FnZUJveDo6WWVzID09IFFNZXNzYWdlQm94Ojpp bmZvcm1hdGlvbihwYXJlbnQsIHRyKCJKYXZhU2NyaXB0IFByb2JsZW0gLSAlMSIpLmFyZyhtYWlu RnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgdHIoIlRoZSBzY3JpcHQgb24gdGhpcyBwYWdlIGFwcGVh cnMgdG8gaGF2ZSBhIHByb2JsZW0uIERvIHlvdSB3YW50IHRvIHN0b3AgdGhlIHNjcmlwdD8iKSwg UU1lc3NhZ2VCb3g6OlllcywgUU1lc3NhZ2VCb3g6Ok5vKTsKICNlbmRpZgogfQogCkBAIC0yMDA1 LDcgKzIwMTIsNyBAQCBib29sIFFXZWJQYWdlOjpzaG91bGRJbnRlcnJ1cHRKYXZhU2NyaXB0KCkK ICovCiBRV2ViUGFnZSAqUVdlYlBhZ2U6OmNyZWF0ZVdpbmRvdyhXZWJXaW5kb3dUeXBlIHR5cGUp CiB7Ci0gICAgUVdlYlZpZXcgKndlYlZpZXcgPSBxb2JqZWN0X2Nhc3Q8UVdlYlZpZXcgKj4odmll dygpKTsKKyAgICBRV2ViVmlldyAqd2ViVmlldyA9IHFvYmplY3RfY2FzdDxRV2ViVmlldyo+KHZp ZXcoKSk7CiAgICAgaWYgKHdlYlZpZXcpIHsKICAgICAgICAgUVdlYlZpZXcgKm5ld1ZpZXcgPSB3 ZWJWaWV3LT5jcmVhdGVXaW5kb3codHlwZSk7CiAgICAgICAgIGlmIChuZXdWaWV3KQpAQCAtMjI4 OSw3ICsyMjk2LDcgQEAgUUFjdGlvbiAqUVdlYlBhZ2U6OmFjdGlvbihXZWJBY3Rpb24gYWN0aW9u KSBjb25zdAogCiAgICAgUVN0cmluZyB0ZXh0OwogICAgIFFJY29uIGljb247Ci0gICAgUVN0eWxl ICpzdHlsZSA9IHZpZXcoKSA/IHZpZXcoKS0+c3R5bGUoKSA6IHFBcHAtPnN0eWxlKCk7CisgICAg UVN0eWxlICpzdHlsZSA9IGQtPmNsaWVudCA/IGQtPmNsaWVudC0+c3R5bGUoKSA6IHFBcHAtPnN0 eWxlKCk7CiAgICAgYm9vbCBjaGVja2FibGUgPSBmYWxzZTsKIAogICAgIHN3aXRjaCAoYWN0aW9u KSB7CkBAIC0yOTg2LDcgKzI5OTMsOCBAQCBib29sIFFXZWJQYWdlOjpleHRlbnNpb24oRXh0ZW5z aW9uIGV4dGVuc2lvbiwgY29uc3QgRXh0ZW5zaW9uT3B0aW9uICpvcHRpb24sIEV4dAogICAgIGlm IChleHRlbnNpb24gPT0gQ2hvb3NlTXVsdGlwbGVGaWxlc0V4dGVuc2lvbikgewogICAgICAgICAv LyBGSVhNRTogZG8gbm90IGlnbm9yZSBzdWdnZXN0ZWRGaWxlcwogICAgICAgICBRU3RyaW5nTGlz dCBzdWdnZXN0ZWRGaWxlcyA9IHN0YXRpY19jYXN0PGNvbnN0IENob29zZU11bHRpcGxlRmlsZXNF eHRlbnNpb25PcHRpb24qPihvcHRpb24pLT5zdWdnZXN0ZWRGaWxlTmFtZXM7Ci0gICAgICAgIFFT dHJpbmdMaXN0IG5hbWVzID0gUUZpbGVEaWFsb2c6OmdldE9wZW5GaWxlTmFtZXModmlldygpLCBR U3RyaW5nOjpudWxsKTsKKyAgICAgICAgUVdpZGdldCogcGFyZW50ID0gKGQtPmNsaWVudCkgPyBk LT5jbGllbnQtPm93bmVyV2lkZ2V0KCkgOiAwOworICAgICAgICBRU3RyaW5nTGlzdCBuYW1lcyA9 IFFGaWxlRGlhbG9nOjpnZXRPcGVuRmlsZU5hbWVzKHBhcmVudCwgUVN0cmluZzo6bnVsbCk7CiAg ICAgICAgIHN0YXRpY19jYXN0PENob29zZU11bHRpcGxlRmlsZXNFeHRlbnNpb25SZXR1cm4qPihv dXRwdXQpLT5maWxlTmFtZXMgPSBuYW1lczsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpA QCAtMzA2OCw3ICszMDc2LDggQEAgUVN0cmluZyBRV2ViUGFnZTo6Y2hvb3NlRmlsZShRV2ViRnJh bWUgKnBhcmVudEZyYW1lLCBjb25zdCBRU3RyaW5nJiBzdWdnZXN0ZWRGaWwKIHsKICAgICBRX1VO VVNFRChwYXJlbnRGcmFtZSkKICNpZm5kZWYgUVRfTk9fRklMRURJQUxPRwotICAgIHJldHVybiBR RmlsZURpYWxvZzo6Z2V0T3BlbkZpbGVOYW1lKHZpZXcoKSwgUVN0cmluZzo6bnVsbCwgc3VnZ2Vz dGVkRmlsZSk7CisgICAgUVdpZGdldCogcGFyZW50ID0gKGQtPmNsaWVudCkgPyBkLT5jbGllbnQt Pm93bmVyV2lkZ2V0KCkgOiAwOworICAgIHJldHVybiBRRmlsZURpYWxvZzo6Z2V0T3BlbkZpbGVO YW1lKHBhcmVudCwgUVN0cmluZzo6bnVsbCwgc3VnZ2VzdGVkRmlsZSk7CiAjZWxzZQogICAgIHJl dHVybiBRU3RyaW5nOjpudWxsOwogI2VuZGlmCkBAIC0zMzQ2LDggKzMzNTUsOCBAQCBRU3RyaW5n IFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgUVVybCYgdXJsKSBjb25zdAogCiAgICAg Ly8gTGFuZ3VhZ2UKICAgICBRTG9jYWxlIGxvY2FsZTsKLSAgICBpZiAodmlldygpKQotICAgICAg ICBsb2NhbGUgPSB2aWV3KCktPmxvY2FsZSgpOworICAgIGlmIChkLT5jbGllbnQpCisgICAgICAg IGxvY2FsZSA9IGQtPmNsaWVudC0+b3duZXJXaWRnZXQoKS0+bG9jYWxlKCk7CiAgICAgUVN0cmlu ZyBuYW1lID0gbG9jYWxlLm5hbWUoKTsKICAgICBuYW1lWzJdID0gUUxhdGluMUNoYXIoJy0nKTsK ICAgICB1YS5hcHBlbmQobmFtZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIv V2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBjMjdlNjE5Li43ZjcyMTk0IDEwMDY0NAotLS0gYS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MyBAQAorMjAxMC0wMy0yNCAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTWFrZSBRV2ViUGFnZSBub3QgZGVwZW5kIG9uIHZpZXcoKSBidXQgdXNlIHRoZSBjbGllbnQt Pm93bmVyV2lkZ2V0KCkKKyAgICAgICAgaW5zdGVhZC4gQWxzbywgaGFuZGxlIHRoZSBjYXNlIHdo ZXJlIHRoZXJlIGlzIG5vdCBwYWdlIGNsaWVudC4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5j cHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmNyZWF0ZUNvbnRleHRNZW51KToKKyAgICAg ICAgKFFXZWJQYWdlUHJpdmF0ZTo6a2V5UHJlc3NFdmVudCk6CisgICAgICAgIChRV2ViUGFnZTo6 amF2YVNjcmlwdEFsZXJ0KToKKyAgICAgICAgKFFXZWJQYWdlOjpqYXZhU2NyaXB0Q29uZmlybSk6 CisgICAgICAgIChRV2ViUGFnZTo6amF2YVNjcmlwdFByb21wdCk6CisgICAgICAgIChRV2ViUGFn ZTo6c2hvdWxkSW50ZXJydXB0SmF2YVNjcmlwdCk6CisgICAgICAgIChRV2ViUGFnZTo6Y3JlYXRl V2luZG93KToKKyAgICAgICAgKFFXZWJQYWdlOjphY3Rpb24pOgorICAgICAgICAoUVdlYlBhZ2U6 OmV4dGVuc2lvbik6CisgICAgICAgIChRV2ViUGFnZTo6Y2hvb3NlRmlsZSk6CisgICAgICAgIChR V2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKToKKwogMjAxMC0wMy0yNCAgVmlhdGNoZXNsYXYgT3N0 YXBlbmtvICA8b3N0YXBlbmtvLnZpYXRjaGVzbGF2QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBMYXN6bG8gR29tYm9zLgotLSAKMS42LjMuMwoK