148085 2015-08-17 12:20:35 -0700 [WinCairo] Accelerated compositing does not respect device scale factor. 2015-08-17 13:40:17 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 peavo webkit-unassigned achristensen bfulgham oldest_to_newest 1118189 0 peavo 2015-08-17 12:20:35 -0700 Painting in accelerated compositing mode on WinCairo needs to take the device scale factor into account. 1118191 1 259171 peavo 2015-08-17 12:30:27 -0700 Created attachment 259171 Patch 1118192 2 259171 achristensen 2015-08-17 12:40:27 -0700 Comment on attachment 259171 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259171&action=review does this fix pages like acko.net ? > Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp:166 > + TransformationMatrix m; > + m.scale(deviceScaleFactor()); > + double tx = (size.width() - size.width() / deviceScaleFactor()) / 2.0; > + double ty = (size.height() - size.height() / deviceScaleFactor()) / 2.0; > + m.translate(tx, ty); Why scale then translate? Where does the 2.0 come from? 1118193 3 259171 bfulgham 2015-08-17 12:41:46 -0700 Comment on attachment 259171 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259171&action=review r=me, with a few minor corrections. > Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp:165 > + double ty = (size.height() - size.height() / deviceScaleFactor()) / 2.0; Is this to center the view? > Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h:55 > + virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& rectToPaint) override; Please remove 'virtual' for any methods that are 'override'. 1118196 4 peavo 2015-08-17 12:46:18 -0700 (In reply to comment #3) > Comment on attachment 259171 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=259171&action=review > > r=me, with a few minor corrections. > Thanks! > > Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp:165 > > + double ty = (size.height() - size.height() / deviceScaleFactor()) / 2.0; > > Is this to center the view? > Yes, I will add a comment before landing. > > Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h:55 > > + virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& rectToPaint) override; > > Please remove 'virtual' for any methods that are 'override'. Ok, I will remove 'virtual' before landing :) 1118197 5 peavo 2015-08-17 12:48:20 -0700 (In reply to comment #2) > Comment on attachment 259171 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=259171&action=review > Thanks for reviewing :) > does this fix pages like acko.net ? > Yes, I believe so. > > Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp:166 > > + TransformationMatrix m; > > + m.scale(deviceScaleFactor()); > > + double tx = (size.width() - size.width() / deviceScaleFactor()) / 2.0; > > + double ty = (size.height() - size.height() / deviceScaleFactor()) / 2.0; > > + m.translate(tx, ty); > > Why scale then translate? Where does the 2.0 come from? The translate will center the view. 1118214 6 peavo 2015-08-17 13:25:46 -0700 Committed r188537: <http://trac.webkit.org/changeset/188537>. 1118222 7 achristensen 2015-08-17 13:33:46 -0700 Looks great! Thanks! 1118225 8 peavo 2015-08-17 13:40:17 -0700 (In reply to comment #7) > Looks great! Thanks! Glad to hear it :) 259171 2015-08-17 12:30:27 -0700 2015-08-17 12:41:46 -0700 Patch bug-148085-20150817212804.patch text/plain 5179 peavo SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODUzMikKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA4LTE3 ICBQZXIgQXJuZSBWb2xsYW4gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luQ2Fp cm9dIEFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGRvZXMgbm90IHJlc3BlY3QgZGV2aWNlIHNjYWxl IGZhY3Rvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0ODA4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFNjYWxlIHJvb3QgbGF5ZXIncyB0cmFuc2Zvcm1hdGlvbiBtYXRyaXggd2l0aCBkZXZpY2Ugc2Nh bGUgZmFjdG9yLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6 OmluaXRpYWxpemUpOgorICAgICAgICAoQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnN0 YXJ0ZWRBbmltYXRpb24pOgorICAgICAgICAoQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6 OmFwcGx5RGV2aWNlU2NhbGVGYWN0b3IpOgorICAgICAgICAoQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0NvbnRleHQ6OmNvbXBvc2l0ZUxheWVyc1RvQ29udGV4dCk6CisgICAgICAgIChBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dDo6cmVzaXplUm9vdExheWVyKToKKyAgICAgICAgKEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0OjpmbHVzaEFuZFJlbmRlckxheWVycyk6CisgICAgICAgIChB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cGFpbnRDb250ZW50cyk6CisgICAgICAgIChB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6ZGV2aWNlU2NhbGVGYWN0b3IpOgorICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Lmg6CisgICAg ICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpyZXBhaW50KToKKwogMjAxNS0w OC0xNyAgU3VuZ21hbm4gQ2hvICA8c3VuZ21hbm4uY2hvQG5hdmVyY29ycC5jb20+CiAKICAgICAg ICAgW1dpbl0gQ2xlYW51cHMgdG8gUGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVudCgpLgpJbmRl eDogU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDE4ODUzMikKKysrIFNvdXJjZS9XZWJLaXQv d2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MzgsNyArODM4LDcgQEAgdm9pZCBX ZWJWaWV3OjpyZXBhaW50KGNvbnN0IFdlYkNvcmU6OkludAogICAgIGlmIChpc0FjY2VsZXJhdGVk Q29tcG9zaXRpbmcoKSkgewogICAgICAgICAvLyBUaGUgY29udGVudENoYW5nZWQsIGltbWVkaWF0 ZSwgYW5kIHJlcGFpbnRDb250ZW50T25seSBwYXJhbWV0ZXJzIGFyZSBhbGwgYmFzZWQgb24gYSBu b24tCiAgICAgICAgIC8vIGNvbXBvc2l0aW5nIHBhaW50aW5nL3Njcm9sbGluZyBtb2RlbC4KLSAg ICAgICAgYWRkVG9EaXJ0eVJlZ2lvbih3aW5kb3dSZWN0KTsKKyAgICAgICAgYWRkVG9EaXJ0eVJl Z2lvbihsb2dpY2FsV2luZG93UmVjdCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdD b250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9y dC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC5jcHAJKHJldmlzaW9uIDE4ODUzMikKKysr IFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdD b250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODIsNiArODIsOCBAQCB2b2lkIEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0Ojppbml0CiAgICAgbV9yb290TGF5ZXItPnNldERyYXdzQ29u dGVudChmYWxzZSk7CiAgICAgbV9yb290TGF5ZXItPnNldFNpemUocGFnZVNpemUpOwogCisgICAg YXBwbHlEZXZpY2VTY2FsZUZhY3RvcigpOworCiAgICAgLy8gVGhlIG5vbi1jb21wb3NpdGVkIGNv bnRlbnRzIGFyZSBhIGNoaWxkIG9mIHRoZSByb290IGxheWVyLgogICAgIG1fbm9uQ29tcG9zaXRl ZENvbnRlbnRMYXllciA9IEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZShudWxscHRyLCAqdGhpcyk7CiAg ICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CkBA IC0xNTAsNiArMTUyLDIxIEBAIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnN0 YXIKICAgICByZXR1cm4gZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KCpsYXll cikubGF5ZXIoKS5kZXNjZW5kYW50c09yU2VsZkhhdmVSdW5uaW5nQW5pbWF0aW9ucygpOwogfQog Cit2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjphcHBseURldmljZVNjYWxlRmFj dG9yKCkKK3sKKyAgICBpZiAoIW1fcm9vdExheWVyKQorICAgICAgICByZXR1cm47CisKKyAgICBj b25zdCBGbG9hdFNpemUmIHNpemUgPSBtX3Jvb3RMYXllci0+c2l6ZSgpOworCisgICAgVHJhbnNm b3JtYXRpb25NYXRyaXggbTsKKyAgICBtLnNjYWxlKGRldmljZVNjYWxlRmFjdG9yKCkpOworICAg IGRvdWJsZSB0eCA9IChzaXplLndpZHRoKCkgLSBzaXplLndpZHRoKCkgLyBkZXZpY2VTY2FsZUZh Y3RvcigpKSAvIDIuMDsKKyAgICBkb3VibGUgdHkgPSAoc2l6ZS5oZWlnaHQoKSAtIHNpemUuaGVp Z2h0KCkgLyBkZXZpY2VTY2FsZUZhY3RvcigpKSAvIDIuMDsKKyAgICBtLnRyYW5zbGF0ZSh0eCwg dHkpOworICAgIG1fcm9vdExheWVyLT5zZXRUcmFuc2Zvcm0obSk7Cit9CisKIHZvaWQgQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmNvbXBvc2l0ZUxheWVyc1RvQ29udGV4dChDb21wb3Np dGVQdXJwb3NlIHB1cnBvc2UpCiB7CiAgICAgaWYgKCFwcmVwYXJlRm9yUmVuZGVyaW5nKCkpCkBA IC0yMjIsNiArMjM5LDggQEAgdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cmVz aQogCiAgICAgbV9yb290TGF5ZXItPnNldFNpemUobmV3U2l6ZSk7CiAKKyAgICBhcHBseURldmlj ZVNjYWxlRmFjdG9yKCk7CisKICAgICAvLyBJZiB0aGUgbmV3U2l6ZSBleHBvc2VzIG5ldyBhcmVh cyBvZiB0aGUgbm9uLWNvbXBvc2l0ZWQgY29udGVudCBhIHNldE5lZWRzRGlzcGxheSBpcyBuZWVk ZWQKICAgICAvLyBmb3IgdGhvc2UgbmV3bHkgZXhwb3NlZCBhcmVhcy4KICAgICBGbG9hdFNpemUg b2xkU2l6ZSA9IG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2l6ZSgpOwpAQCAtMzU4LDYg KzM3Nyw3IEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmZsdXMKICAgICBG cmFtZSYgZnJhbWUgPSBjb3JlKCZtX3dlYlZpZXcpLT5tYWluRnJhbWUoKTsKICAgICBpZiAoIWZy YW1lLmNvbnRlbnRSZW5kZXJlcigpIHx8ICFmcmFtZS52aWV3KCkpCiAgICAgICAgIHJldHVybjsK KwogICAgIGZyYW1lLnZpZXcoKS0+dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vyc2l2 ZSgpOwogCiAgICAgaWYgKCFlbmFibGVkKCkpCkBAIC0zODksNCArNDA5LDkgQEAgdm9pZCBBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cGFpbgogICAgIGNvbnRleHQucmVzdG9yZSgpOwog fQogCitmbG9hdCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6ZGV2aWNlU2NhbGVGYWN0 b3IoKSBjb25zdAoreworICAgIHJldHVybiBtX3dlYlZpZXcuZGV2aWNlU2NhbGVGYWN0b3IoKTsK K30KKwogI2VuZGlmIC8vIFVTRShURVhUVVJFX01BUFBFUl9HTCkKSW5kZXg6IFNvdXJjZS9XZWJL aXQvd2luL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0NvbnRleHQuaAkocmV2aXNpb24gMTg4NTMyKQorKysgU291cmNlL1dlYktpdC93 aW4vV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuaAkod29ya2lu ZyBjb3B5KQpAQCAtNTIsNyArNTIsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBlbmFibGVkKCk7CiAK ICAgICAvLyBHcmFwaGljc0xheWVyQ2xpZW50Ci0gICAgdmlydHVhbCB2b2lkIHBhaW50Q29udGVu dHMoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciosIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dCYsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlLCBjb25zdCBXZWJDb3JlOjpG bG9hdFJlY3QmIHJlY3RUb1BhaW50KTsKKyAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50cyhj b25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Jiwg V2ViQ29yZTo6R3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2UsIGNvbnN0IFdlYkNvcmU6OkZsb2F0 UmVjdCYgcmVjdFRvUGFpbnQpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgZmxvYXQgZGV2aWNlU2Nh bGVGYWN0b3IoKSBjb25zdCBvdmVycmlkZTsKIAogICAgIHZvaWQgaW5pdGlhbGl6ZSgpOwogCkBA IC05NSw2ICs5Niw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdG9wQW55UGVuZGluZ0xheWVyRmx1 c2goKTsKICAgICBib29sIHByZXBhcmVGb3JSZW5kZXJpbmcoKTsKICAgICBib29sIHN0YXJ0ZWRB bmltYXRpb24oV2ViQ29yZTo6R3JhcGhpY3NMYXllciopOworICAgIHZvaWQgYXBwbHlEZXZpY2VT Y2FsZUZhY3RvcigpOwogfTsKIAogI2VuZGlmIC8vIFRFWFRVUkVfTUFQUEVSX0dMCg==