53805 2011-02-04 13:10:31 -0800 WebKit2 on Windows should use DrawingAreaProxyImpl 2011-02-12 08:03:39 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Windows XP RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 53875 53878 53879 54123 54141 54142 54145 45567 53877 1 aroben aroben andersca oldest_to_newest 345723 0 aroben 2011-02-04 13:10:31 -0800 Now that WebKit2 on Mac has switched over to DrawingAreaProxyImpl, we should switch on Windows, too. Anders says we need to: 1) Implement BackingStoreWin - should be simple, probably just need a DIB or something 2) change the implementation of PageClient::createDrawingAreaProxy to return a new DrawingAreaProxyImpl 3) remove a bunch of #if !PLATFORM(MAC) #error directives 4) Change WebView::onPaintEvent/WebView::onPrintClientEvent to paint the way -[WKView drawRect:] does 345724 1 aroben 2011-02-04 13:11:01 -0800 <rdar://problem/8960666> 346314 2 81410 aroben 2011-02-06 08:56:28 -0800 Created attachment 81410 Make it possible to use DrawingAreaProxyImpl on Windows 346316 3 81410 aroben 2011-02-06 09:00:09 -0800 Comment on attachment 81410 Make it possible to use DrawingAreaProxyImpl on Windows Whoops, wrong bug! 346763 4 aroben 2011-02-07 13:21:19 -0800 Committed r77839: <http://trac.webkit.org/changeset/77839> 346764 5 aroben 2011-02-07 13:21:52 -0800 (In reply to comment #4) > Committed r77839: <http://trac.webkit.org/changeset/77839> Whoops, wrong bug! 348583 6 81877 aroben 2011-02-09 14:36:25 -0800 Created attachment 81877 Turn on the new drawing area on Windows 348947 7 aroben 2011-02-10 04:43:40 -0800 Committed r78201: <http://trac.webkit.org/changeset/78201> 81410 2011-02-06 08:56:28 -0800 2011-02-06 09:00:09 -0800 Make it possible to use DrawingAreaProxyImpl on Windows bug-53805-20110206115626.patch text/plain 11079 aroben ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhMTcxZTBmNmYxY2MwNjc4YThjZGJhZTAwNjdkOGRiMzQ5OTZhMzM4Li4w Yzg5NjZmZWUxZDc4ZWE1NGUxMTY3ODJmMWQ4YmMyN2FjZTgwYzlhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsNTEgQEAKIDIwMTEtMDItMDYgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgog CisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8gdXNlIERyYXdpbmdBcmVhUHJveHlJbXBsIG9u IFdpbmRvd3MKKworICAgICAgICBJdCBjYW4gYmUgb3B0aW9uYWxseSB0dXJuZWQgb24gYnkgc2V0 dGluZyB0aGUgV0VCS0lUMl9VU0VfTkVXX0RSQVdJTkdfQVJFQSBlbnZpcm9ubWVudAorICAgICAg ICB2YXJpYWJsZS4gVHVybmluZyBpdCBvbiBieSBkZWZhdWx0IGlzIGNvdmVyZWQgYnkgPGh0dHA6 Ly93ZWJraXQub3JnL2IvNTM4MDU+LgorCisgICAgICAgIEZpeGVzIDxodHRwOi8vd2Via2l0Lm9y Zy9iLzUzODc5Pi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9CYWNraW5nU3RvcmUuaDogQWRkIGFuIG1fYml0bWFwIG1lbWJlciBv biBXaW5kb3dzLgorCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9CYWNraW5nU3RvcmVXaW4uY3Bw OgorICAgICAgICAoV2ViS2l0OjpCaXRtYXBEQzo6b3BlcmF0b3IgSERDKToKKyAgICAgICAgKFdl YktpdDo6Qml0bWFwREM6OkJpdG1hcERDKToKKyAgICAgICAgKFdlYktpdDo6Qml0bWFwREM6On5C aXRtYXBEQyk6CisgICAgICAgIEFkZGVkIHRoaXMgaGVscGVyIGNsYXNzLCB3aGljaCB1c2VzIFJB SUkgdG8gc2VsZWN0IGEgYml0bWFwIGludG8gYSBuZXcgbWVtb3J5IERDLgorICAgICAgICAoV2Vi S2l0OjpCYWNraW5nU3RvcmU6OnBhaW50KTogV3JhcCBvdXIgYml0bWFwIGluIGEgQml0bWFwREMg YW5kIHVzZSA6OkJpdEJsdCB0byBjb3B5IHRoZQorICAgICAgICBzcGVjaWZpZWQgcmVjdCBpbnRv IHRoZSBkZXN0aW5hdGlvbiBEQy4KKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlQml0bWFwKTogTmV3 IGhlbHBlciBmdW5jdGlvbiwganVzdCBjcmVhdGVzIGEgRElCIHNlY3Rpb24gd2l0aCB0aGUgc3Bl Y2lmaWVkCisgICAgICAgIHNpemUuCisgICAgICAgIChXZWJLaXQ6OkJhY2tpbmdTdG9yZTo6aW5j b3Jwb3JhdGVVcGRhdGUpOiBQb3J0ZWQgZnJvbSBCYWNraW5nU3RvcmVNYWMubW0uIEl0IHNlZW1z IGxpa2UKKyAgICAgICAgdGhpcyBjb2RlIGNvdWxkIGJlIHNoYXJlZCBhdCBzb21lIHBvaW50Lgor ICAgICAgICAoV2ViS2l0OjpCYWNraW5nU3RvcmU6OnNjcm9sbCk6IFdyYXAgb3VyIGJpdG1hcCBp biBhIEJpdG1hcERDIGFuZCB1c2UgOjpTY3JvbGxEQyB0byBzY3JvbGwKKyAgICAgICAgdGhlIHNw ZWNpZmllZCByZWN0LgorCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6dXNlTmV3RHJhd2luZ0FyZWEpOiBBZGRlZC4gUmV0dXJucyB0cnVlIGlm IHRoZSBXRUJLSVQyX1VTRV9ORVdfRFJBV0lOR19BUkVBCisgICAgICAgIGVudmlyb25tZW50IHZh cmlhYmxlIGlzIHNldC4KKyAgICAgICAgKFdlYktpdDo6ZHJhd1BhZ2VCYWNrZ3JvdW5kKTogTmV3 IGhlbHBlciBmdW5jdGlvbi4gQ29kZSBjYW1lIGZyb20gb25QYWludEV2ZW50LgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3OjpvblBhaW50RXZlbnQpOiBQb3J0ZWQgZnJvbSAtW1dLVmlldyBkcmF3 UmVjdDpdLgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5 KTogQ3JlYXRlIGEgRHJhd2luZ0FyZWFQcm94eUltcGwgaWYgd2UncmUgdXNpbmcgdGhlCisgICAg ICAgIG5ldyBkcmF3aW5nIGFyZWEuCisKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6ZW50ZXJB Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmV4 aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6 OnBhZ2VEaWRFbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmcpOgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWV3OjpwYWdlRGlkTGVhdmVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKToKKyAgICAgICAgQWRk ZWQgc29tZSBhc3NlcnRpb25zIHRvIG1ha2Ugc3VyZSB0aGVzZSBhcmUgb25seSBjYWxsZWQgd2hl biBleHBlY3RlZC4gV2UgZG9uJ3QgZXhwZWN0CisgICAgICAgIGVudGVyL2V4aXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZSB0byBiZSBjYWxsZWQgYXQgYWxsIHJpZ2h0IG5vdywgYmVjYXVzZSBh Y2NlbGVyYXRlZAorICAgICAgICBjb21wb3NpdGluZyBpcyB0dXJuZWQgb2ZmIGluIFdlYktpdDIg b24gV2luZG93cy4KKworICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojpzd2l0Y2hUb0RyYXdpbmdB cmVhVHlwZUlmTmVjZXNzYXJ5KTogRGl0dG8sIGFuZCBhZGRlZCBhIGNhc2UgZm9yIHRoZQorICAg ICAgICBEcmF3aW5nQXJlYUluZm86OkltcGwgY29uc3RhbnQuCisKKzIwMTEtMDItMDYgIEFkYW0g Um9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCiAgICAgICAgIFN0YXJ0IGNvbXBpbGluZyBEcmF3 aW5nQXJlYVtQcm94eV1JbXBsIGFuZCBkZXBlbmRlbmNpZXMgb24gV2luZG93cwogCiAgICAgICAg IEZpeGVzIDxodHRwOi8vd2Via2l0Lm9yZy9iLzUzODc1PiBXZWJLaXQyIG9uIFdpbmRvd3Mgc2hv dWxkIGJ1aWxkIERyYXdpbmdBcmVhW1Byb3h5XUltcGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9CYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9C YWNraW5nU3RvcmUuaAppbmRleCA2YzlhMmU4NzVmMDM4MjNmYTExOTZjYmQxMTQ4NWY1YzlhOTI2 OTQ2Li5lYWNkOTllNDVlMmRkYjgxNWFkMjdlY2RkMTEyNmYxYjhhZDkyMWQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0JhY2tpbmdTdG9yZS5oCkBAIC0zMiw2ICszMiw4IEBACiAKICNpZiBQ TEFURk9STShNQUMpCiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorI2VsaWYgUExBVEZPUk0o V0lOKQorI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CkBAIC03Niw2ICs3OCw4IEBAIHByaXZhdGU6CiAKICAgICBSZXRhaW5QdHI8Q0dMYXllclJl Zj4gbV9jZ0xheWVyOwogICAgIFJldGFpblB0cjxDR0NvbnRleHRSZWY+IG1fYml0bWFwQ29udGV4 dDsKKyNlbGlmIFBMQVRGT1JNKFdJTikKKyAgICBPd25QdHI8SEJJVE1BUD4gbV9iaXRtYXA7CiAj ZW5kaWYKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vQmFj a2luZ1N0b3JlV2luLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vQmFja2luZ1N0 b3JlV2luLmNwcAppbmRleCAyMDhlMmZiNjRjZTU5ZGFmNGIyNTE5OTkwMmFhMjBhOGU0OTliMTBm Li44MDEzNzZmOWJjNDdhMDQ2NjljOTcxYmIyNThjZDE1ZTQyOGMzYjkwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL0JhY2tpbmdTdG9yZVdpbi5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9CYWNraW5nU3RvcmVXaW4uY3BwCkBAIC0yNiwyNSAr MjYsODQgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJCYWNraW5nU3RvcmUuaCIK IAotI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCisjaW5jbHVkZSAiU2hhcmVhYmxlQml0bWFw LmgiCisjaW5jbHVkZSAiVXBkYXRlSW5mby5oIgorI2luY2x1ZGUgPFdlYkNvcmUvQml0bWFwSW5m by5oPgorI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CisjaW5jbHVkZSA8V2Vi Q29yZS9JbnRSZWN0Lmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAotdm9pZCBCYWNraW5nU3RvcmU6OnBhaW50KEhEQywgY29uc3QgSW50UmVjdCYp CitjbGFzcyBCaXRtYXBEQyB7CisgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoQml0bWFwREMpOwor CitwdWJsaWM6CisgICAgQml0bWFwREMoSEJJVE1BUCwgSERDIGRlc3RpbmF0aW9uREMpOworICAg IH5CaXRtYXBEQygpOworCisgICAgb3BlcmF0b3IgSERDKCkgY29uc3QgeyByZXR1cm4gbV9kYy5n ZXQoKTsgfQorCitwcml2YXRlOgorICAgIE93blB0cjxIREM+IG1fZGM7CisgICAgSEJJVE1BUCBt X29yaWdpbmFsQml0bWFwOworfTsKKworQml0bWFwREM6OkJpdG1hcERDKEhCSVRNQVAgYml0bWFw LCBIREMgZGVzdGluYXRpb25EQykKKyAgICA6IG1fZGMoYWRvcHRQdHIoOjpDcmVhdGVDb21wYXRp YmxlREMoZGVzdGluYXRpb25EQykpKQorICAgICwgbV9vcmlnaW5hbEJpdG1hcChzdGF0aWNfY2Fz dDxIQklUTUFQPig6OlNlbGVjdE9iamVjdChtX2RjLmdldCgpLCBiaXRtYXApKSkKK3sKK30KKwor Qml0bWFwREM6On5CaXRtYXBEQygpCit7CisgICAgOjpTZWxlY3RPYmplY3QobV9kYy5nZXQoKSwg bV9vcmlnaW5hbEJpdG1hcCk7Cit9CisKK3ZvaWQgQmFja2luZ1N0b3JlOjpwYWludChIREMgZGMs IGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBBU1NF UlQobV9iaXRtYXApOworICAgIDo6Qml0Qmx0KGRjLCByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qu d2lkdGgoKSwgcmVjdC5oZWlnaHQoKSwgQml0bWFwREMobV9iaXRtYXAuZ2V0KCksIGRjKSwgcmVj dC54KCksIHJlY3QueSgpLCBTUkNDT1BZKTsKIH0KIAotdm9pZCBCYWNraW5nU3RvcmU6OmluY29y cG9yYXRlVXBkYXRlKFNoYXJlYWJsZUJpdG1hcCosIGNvbnN0IFVwZGF0ZUluZm8mKQorc3RhdGlj IFBhc3NPd25QdHI8SEJJVE1BUD4gY3JlYXRlQml0bWFwKGNvbnN0IEludFNpemUmIHNpemUpCiB7 Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAvLyBGSVhNRTogTWF5YmUgaXQgd291bGQgYmUg YmV0dGVyIGZvciBwZXJmb3JtYW5jZSB0byBjcmVhdGUgYSBkZXZpY2UtZGVwZW5kZW50IGJpdG1h cCBoZXJlPworICAgIEJpdG1hcEluZm8gaW5mbyA9IEJpdG1hcEluZm86OmNyZWF0ZUJvdHRvbVVw KHNpemUpOworICAgIHZvaWQqIGJpdHM7CisgICAgcmV0dXJuIGFkb3B0UHRyKDo6Q3JlYXRlRElC U2VjdGlvbigwLCAmaW5mbywgRElCX1JHQl9DT0xPUlMsICZiaXRzLCAwLCAwKSk7CiB9CiAKLXZv aWQgQmFja2luZ1N0b3JlOjpzY3JvbGwoY29uc3QgSW50UmVjdCYsIGNvbnN0IEludFNpemUmKQor dm9pZCBCYWNraW5nU3RvcmU6OmluY29ycG9yYXRlVXBkYXRlKFNoYXJlYWJsZUJpdG1hcCogYml0 bWFwLCBjb25zdCBVcGRhdGVJbmZvJiB1cGRhdGVJbmZvKQogewotICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgaWYgKCFtX2JpdG1hcCkKKyAgICAgICAgbV9iaXRtYXAgPSBjcmVhdGVCaXRtYXAo bV9zaXplKTsKKworICAgIHNjcm9sbCh1cGRhdGVJbmZvLnNjcm9sbFJlY3QsIHVwZGF0ZUluZm8u c2Nyb2xsT2Zmc2V0KTsKKworICAgIEludFBvaW50IHVwZGF0ZVJlY3RMb2NhdGlvbiA9IHVwZGF0 ZUluZm8udXBkYXRlUmVjdEJvdW5kcy5sb2NhdGlvbigpOworCisgICAgQml0bWFwREMgZGMobV9i aXRtYXAuZ2V0KCksIDApOworICAgIEdyYXBoaWNzQ29udGV4dCBncmFwaGljc0NvbnRleHQoZGMp OworCisgICAgLy8gUGFpbnQgYWxsIHVwZGF0ZSByZWN0cy4KKyAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IHVwZGF0ZUluZm8udXBkYXRlUmVjdHMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgSW50 UmVjdCB1cGRhdGVSZWN0ID0gdXBkYXRlSW5mby51cGRhdGVSZWN0c1tpXTsKKyAgICAgICAgSW50 UmVjdCBzcmNSZWN0ID0gdXBkYXRlUmVjdDsKKyAgICAgICAgc3JjUmVjdC5tb3ZlKC11cGRhdGVS ZWN0TG9jYXRpb24ueCgpLCAtdXBkYXRlUmVjdExvY2F0aW9uLnkoKSk7CisKKyAgICAgICAgYml0 bWFwLT5wYWludChncmFwaGljc0NvbnRleHQsIHVwZGF0ZVJlY3QubG9jYXRpb24oKSwgc3JjUmVj dCk7CisgICAgfQorfQorCit2b2lkIEJhY2tpbmdTdG9yZTo6c2Nyb2xsKGNvbnN0IEludFJlY3Qm IHNjcm9sbFJlY3QsIGNvbnN0IEludFNpemUmIHNjcm9sbE9mZnNldCkKK3sKKyAgICBpZiAoc2Ny b2xsT2Zmc2V0LmlzWmVybygpKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUNUIHdpblNjcm9s bFJlY3QgPSBzY3JvbGxSZWN0OworICAgIDo6U2Nyb2xsREMoQml0bWFwREMobV9iaXRtYXAuZ2V0 KCksIDApLCBzY3JvbGxPZmZzZXQud2lkdGgoKSwgc2Nyb2xsT2Zmc2V0LmhlaWdodCgpLCAmd2lu U2Nyb2xsUmVjdCwgJndpblNjcm9sbFJlY3QsIDAsIDApOwogfQogCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCmluZGV4IDE4MTVl NWE2OWZlNjMwMjQwNGM1NTQ3YzdiM2M1MjZkYmVkZGUxN2MuLmY4NzM1MDZjYmYzYTJkNTYyYmQy ZTkzMTFhY2IzYjYwNDIxOTQ4NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy93aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJW aWV3LmNwcApAQCAtMjcsMTAgKzI3LDEyIEBACiAjaW5jbHVkZSAiV2ViVmlldy5oIgogCiAjaW5j bHVkZSAiQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkuaCIKKyNpbmNsdWRlICJEcmF3aW5n QXJlYVByb3h5SW1wbC5oIgogI2luY2x1ZGUgIkZpbmRJbmRpY2F0b3IuaCIKICNpbmNsdWRlICJM YXllckJhY2tlZERyYXdpbmdBcmVhUHJveHkuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5j bHVkZSAiTmF0aXZlV2ViS2V5Ym9hcmRFdmVudC5oIgorI2luY2x1ZGUgIlJlZ2lvbi5oIgogI2lu Y2x1ZGUgIlJ1bkxvb3AuaCIKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJXZWJD b250ZXh0LmgiCkBAIC04MCw2ICs4MiwxMyBAQCBlbnVtIHsKICAgICBVcGRhdGVBY3RpdmVTdGF0 ZVRpbWVyID0gMSwKIH07CiAKK3N0YXRpYyBib29sIHVzZU5ld0RyYXdpbmdBcmVhKCkKK3sKKyAg ICAvLyBGSVhNRTogVHVybiB0aGlzIG9uIGJ5IGRlZmF1bHQgPGh0dHA6Ly93ZWJraXQub3JnL2Iv NTM4Nzc+LgorICAgIHN0YXRpYyBib29sIHVzZU5ld0RyYXdpbmdBcmVhID0gZ2V0ZW52KCJXRUJL SVQyX1VTRV9ORVdfRFJBV0lOR19BUkVBIik7CisgICAgcmV0dXJuIHVzZU5ld0RyYXdpbmdBcmVh OworfQorCiBMUkVTVUxUIENBTExCQUNLIFdlYlZpZXc6OldlYlZpZXdXbmRQcm9jKEhXTkQgaFdu ZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQogewogICAgIExP TkdfUFRSIGxvbmdQdHIgPSA6OkdldFdpbmRvd0xvbmdQdHIoaFduZCwgMCk7CkBAIC0zOTUsMTgg KzQwNCwzOSBAQCBMUkVTVUxUIFdlYlZpZXc6Om9uS2V5RXZlbnQoSFdORCBoV25kLCBVSU5UIG1l c3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYQogICAgIHJldHVybiAwOwogfQogCitz dGF0aWMgdm9pZCBkcmF3UGFnZUJhY2tncm91bmQoSERDIGRjLCBjb25zdCBSRUNUJiByZWN0KQor eworICAgIC8vIE1hYyBjaGVja3MgV2ViUGFnZVByb3h5OjpkcmF3c0JhY2tncm91bmQgYW5kCisg ICAgLy8gV2ViUGFnZVByb3h5OjpkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCBoZXJlLCBidXQg dGhvc2UgYXJlIGFsd2F5cyBmYWxzZSBvbgorICAgIC8vIFdpbmRvd3MgY3VycmVudGx5IChzZWUg PGh0dHA6Ly93ZWJraXQub3JnL2IvNTIwMDk+KS4KKyAgICA6OkZpbGxSZWN0KGRjLCAmcmVjdCwg cmVpbnRlcnByZXRfY2FzdDxIQlJVU0g+KENPTE9SX1dJTkRPVyArIDEpKTsKK30KKwogTFJFU1VM VCBXZWJWaWV3OjpvblBhaW50RXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSwg TFBBUkFNLCBib29sJiBoYW5kbGVkKQogewogICAgIFBBSU5UU1RSVUNUIHBhaW50U3RydWN0Owog ICAgIEhEQyBoZGMgPSA6OkJlZ2luUGFpbnQobV93aW5kb3csICZwYWludFN0cnVjdCk7CiAKLSAg ICBpZiAobV9wYWdlLT5pc1ZhbGlkKCkgJiYgbV9wYWdlLT5kcmF3aW5nQXJlYSgpICYmIG1fcGFn ZS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoSW50UmVjdChwYWludFN0cnVjdC5yY1BhaW50KSwgaGRj KSkKKyAgICBpZiAodXNlTmV3RHJhd2luZ0FyZWEoKSkgeworICAgICAgICBpZiAoRHJhd2luZ0Fy ZWFQcm94eUltcGwqIGRyYXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94eUlt cGwqPihtX3BhZ2UtPmRyYXdpbmdBcmVhKCkpKSB7CisgICAgICAgICAgICAvLyBGSVhNRTogV2Ug c2hvdWxkIHBvcnQgV2ViS2l0MSdzIHJlY3QgY29hbGVzY2luZyBsb2dpYyBoZXJlLgorICAgICAg ICAgICAgUmVnaW9uIHVucGFpbnRlZFJlZ2lvbjsKKyAgICAgICAgICAgIGRyYXdpbmdBcmVhLT5w YWludChoZGMsIHBhaW50U3RydWN0LnJjUGFpbnQsIHVucGFpbnRlZFJlZ2lvbik7CisKKyAgICAg ICAgICAgIFZlY3RvcjxJbnRSZWN0PiB1bnBhaW50ZWRSZWN0cyA9IHVucGFpbnRlZFJlZ2lvbi5y ZWN0cygpOworICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB1bnBhaW50ZWRSZWN0 cy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgICAgIFJFQ1Qgd2luUmVjdCA9IHVucGFpbnRl ZFJlY3RzW2ldOworICAgICAgICAgICAgICAgIGRyYXdQYWdlQmFja2dyb3VuZChoZGMsIHVucGFp bnRlZFJlY3RzW2ldKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICBkcmF3UGFnZUJhY2tncm91bmQoaGRjLCBwYWludFN0cnVjdC5yY1BhaW50KTsKKwogICAgICAg ICBtX3BhZ2UtPmRpZERyYXcoKTsKLSAgICBlbHNlIHsKLSAgICAgICAgLy8gTWFjIGNoZWNrcyBX ZWJQYWdlUHJveHk6OmRyYXdzQmFja2dyb3VuZCBhbmQKLSAgICAgICAgLy8gV2ViUGFnZVByb3h5 OjpkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCBoZXJlLCBidXQgdGhvc2UgYXJlIGFsd2F5cyBm YWxzZSBvbiBXaW5kb3dzCi0gICAgICAgIC8vIGN1cnJlbnRseSAoc2VlIDxodHRwOi8vd2Via2l0 Lm9yZy9iLzUyMDA5PikuCi0gICAgICAgIDo6RmlsbFJlY3QoaGRjLCAmcGFpbnRTdHJ1Y3QucmNQ YWludCwgcmVpbnRlcnByZXRfY2FzdDxIQlJVU0g+KENPTE9SX1dJTkRPVyArIDEpKTsKKyAgICB9 IGVsc2UgeworICAgICAgICBpZiAobV9wYWdlLT5pc1ZhbGlkKCkgJiYgbV9wYWdlLT5kcmF3aW5n QXJlYSgpICYmIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoSW50UmVjdChwYWludFN0cnVj dC5yY1BhaW50KSwgaGRjKSkKKyAgICAgICAgICAgIG1fcGFnZS0+ZGlkRHJhdygpOworICAgICAg ICBlbHNlCisgICAgICAgICAgICBkcmF3UGFnZUJhY2tncm91bmQoaGRjLCBwYWludFN0cnVjdC5y Y1BhaW50KTsKICAgICB9CiAKICAgICA6OkVuZFBhaW50KG1fd2luZG93LCAmcGFpbnRTdHJ1Y3Qp OwpAQCAtNTkxLDYgKzYyMSw5IEBAIHZvaWQgV2ViVmlldzo6Y2xvc2UoKQogCiBQYXNzT3duUHRy PERyYXdpbmdBcmVhUHJveHk+IFdlYlZpZXc6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQogewor ICAgIGlmICh1c2VOZXdEcmF3aW5nQXJlYSgpKQorICAgICAgICByZXR1cm4gRHJhd2luZ0FyZWFQ cm94eUltcGw6OmNyZWF0ZShtX3BhZ2UuZ2V0KCkpOworCiAgICAgcmV0dXJuIENodW5rZWRVcGRh dGVEcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUodGhpcywgbV9wYWdlLmdldCgpKTsKIH0KIApAQCAt MTA5NSwzMiArMTEyOCw0MSBAQCB2b2lkIFdlYlZpZXc6OnNldElzSW5XaW5kb3coYm9vbCBpc0lu V2luZG93KQogCiB2b2lkIFdlYlZpZXc6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUo Y29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpCiB7CisgICAgQVNTRVJUKHVzZU5ld0RyYXdpbmdBcmVh KCkpOwogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiB9CiAKIHZvaWQgV2ViVmlldzo6ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkKIHsK KyAgICBBU1NFUlQodXNlTmV3RHJhd2luZ0FyZWEoKSk7CiAgICAgLy8gRklYTUU6IEltcGxlbWVu dC4KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAogdm9pZCBXZWJWaWV3OjpwYWdlRGlk RW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkKIHsKKyAgICBBU1NFUlQoIXVzZU5ld0RyYXdp bmdBcmVhKCkpOwogICAgIHN3aXRjaFRvRHJhd2luZ0FyZWFUeXBlSWZOZWNlc3NhcnkoRHJhd2lu Z0FyZWFJbmZvOjpMYXllckJhY2tlZCk7CiB9CiAKIHZvaWQgV2ViVmlldzo6cGFnZURpZExlYXZl QWNjZWxlcmF0ZWRDb21wb3NpdGluZygpCiB7CisgICAgQVNTRVJUKCF1c2VOZXdEcmF3aW5nQXJl YSgpKTsKICAgICBzd2l0Y2hUb0RyYXdpbmdBcmVhVHlwZUlmTmVjZXNzYXJ5KERyYXdpbmdBcmVh SW5mbzo6Q2h1bmtlZFVwZGF0ZSk7CiB9CiAKIHZvaWQgV2ViVmlldzo6c3dpdGNoVG9EcmF3aW5n QXJlYVR5cGVJZk5lY2Vzc2FyeShEcmF3aW5nQXJlYUluZm86OlR5cGUgdHlwZSkKIHsKKyAgICBB U1NFUlQoIXVzZU5ld0RyYXdpbmdBcmVhKCkpOworCiAgICAgRHJhd2luZ0FyZWFJbmZvOjpUeXBl IGV4aXN0aW5nRHJhd2luZ0FyZWFUeXBlID0gbV9wYWdlLT5kcmF3aW5nQXJlYSgpID8gbV9wYWdl LT5kcmF3aW5nQXJlYSgpLT5pbmZvKCkudHlwZSA6IERyYXdpbmdBcmVhSW5mbzo6Tm9uZTsKICAg ICBpZiAoZXhpc3RpbmdEcmF3aW5nQXJlYVR5cGUgPT0gdHlwZSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IG5ld0RyYXdpbmdBcmVhOwogICAgIHN3aXRj aCAodHlwZSkgeworICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpJbXBsOgogICAgIGNhc2UgRHJh d2luZ0FyZWFJbmZvOjpOb25lOgogICAgICAgICBicmVhazsKICAgICBjYXNlIERyYXdpbmdBcmVh SW5mbzo6Q2h1bmtlZFVwZGF0ZToK 81877 2011-02-09 14:36:25 -0800 2011-02-09 15:30:25 -0800 Turn on the new drawing area on Windows bug-53805-20110209173623.patch text/plain 1608 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogNzgwNTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjZmY3Y2U1Mjk4YWFlZmI2 Y2FjMDM2ZjdjZDE0MGE1ZWY1YjlhOTgyLi41OTljYjhkZmI4MjliOWY5MTMwNzg0YTc3NjBlYWE0 NTI0ZTRiNzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTEtMDItMDkgIEFkYW0g Um9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCisgICAgICAgIFR1cm4gb24gdGhlIG5ldyBkcmF3 aW5nIGFyZWEgb24gV2luZG93cworCisgICAgICAgIEZpeGVzIDxodHRwOi8vd2Via2l0Lm9yZy9i LzUzODA1PiA8cmRhcjovL3Byb2JsZW0vODk2MDY2Nj4gV2ViS2l0MiBvbiBXaW5kb3dzIHNob3Vs ZCB1c2UKKyAgICAgICAgRHJhd2luZ0FyZWFQcm94eUltcGwKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHA6 CisgICAgICAgIChXZWJLaXQ6OnVzZU5ld0RyYXdpbmdBcmVhKTogUmV0dXJuIHRydWUhCisKKzIw MTEtMDItMDkgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCiAgICAgICAgIEhvb2sg dXAgV01fUFJJTlQgdG8gdGhlIG5ldyBkcmF3aW5nIGFyZWEKIAogICAgICAgICBGaXhlcyA8aHR0 cDovL3dlYmtpdC5vcmcvYi81NDE0NT4gPHJkYXI6Ly9wcm9ibGVtLzg5Nzk1NTk+IFdNX1BSSU5U IGRvZXNuJ3Qgd29yayB3aXRoIG5ldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmll dy5jcHAKaW5kZXggMGNjODA2NzBkZDBlNDY4ODE2YzI1MjE4YWQxZjljNzE0MWMxOWQ5Yi4uNTc3 OTQ3Yjc1MTA3N2RiNDQ0YTBlZDlkMjI4MDQwNjhjZWUyYjI2ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCkBAIC04NCw5ICs4NCw5IEBAIGVudW0gewogCiBzdGF0 aWMgYm9vbCB1c2VOZXdEcmF3aW5nQXJlYSgpCiB7Ci0gICAgLy8gRklYTUU6IFR1cm4gdGhpcyBv biBieSBkZWZhdWx0IDxodHRwOi8vd2Via2l0Lm9yZy9iLzUzODc3Pi4KLSAgICBzdGF0aWMgYm9v bCB1c2VOZXdEcmF3aW5nQXJlYSA9IGdldGVudigiV0VCS0lUMl9VU0VfTkVXX0RSQVdJTkdfQVJF QSIpOwotICAgIHJldHVybiB1c2VOZXdEcmF3aW5nQXJlYTsKKyAgICAvLyBGSVhNRTogUmVtb3Zl IHRoaXMgZnVuY3Rpb24gYW5kIHRoZSBvbGQgZHJhd2luZyBhcmVhIGNvZGUgb25jZSB3ZSBhcmVu J3QgaW50ZXJlc3RlZCBpbgorICAgIC8vIHRlc3RpbmcgdGhlIG9sZCBkcmF3aW5nIGFyZWEgYW55 bW9yZS4KKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogTFJFU1VMVCBDQUxMQkFDSyBXZWJWaWV3OjpX ZWJWaWV3V25kUHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBB UkFNIGxQYXJhbSkK