13003 2007-03-07 11:41:25 -0800 [S60] Plugin Window shouldn't cover the scroll bars. 2011-03-21 11:53:14 -0700 1 1 1 Unclassified WebKit Plug-ins 523.x (Safari 3) S60 Emulator S60 3rd edition CLOSED FIXED PlatformOnly P2 Normal --- 1 hong.a.zhao webkit-unassigned S60webkit oldest_to_newest 20032 0 hong.a.zhao 2007-03-07 11:41:25 -0800 TSW ID: HZHO-6YZR4X Plugin Window should pass a correct clip rect (without covering scroll bars). The different plugins should change their codes as well if they don't take clipRect for display. 20022 1 13521 hong.a.zhao 2007-03-07 12:26:12 -0800 Created attachment 13521 Recalculate clipRect based on the plugin object rect and the Browser frame rect, then passed it for pluginWin to display. 20009 2 13521 yongjun.zhang 2007-03-07 13:28:06 -0800 Comment on attachment 13521 Recalculate clipRect based on the plugin object rect and the Browser frame rect, then passed it for pluginWin to display. Frame()->FrameRect() is not the main frame rect when the page has multiple frames. The patch won't work when plugin is in a subframe. 19985 3 13530 hong.a.zhao 2007-03-07 14:38:31 -0800 Created attachment 13530 Use mainframe frameRect and plugin object rect to calculate the plugin window's clip rect. 19908 4 13530 yongjun.zhang 2007-03-08 07:40:42 -0800 Comment on attachment 13530 Use mainframe frameRect and plugin object rect to calculate the plugin window's clip rect. r=me 19754 5 13558 hong.a.zhao 2007-03-09 08:00:12 -0800 Created attachment 13558 Fix the bug of pluginwin overlap on the browser sroll bars when it's oversize in 3.2 19749 6 13558 yongjun.zhang 2007-03-09 10:51:16 -0800 Comment on attachment 13558 Fix the bug of pluginwin overlap on the browser sroll bars when it's oversize in 3.2 r=me 19381 7 bradley.morrison 2007-03-12 08:45:27 -0700 (In reply to comment #4) > (From update of attachment 13530 [edit]) > r=me > landed on trunk - r20116 19382 8 bradley.morrison 2007-03-12 08:48:50 -0700 (In reply to comment #6) > (From update of attachment 13558 [edit]) > r=me > Does this patch need to go into 3.1? It's not clear if this patch is targetted at 3.1. If so, it won't apply cleanly - the patch needs to be re-created. 19383 9 bradley.morrison 2007-03-12 09:05:38 -0700 resoved 19397 10 hong.a.zhao 2007-03-12 11:47:32 -0700 Please submit the 3rd patch. Thanks! 19400 11 bradley.morrison 2007-03-12 12:01:05 -0700 (In reply to comment #10) > Please submit the 3rd patch. Thanks! > r20119. In future, please combine your fixes into one patch and obsolete earlier, outdated patches. 77032 12 bradley.morrison 2008-04-09 11:39:48 -0700 Bulk closing of all s60 platform bugs. Sorry for the noise! 370696 13 joel.parks 2011-03-21 11:53:14 -0700 re-purposing InTSW keyword for use by QtWebkit team 13521 2007-03-07 12:26:12 -0800 2007-03-07 14:38:31 -0800 Recalculate clipRect based on the plugin object rect and the Browser frame rect, then passed it for pluginWin to display. 13003-3-2.patch text/plain 3463 hong.a.zhao SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIENoYW5nZUxvZwkocmV2aXNpb24gMjAw MjcpDQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpAQCAtMSwzICsxLDE2IEBADQoraG9u Z3poYW8sIHJldmlld2VkIGJ5IFlvbmdqdW4uemhhbmdAbm9raWEuY29tDQorIERFU0M6IFBsdWdp biBXaW5kb3cgc2hvdWxkbid0IGNvdmVyIHRoZSBzY3JvbGwgYmFycyBpZiB0aGV5IGFyZSBvdmVy c2l6ZS4NCisgRml4OiBJbnRlcnNlY3RzIHRoZSBwbHVnaW4gb2JqZWN0IHJlY3QgYW5kIHRoZSBy ZWN0IG9mIG1haW4gZnJhbWUgaW4gQnJvd3NlciwgdGhlbiBzZXQgaXQgYXMgY2xpcCByZWN0IHRv IHBhc3MgZm9yIHBsdWdpbiB3aW5kb3cuIA0KKyBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzAwMw0KKw0KKyAgICAgICAgKiBQbHVnaW4vaW5jL1BsdWdpblNraW4uaDoN CisgICAgICAgIChDUGx1Z2luU2tpbjo6UGx1Z2luV2luQ2xpcFJlY3QpOg0KKyAgICAgICAgKiBQ bHVnaW4vc3JjL1BsdWdpblNraW4uY3BwOg0KKyAgICAgICAgKENQbHVnaW5Ta2luOjpQb3NpdGlv bkNoYW5nZWQpOg0KKyAgICAgICAgKENQbHVnaW5Ta2luOjpDcmVhdGVQbHVnaW5XaW5MKToNCisg ICAgICAgICogUGx1Z2luL3NyYy9QbHVnaW5XaW4uY3BwOg0KKyAgICAgICAgKENQbHVnaW5XaW46 OlNpemVDaGFuZ2VkKToNCisNCiB5aW54Y2FpLCByZXZpZXdlZCBieSA8U2FjaGluPg0KICBERVND OiBBU09HLTZZVExOQSAtLSBSZW1vdmUgX19CUk9XU0VSX09TU19FTkdJTkUgZmxhZyBmcm9tIHdl YmtpdC5pYnkgYW5kIHdlYmtpdHJlc291cmNlcy5pYnkNCiAgaHR0cDovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MzUNCkluZGV4OiBQbHVnaW4vaW5jL1BsdWdpblNraW4uaA0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQ0KLS0tIFBsdWdpbi9pbmMvUGx1Z2luU2tpbi5oCShyZXZpc2lvbiAyMDAyNykN CisrKyBQbHVnaW4vaW5jL1BsdWdpblNraW4uaAkod29ya2luZyBjb3B5KQ0KQEAgLTE5NCw4ICsx OTQsMTYgQEAgY2xhc3MgQ1BsdWdpblNraW4gOiBwdWJsaWMgQ0Jhc2UsDQogICAgICAgICAqIEBy ZXR1cm4NCiAgICAgICAgICovDQogICAgIHZvaWQgUmVzaXplZCgpIHsgaVJlc2l6ZWQgPSBFVHJ1 ZTsgfQ0KLQ0KLQ0KKyAgICANCisgICAgICAgIC8qKg0KKyAgICAgICAgKiBQbHVnaW5XaW5DbGlw UmVjdA0KKyAgICAgICAgKiBQdXJwb3NlIFJldHVybnMgdGhlIENsaXAgUmVjdCBmb3IgcGx1Z2lu IHdpbmRvdw0KKyAgICAgICAgKiBAc2luY2UgMy4yDQorICAgICAgICAqIEBwYXJhbSB2b2lkDQor ICAgICAgICAqIEByZXR1cm4gVFJlY3QNCisgICAgICAgICovDQorICAgIFRSZWN0IFBsdWdpbldp bkNsaXBSZWN0KCkge3JldHVybiBpUGx1Z2luV2luQ2xpcFJlY3Q7fQ0KKyAgICANCiAgICAgcHVi bGljOiAvLyBNZXRob2RzIEZyb20gTVdlYkNvcmVPYmplY3RXaWRnZXQNCiANCiAgICAgICAgIC8q Kg0KQEAgLTQ1OSw1ICs0NjcsNiBAQCBjbGFzcyBDUGx1Z2luU2tpbiA6IHB1YmxpYyBDQmFzZSwN CiAgICAgLy9FVHJ1ZSBpZiBwbHVnaW4gY2FuIGJlIGFjdGl2YXRlZCB0byBpbnRlcmFjdCB3aXRo IHVzZXIuIE9ubHkgaWYgcGx1Z2luIGlzIGdlbmVyYXRlZCBmcm9tIGV4dGVybmFsIGpzDQogICAg IFRCb29sIGlDYW5QbHVnaW5JbnRlcmFjdDsNCiANCisgICAgVFJlY3QgaVBsdWdpbldpbkNsaXBS ZWN0Ow0KICAgICB9Ow0KICNlbmRpZiAvLyAgX19QTFVHSU5TS0lOX0hfXw0KSW5kZXg6IFBsdWdp bi9zcmMvUGx1Z2luU2tpbi5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBQbHVnaW4vc3JjL1BsdWdpblNr aW4uY3BwCShyZXZpc2lvbiAyMDAyNykNCisrKyBQbHVnaW4vc3JjL1BsdWdpblNraW4uY3BwCSh3 b3JraW5nIGNvcHkpDQpAQCAtNTY0LDYgKzU2NCw4IEBAIHZvaWQgQ1BsdWdpblNraW46OlBvc2l0 aW9uQ2hhbmdlZCgpDQogDQogICAgIGlmIChpUGx1Z2luV2luKQ0KICAgICAgICAgew0KKyAgICAg ICAgaVBsdWdpbldpbkNsaXBSZWN0ID0gbmV3UmVjdDsNCisgICAgICAgIGlQbHVnaW5XaW5DbGlw UmVjdC5JbnRlcnNlY3Rpb24oRnJhbWUoKS0+RnJhbWVSZWN0KCkpOw0KICAgICAgICAgLy8gUmVw b3NpdGlvbiB0aGUgY29udHJvbC4NCiAgICAgICAgIGlQbHVnaW5XaW4tPlNldFJlY3QobmV3UmVj dCk7DQogICAgICAgICB9DQpAQCAtNjAwLDYgKzYwMiw5IEBAIHZvaWQgQ1BsdWdpblNraW46OkNy ZWF0ZVBsdWdpbldpbkwoIGNvbnMNCiAgICAgICAgICAgICAgICAgVXNlcjo6TGVhdmUoIGVyciAp Ow0KICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgfQ0KKyAgICAgICAvL1NldCB0aGUg Y2xpcHJlY3QgdG8gcGx1Z3dpbg0KKyAgICAgICBpUGx1Z2luV2luQ2xpcFJlY3QgPSBpUmVjdDsN CisgICAgICAgaVBsdWdpbldpbkNsaXBSZWN0LkludGVyc2VjdGlvbihGcmFtZSgpLT5GcmFtZVJl Y3QoKSk7DQogDQogICAgICAgICBpZiAoICFpSXNTb3VuZHN0YXJ0ICkNCiAgICAgICAgICAgICB7 DQpJbmRleDogUGx1Z2luL3NyYy9QbHVnaW5XaW4uY3BwDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gUGx1Z2lu L3NyYy9QbHVnaW5XaW4uY3BwCShyZXZpc2lvbiAyMDAyNykNCisrKyBQbHVnaW4vc3JjL1BsdWdp bldpbi5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC0yNDksNiArMjQ5LDEzIEBAIHZvaWQgQ1BsdWdp bldpbjo6U2l6ZUNoYW5nZWQoKQ0KICAgICAgICAgIHdpbmRvdy55ID0gMDsNCiAgICAgICAgICB3 aW5kb3cud2lkdGggPSByZWN0LldpZHRoKCk7DQogICAgICAgICAgd2luZG93LmhlaWdodCA9IHJl Y3QuSGVpZ2h0KCk7DQorICAgICAgICAgDQorICAgICAgICAgVFJlY3QgY2xpcFJlY3QgPSBpUGx1 Z2luU2tpbi0+UGx1Z2luV2luQ2xpcFJlY3QoKTsNCisgICAgICAgICB3aW5kb3cuY2xpcFJlY3Qu dG9wID0gY2xpcFJlY3QuaVRsLmlYOw0KKyAgICAgICAgIHdpbmRvdy5jbGlwUmVjdC5sZWZ0ID0g Y2xpcFJlY3QuaVRsLmlZOw0KKyAgICAgICAgIHdpbmRvdy5jbGlwUmVjdC5ib3R0b20gPWNsaXBS ZWN0LmlCci5pWDsNCisgICAgICAgICB3aW5kb3cuY2xpcFJlY3QucmlnaHQgPSBjbGlwUmVjdC5p QnIuaVk7DQorICAgICAgICANCiAgICAgICAgICB3aW5kb3cudHlwZSA9IE5QV2luZG93VHlwZURy YXdhYmxlOw0KICAgICAgICAgIGlQbHVnaW5GdW5jcy0+c2V0d2luZG93KCBpSW5zdGFuY2UsICZ3 aW5kb3cgKTsNCiAgICAgICAgICBpSXNFeHRlbnRTZXQgPSBFVHJ1ZTsNCg== 13530 2007-03-07 14:38:31 -0800 2007-03-09 08:00:12 -0800 Use mainframe frameRect and plugin object rect to calculate the plugin window's clip rect. 13003-3-2.patch text/plain 3598 hong.a.zhao SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMDAyOCkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDE2IEBADQoraG9uZ3poYW8sIHJldmlld2VkIGJ5IFlvbmdqdW4uemhhbmdAbm9r aWEuY29tDQorIERFU0M6IFBsdWdpbiBXaW5kb3cgc2hvdWxkbid0IGNvdmVyIHRoZSBzY3JvbGwg YmFycyBpZiB0aGV5IGFyZSBvdmVyc2l6ZS4NCisgRml4OiBJbnRlcnNlY3RzIHRoZSBwbHVnaW4g b2JqZWN0IHJlY3QgYW5kIHRoZSByZWN0IG9mIG1haW4gZnJhbWUgaW4gQnJvd3NlciwgdGhlbiBz ZXQgaXQgYXMgY2xpcCByZWN0IHRvIHBhc3MgZm9yIHBsdWdpbiB3aW5kb3cuIA0KKyBodHRwOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAwMw0KKw0KKyAgICAgICAgKiBQbHVn aW4vaW5jL1BsdWdpblNraW4uaDoNCisgICAgICAgIChDUGx1Z2luU2tpbjo6UGx1Z2luV2luQ2xp cFJlY3QpOg0KKyAgICAgICAgKiBQbHVnaW4vc3JjL1BsdWdpblNraW4uY3BwOg0KKyAgICAgICAg KENQbHVnaW5Ta2luOjpQb3NpdGlvbkNoYW5nZWQpOg0KKyAgICAgICAgKENQbHVnaW5Ta2luOjpD cmVhdGVQbHVnaW5XaW5MKToNCisgICAgICAgICogUGx1Z2luL3NyYy9QbHVnaW5XaW4uY3BwOg0K KyAgICAgICAgKENQbHVnaW5XaW46OlNpemVDaGFuZ2VkKToNCisNCiB5aW54Y2FpLCByZXZpZXdl ZCBieSA8U2FjaGluPg0KICBERVNDOiBBU09HLTZZVExOQSAtLSBSZW1vdmUgX19CUk9XU0VSX09T U19FTkdJTkUgZmxhZyBmcm9tIHdlYmtpdC5pYnkgYW5kIHdlYmtpdHJlc291cmNlcy5pYnkNCiAg aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MzUNCkluZGV4OiBXZWJL aXQvUGx1Z2luL2luYy9QbHVnaW5Ta2luLmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvUGx1Z2lu L2luYy9QbHVnaW5Ta2luLmgJKHJldmlzaW9uIDIwMDI4KQ0KKysrIFdlYktpdC9QbHVnaW4vaW5j L1BsdWdpblNraW4uaAkod29ya2luZyBjb3B5KQ0KQEAgLTE5NCw4ICsxOTQsMTYgQEAgY2xhc3Mg Q1BsdWdpblNraW4gOiBwdWJsaWMgQ0Jhc2UsDQogICAgICAgICAqIEByZXR1cm4NCiAgICAgICAg ICovDQogICAgIHZvaWQgUmVzaXplZCgpIHsgaVJlc2l6ZWQgPSBFVHJ1ZTsgfQ0KLQ0KLQ0KKyAg ICANCisgICAgICAgIC8qKg0KKyAgICAgICAgKiBQbHVnaW5XaW5DbGlwUmVjdA0KKyAgICAgICAg KiBQdXJwb3NlIFJldHVybnMgdGhlIENsaXAgUmVjdCBmb3IgcGx1Z2luIHdpbmRvdw0KKyAgICAg ICAgKiBAc2luY2UgMy4yDQorICAgICAgICAqIEBwYXJhbSB2b2lkDQorICAgICAgICAqIEByZXR1 cm4gVFJlY3QNCisgICAgICAgICovDQorICAgIFRSZWN0IFBsdWdpbldpbkNsaXBSZWN0KCkge3Jl dHVybiBpUGx1Z2luV2luQ2xpcFJlY3Q7fQ0KKyAgICANCiAgICAgcHVibGljOiAvLyBNZXRob2Rz IEZyb20gTVdlYkNvcmVPYmplY3RXaWRnZXQNCiANCiAgICAgICAgIC8qKg0KQEAgLTQ1OSw1ICs0 NjcsNiBAQCBjbGFzcyBDUGx1Z2luU2tpbiA6IHB1YmxpYyBDQmFzZSwNCiAgICAgLy9FVHJ1ZSBp ZiBwbHVnaW4gY2FuIGJlIGFjdGl2YXRlZCB0byBpbnRlcmFjdCB3aXRoIHVzZXIuIE9ubHkgaWYg cGx1Z2luIGlzIGdlbmVyYXRlZCBmcm9tIGV4dGVybmFsIGpzDQogICAgIFRCb29sIGlDYW5QbHVn aW5JbnRlcmFjdDsNCiANCisgICAgVFJlY3QgaVBsdWdpbldpbkNsaXBSZWN0Ow0KICAgICB9Ow0K ICNlbmRpZiAvLyAgX19QTFVHSU5TS0lOX0hfXw0KSW5kZXg6IFdlYktpdC9QbHVnaW4vc3JjL1Bs dWdpblNraW4uY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L1BsdWdpbi9zcmMvUGx1Z2luU2tp bi5jcHAJKHJldmlzaW9uIDIwMDI4KQ0KKysrIFdlYktpdC9QbHVnaW4vc3JjL1BsdWdpblNraW4u Y3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTY0LDYgKzU2NCw4IEBAIHZvaWQgQ1BsdWdpblNraW46 OlBvc2l0aW9uQ2hhbmdlZCgpDQogDQogICAgIGlmIChpUGx1Z2luV2luKQ0KICAgICAgICAgew0K KyAgICAgICAgaVBsdWdpbldpbkNsaXBSZWN0ID0gbmV3UmVjdDsNCisgICAgICAgIGlQbHVnaW5X aW5DbGlwUmVjdC5JbnRlcnNlY3Rpb24oaVdlYktpdEZyYW1lLT5XZWJLaXRWaWV3KCkuTWFpbkZy YW1lKCkuRnJhbWVSZWN0KCkpOw0KICAgICAgICAgLy8gUmVwb3NpdGlvbiB0aGUgY29udHJvbC4N CiAgICAgICAgIGlQbHVnaW5XaW4tPlNldFJlY3QobmV3UmVjdCk7DQogICAgICAgICB9DQpAQCAt NjAwLDYgKzYwMiw5IEBAIHZvaWQgQ1BsdWdpblNraW46OkNyZWF0ZVBsdWdpbldpbkwoIGNvbnMN CiAgICAgICAgICAgICAgICAgVXNlcjo6TGVhdmUoIGVyciApOw0KICAgICAgICAgICAgICAgICB9 DQogICAgICAgICAgICAgfQ0KKyAgICAvL1NldCB0aGUgY2xpcHJlY3QgdG8gcGx1Z3dpbg0KKyAg ICBpUGx1Z2luV2luQ2xpcFJlY3QgPSBpUmVjdDsNCisgICAgaVBsdWdpbldpbkNsaXBSZWN0Lklu dGVyc2VjdGlvbihpV2ViS2l0RnJhbWUtPldlYktpdFZpZXcoKS5NYWluRnJhbWUoKS5GcmFtZVJl Y3QoKSk7DQogDQogICAgICAgICBpZiAoICFpSXNTb3VuZHN0YXJ0ICkNCiAgICAgICAgICAgICB7 DQpJbmRleDogV2ViS2l0L1BsdWdpbi9zcmMvUGx1Z2luV2luLmNwcA0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0t IFdlYktpdC9QbHVnaW4vc3JjL1BsdWdpbldpbi5jcHAJKHJldmlzaW9uIDIwMDI4KQ0KKysrIFdl YktpdC9QbHVnaW4vc3JjL1BsdWdpbldpbi5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC0yNDksNiAr MjQ5LDEzIEBAIHZvaWQgQ1BsdWdpbldpbjo6U2l6ZUNoYW5nZWQoKQ0KICAgICAgICAgIHdpbmRv dy55ID0gMDsNCiAgICAgICAgICB3aW5kb3cud2lkdGggPSByZWN0LldpZHRoKCk7DQogICAgICAg ICAgd2luZG93LmhlaWdodCA9IHJlY3QuSGVpZ2h0KCk7DQorICAgICAgICAgDQorICAgICAgICAg VFJlY3QgY2xpcFJlY3QgPSBpUGx1Z2luU2tpbi0+UGx1Z2luV2luQ2xpcFJlY3QoKTsNCisgICAg ICAgICB3aW5kb3cuY2xpcFJlY3QudG9wID0gY2xpcFJlY3QuaVRsLmlYOw0KKyAgICAgICAgIHdp bmRvdy5jbGlwUmVjdC5sZWZ0ID0gY2xpcFJlY3QuaVRsLmlZOw0KKyAgICAgICAgIHdpbmRvdy5j bGlwUmVjdC5ib3R0b20gPWNsaXBSZWN0LmlCci5pWDsNCisgICAgICAgICB3aW5kb3cuY2xpcFJl Y3QucmlnaHQgPSBjbGlwUmVjdC5pQnIuaVk7DQorICAgICAgICANCiAgICAgICAgICB3aW5kb3cu dHlwZSA9IE5QV2luZG93VHlwZURyYXdhYmxlOw0KICAgICAgICAgIGlQbHVnaW5GdW5jcy0+c2V0 d2luZG93KCBpSW5zdGFuY2UsICZ3aW5kb3cgKTsNCiAgICAgICAgICBpSXNFeHRlbnRTZXQgPSBF VHJ1ZTsNCg== 13558 2007-03-09 08:00:12 -0800 2007-03-09 10:51:16 -0800 Fix the bug of pluginwin overlap on the browser sroll bars when it's oversize in 3.2 13003.patch text/plain 4634 hong.a.zhao SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMDA4OSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDE3IEBADQoraG9uZ3poYW8sIHJldmlld2VkIGJ5IFlvbmdqdW4uemhhbmdAbm9r aWEuY29tDQorIERFU0M6IFBsdWdpbiBXaW5kb3cgc2hvdWxkbid0IGNvdmVyIHRoZSBzY3JvbGwg YmFycyB3aGVuIGl0J3Mgb3ZlcnNpemUNCisgRml4OiBDYWxjdWxhdGUgdGhlIGNsaXBSZWN0IGJh c2VkIG9uIHRoZSBCcm93c2VyIG1haW5mcmFtZSByZWN0IGFuZCB0aGUgcGx1Z2luIG9iamVjdCBy ZWN0IGFuZCB1c2UgaXQgYXMgdGhlIHBsdWdpbiBjbGlwcmVjdC4NCisgaHR0cDovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMDMNCisNCisgICAgICAgICogUGx1Z2luL2luYy9Q bHVnaW5Ta2luLmg6DQorICAgICAgICAoQ1BsdWdpblNraW46OlBsdWdpbldpbkNsaXBSZWN0KToN CisgICAgICAgICogUGx1Z2luL3NyYy9QbHVnaW5Ta2luLmNwcDoNCisgICAgICAgIChDUGx1Z2lu U2tpbjo6TmV3TCk6DQorICAgICAgICAoQ1BsdWdpblNraW46OkNvbnN0cnVjdEwpOg0KKyAgICAg ICAgKENQbHVnaW5Ta2luOjpEcmF3KToNCisgICAgICAgICogUGx1Z2luL3NyYy9QbHVnaW5XaW4u Y3BwOg0KKyAgICAgICAgKENQbHVnaW5XaW46OlNpemVDaGFuZ2VkKToNCisNCiB5aW54Y2FpLCBy ZXZpZXdlZCBieSBZb25nanVuDQogIERFU0M6IEJyb3dzZXI6IHBhZ2UgaW5mbyBub3Qgc2hvd24g Y29ycmVjdGx5IGFmdGVyIGdvaW5nIGJhY2sgdG8gc2VjdXJlIHBhZ2UgSE1OTi02WU5IN0ogDQog IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTg5DQpJbmRleDogV2Vi S2l0L1BsdWdpbi9pbmMvUGx1Z2luU2tpbi5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L1BsdWdp bi9pbmMvUGx1Z2luU2tpbi5oCShyZXZpc2lvbiAyMDA4OSkNCisrKyBXZWJLaXQvUGx1Z2luL2lu Yy9QbHVnaW5Ta2luLmgJKHdvcmtpbmcgY29weSkNCkBAIC0xOTQsOCArMTk0LDE2IEBAIGNsYXNz IENQbHVnaW5Ta2luIDogcHVibGljIENCYXNlLA0KICAgICAgICAgKiBAcmV0dXJuDQogICAgICAg ICAqLw0KICAgICB2b2lkIFJlc2l6ZWQoKSB7IGlSZXNpemVkID0gRVRydWU7IH0NCi0NCi0NCisg ICAgDQorICAgICAgICAvKioNCisgICAgICAgICogUGx1Z2luV2luQ2xpcFJlY3QNCisgICAgICAg ICogUHVycG9zZSBSZXR1cm5zIHRoZSBDbGlwIFJlY3QgZm9yIHBsdWdpbiB3aW5kb3cNCisgICAg ICAgICogQHNpbmNlIDMuMg0KKyAgICAgICAgKiBAcGFyYW0gdm9pZA0KKyAgICAgICAgKiBAcmV0 dXJuIFRSZWN0DQorICAgICAgICAqLw0KKyAgICBUUmVjdCBQbHVnaW5XaW5DbGlwUmVjdCgpIHty ZXR1cm4gaVBsdWdpbldpbkNsaXBSZWN0O30NCisgICAgDQogICAgIHB1YmxpYzogLy8gTWV0aG9k cyBGcm9tIE1XZWJDb3JlT2JqZWN0V2lkZ2V0DQogDQogICAgICAgICAvKioNCkBAIC00NTksNSAr NDY3LDYgQEAgY2xhc3MgQ1BsdWdpblNraW4gOiBwdWJsaWMgQ0Jhc2UsDQogICAgIC8vRVRydWUg aWYgcGx1Z2luIGNhbiBiZSBhY3RpdmF0ZWQgdG8gaW50ZXJhY3Qgd2l0aCB1c2VyLiBPbmx5IGlm IHBsdWdpbiBpcyBnZW5lcmF0ZWQgZnJvbSBleHRlcm5hbCBqcw0KICAgICBUQm9vbCBpQ2FuUGx1 Z2luSW50ZXJhY3Q7DQogDQorICAgIFRSZWN0IGlQbHVnaW5XaW5DbGlwUmVjdDsNCiAgICAgfTsN CiAjZW5kaWYgLy8gIF9fUExVR0lOU0tJTl9IX18NCkluZGV4OiBXZWJLaXQvUGx1Z2luL3NyYy9Q bHVnaW5Ta2luLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9QbHVnaW4vc3JjL1BsdWdpblNr aW4uY3BwCShyZXZpc2lvbiAyMDA4OSkNCisrKyBXZWJLaXQvUGx1Z2luL3NyYy9QbHVnaW5Ta2lu LmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTEwOSw3ICsxMDksNyBAQCBDUGx1Z2luU2tpbiogQ1Bs dWdpblNraW46Ok5ld0woIENXZWJLaXRGDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBUQm9vbCBhSGFzRmFsbGJhY2tDb250ZW50KQ0KICAgICB7DQogICAgIENQbHVnaW5Ta2luKiBz ZWxmID0gTlVMTDsNCi0gICAgDQorDQogICAgIC8vQ2hlY2sgaWYgdGhlIGZsYXNoIHBsdWdpbiBp cyBlbmFibGVkIG9yIGRpc2FibGVkLg0KICAgICBzZWxmID0gbmV3IChFTGVhdmUpIENQbHVnaW5T a2luKCBhV2ViS2l0RnJhbWUgKTsNCiAgICAgQ2xlYW51cFN0YWNrOjpQdXNoTCggc2VsZiApOw0K QEAgLTE1Nyw3ICsxNTcsNyBAQCB2b2lkIENQbHVnaW5Ta2luOjpDb25zdHJ1Y3RMKCBjb25zdCBU RGVzDQogICAgIGlJc1BsdWdpblN1cHBvcnRlZCA9IHBsdWdpbkhhbmRsZXIuSXNTdXBwb3J0ZWQo IGFNSU1FVHlwZSwgYVVybCApOw0KICAgICBpZiAoIWlJc1BsdWdpblN1cHBvcnRlZCAmJiBhSGFz RmFsbGJhY2tDb250ZW50KQ0KICAgICAgICAgew0KLSAgICAgICAgLy8gdXNlIGZhbGxiYWNrIGNv bnRlbnQgDQorICAgICAgICAvLyB1c2UgZmFsbGJhY2sgY29udGVudA0KICAgICAgICAgVXNlcjo6 TGVhdmUoS0Vyck5vdFN1cHBvcnRlZCk7DQogICAgICAgICB9DQogICAgIFRJbnQgdmFsdWUoIDAg KTsNCkBAIC0yNTksNyArMjU5LDcgQEAgdm9pZCBDUGx1Z2luU2tpbjo6Q29uc3RydWN0TCggY29u c3QgVERlcw0KICAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgbG9h ZFBsdWdpbkNvbnRlbnQgPSBsb2FkUGx1Z2luQ29udGVudCAmJiAhaVdlYktpdEZyYW1lLT5XZWJL aXRWaWV3KCkuV2ViS2l0Q29udHJvbCgpLkdldEJyb3dzZXJTZXR0aW5nTCggVEJyQ3RsRGVmczo6 RVNldHRpbmdzRGlzYWJsZUZsYXNoICk7DQogICAgICAgICAgICAgICAgICAgICB9DQotIA0KKw0K ICAgICAgICAgICAgICAgICAvLyBBZnRlciBVSSBDUiBmb3IgYWRkaW5nIHNldHRpbmcgZm9yIHBs dWdpbiwgdXNlIHRoZSBFU2V0dGluZyBBdXRvTG9hZFBsdWdpbnMNCiAgICAgICAgICAgICAgICAg aWYgKCBsb2FkUGx1Z2luQ29udGVudCApDQogICAgICAgICAgICAgICAgICAgICB7DQpAQCAtMzM1 LDYgKzMzNSw5IEBAIHZvaWQgQ1BsdWdpblNraW46OkRyYXcoIENXZWJDb3JlR3JhcGhpY3MNCiAg ICAgICAgIFRQb2ludCBwdChuZXdSZWN0LmlUbCk7DQogICAgICAgICBwdCArPSBpV2ViS2l0RnJh bWUtPlJlY3RJbkdsb2JhbENvb3JkcygpLmlUbDsNCiAgICAgICAgIHB0IC09IGlXZWJLaXRGcmFt ZS0+V2ViS2l0VmlldygpLk1haW5GcmFtZSgpLlRvVmlld0Nvb3JkcyhpV2ViS2l0RnJhbWUtPldl YktpdFZpZXcoKS5NYWluRnJhbWUoKS5Db250ZW50UG9zaXRpb24oKSk7DQorICAgICAgICBUUmVj dCBwb3NpdGlvbmVkUmVjdChwdCxpV2ViS2l0RnJhbWUtPlRvVmlld0Nvb3JkcyhuZXdSZWN0LlNp emUoKSkpOw0KKyAgICAgICAgaVBsdWdpbldpbkNsaXBSZWN0ID0gcG9zaXRpb25lZFJlY3Q7DQor ICAgICAgICBpUGx1Z2luV2luQ2xpcFJlY3QuSW50ZXJzZWN0aW9uKGlXZWJLaXRGcmFtZS0+V2Vi S2l0VmlldygpLk1haW5GcmFtZSgpLkZyYW1lUmVjdCgpKTsNCiANCiAgICAgICAgIC8vIFJlc2l6 ZSB0aGUgY29udHJvbC4NCiAgICAgICAgIGlQbHVnaW5XaW4tPlNldEV4dGVudChwdCwgbmV3UmVj dC5TaXplKCkpOw0KSW5kZXg6IFdlYktpdC9QbHVnaW4vc3JjL1BsdWdpbldpbi5jcHANCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NCi0tLSBXZWJLaXQvUGx1Z2luL3NyYy9QbHVnaW5XaW4uY3BwCShyZXZpc2lvbiAyMDA4 OSkNCisrKyBXZWJLaXQvUGx1Z2luL3NyYy9QbHVnaW5XaW4uY3BwCSh3b3JraW5nIGNvcHkpDQpA QCAtMjQ5LDYgKzI0OSwxMyBAQCB2b2lkIENQbHVnaW5XaW46OlNpemVDaGFuZ2VkKCkNCiAgICAg ICAgICB3aW5kb3cueSA9IDA7DQogICAgICAgICAgd2luZG93LndpZHRoID0gcmVjdC5XaWR0aCgp Ow0KICAgICAgICAgIHdpbmRvdy5oZWlnaHQgPSByZWN0LkhlaWdodCgpOw0KKyAgICAgICAgIA0K KyAgICAgICAgIFRSZWN0IGNsaXBSZWN0ID0gaVBsdWdpblNraW4tPlBsdWdpbldpbkNsaXBSZWN0 KCk7DQorICAgICAgICAgd2luZG93LmNsaXBSZWN0LnRvcCA9IGNsaXBSZWN0LmlUbC5pWDsNCisg ICAgICAgICB3aW5kb3cuY2xpcFJlY3QubGVmdCA9IGNsaXBSZWN0LmlUbC5pWTsNCisgICAgICAg ICB3aW5kb3cuY2xpcFJlY3QuYm90dG9tID1jbGlwUmVjdC5pQnIuaVg7DQorICAgICAgICAgd2lu ZG93LmNsaXBSZWN0LnJpZ2h0ID0gY2xpcFJlY3QuaUJyLmlZOw0KKyAgICAgICAgDQogICAgICAg ICAgd2luZG93LnR5cGUgPSBOUFdpbmRvd1R5cGVEcmF3YWJsZTsNCiAgICAgICAgICBpUGx1Z2lu RnVuY3MtPnNldHdpbmRvdyggaUluc3RhbmNlLCAmd2luZG93ICk7DQogICAgICAgICAgaUlzRXh0 ZW50U2V0ID0gRVRydWU7DQo=