73641 2011-12-02 03:12:52 -0800 WebKit2: Freeze the state of the layer tree until frame load completion if incremental rendering is suppressed 2011-12-02 11:21:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 70086 1 aestes aestes andersca mitz simon.fraser oldest_to_newest 513643 0 aestes 2011-12-02 03:12:52 -0800 WebKit2: Freeze the state of the layer tree until frame load completion if incremental rendering is suppressed 513646 1 117598 aestes 2011-12-02 03:22:07 -0800 Created attachment 117598 Patch 513826 2 117598 darin 2011-12-02 09:15:26 -0800 Comment on attachment 117598 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117598&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:537 > - if (m_frame == m_frame->page()->mainWebFrame()) > + if (m_frame == m_frame->page()->mainWebFrame() && !webPage->corePage()->settings()->suppressIncrementalRendering()) > webPage->drawingArea()->setLayerTreeStateIsFrozen(false); Seems OK, but perhaps a bit of a layering problem that this code needs to check the setting. Not sure why this code gets to the page as m_frame->page() in one half of the expression and as webPage->corePage() in the other. Aren’t those guaranteed to be the same page? 513954 3 aestes 2011-12-02 11:16:24 -0800 (In reply to comment #2) > (From update of attachment 117598 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=117598&action=review > > > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:537 > > - if (m_frame == m_frame->page()->mainWebFrame()) > > + if (m_frame == m_frame->page()->mainWebFrame() && !webPage->corePage()->settings()->suppressIncrementalRendering()) > > webPage->drawingArea()->setLayerTreeStateIsFrozen(false); > > Seems OK, but perhaps a bit of a layering problem that this code needs to check the setting. > > Not sure why this code gets to the page as m_frame->page() in one half of the expression and as webPage->corePage() in the other. Aren’t those guaranteed to be the same page? One is a WebKit2 WebPage and the other is it's corresponding WebCore::Page. I need the WebCore::Page to get at the Settings object. Thanks for the review! 513958 4 aestes 2011-12-02 11:17:13 -0800 I swear I know the difference between it's and its :/ 513964 5 aestes 2011-12-02 11:21:27 -0800 Committed r101838: <http://trac.webkit.org/changeset/101838> 117598 2011-12-02 03:22:07 -0800 2011-12-02 09:15:25 -0800 Patch bug-73641-20111202032210.patch text/plain 4566 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDMxOGFkNmJmNzk0OTVj NWU0ODg0YTkyMzRjYmFjNWVhYzU2MzY4ZC4uNTAxNzYxM2RhYWI5MjNmN2RmMDNjMmM0MDljOGE2 MWE1M2IyOWZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDExLTEyLTAyICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQyOiBGcmVlemUgdGhl IHN0YXRlIG9mIHRoZSBsYXllciB0cmVlIHVudGlsIGZyYW1lIGxvYWQgY29tcGxldGlvbiBpZiBp bmNyZW1lbnRhbCByZW5kZXJpbmcgaXMgc3VwcHJlc3NlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNs aWVudDo6ZGlzcGF0Y2hEaWRGaXJzdExheW91dCk6IERvIG5vdAorICAgICAgICB1bi1mcmVlemUg dGhlIGxheWVyIHRyZWUgc3RhdGUgaWYgaW5jcmVtZW50YWwgcmVuZGVyaW5nIGlzIHN1cHByZXNz ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmg6CisgICAgICAg IChXZWJLaXQ6OkRyYXdpbmdBcmVhOjpsYXllclRyZWVTdGF0ZUlzRnJvemVuKTogQWRkIGEgZ2V0 dGVyIGZvcgorICAgICAgICBtX2xheWVyVHJlZVN0YXRlSXNGcm96ZW4uCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oOgorICAgICAgICAoV2ViS2l0OjpEcmF3 aW5nQXJlYUltcGw6OmxheWVyVHJlZVN0YXRlSXNGcm96ZW4pOiBEaXR0by4KKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvY2EvTGF5ZXJUcmVlSG9zdENBLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TGF5ZXJUcmVlSG9zdENBOjppbml0aWFsaXplKTogV2ViRnJhbWVMb2FkZXJDbGllbnQgbWln aHQgaGF2ZQorICAgICAgICB0cmllZCB0byBmcmVlemUgdGhlIHN0YXRlIG9mIHRoZSBsYXllciB0 cmVlIGJlZm9yZSB0aGUgbGF5ZXIgdHJlZSBob3N0CisgICAgICAgIHdhcyBjcmVhdGVkLiBXaGVu IGNyZWF0aW5nIHRoZSBsYXllciB0cmVlIGhvc3QsIG9ubHkgc2NoZWR1bGUgYSBsYXllcgorICAg ICAgICBmbHVzaCBpZiB0aGUgbGF5ZXIgdHJlZSBzdGF0ZSBpc24ndCBmcm96ZW4uCisKIDIwMTEt MTItMDEgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzU5MgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcAppbmRleCA3OTY4NWUwMGQ5YmZiMmNkODEwZDIzMWE4M2U5OWI3MTViMGY5 NDQyLi40ZGQ1Njk5YTRkNGQ5ZjI2OGJkYmQzZWQ1YTY0N2Y0NDEwZGJlNWQ5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNjQsNiArNjQsNyBAQAogI2luY2x1ZGUgPFdl YkNvcmUvUGx1Z2luRGF0YS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUHJvZ3Jlc3NUcmFja2VyLmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9T ZXR0aW5ncy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVUlFdmVudFdpdGhLZXlTdGF0ZS5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvV2lkZ2V0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9XaW5kb3dGZWF0dXJl cy5oPgpAQCAtNTMyLDcgKzUzMyw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh dGNoRGlkRmlyc3RMYXlvdXQoKQogICAgIC8vIE5vdGlmeSB0aGUgVUlQcm9jZXNzLgogICAgIHdl YlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmlyc3RMYXlvdXRGb3JGcmFt ZShtX2ZyYW1lLT5mcmFtZUlEKCksIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyKHVz ZXJEYXRhLmdldCgpKSkpOwogCi0gICAgaWYgKG1fZnJhbWUgPT0gbV9mcmFtZS0+cGFnZSgpLT5t YWluV2ViRnJhbWUoKSkKKyAgICBpZiAobV9mcmFtZSA9PSBtX2ZyYW1lLT5wYWdlKCktPm1haW5X ZWJGcmFtZSgpICYmICF3ZWJQYWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLT5zdXBwcmVzc0lu Y3JlbWVudGFsUmVuZGVyaW5nKCkpCiAgICAgICAgIHdlYlBhZ2UtPmRyYXdpbmdBcmVhKCktPnNl dExheWVyVHJlZVN0YXRlSXNGcm96ZW4oZmFsc2UpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCmluZGV4IDA4M2E1OTJhZTc3N2YyNjkx ZDcwOTRjNjE5NGRhZmVkMTEyODc1NWMuLjA2YzIzODQ3MmNiMjIzMGQzMGQ2OGQ3MTJkZTg4MDY4 ZDg3NjRhMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9E cmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3 aW5nQXJlYS5oCkBAIC02OSw2ICs2OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGFn ZUJhY2tncm91bmRUcmFuc3BhcmVuY3lDaGFuZ2VkKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGZv cmNlUmVwYWludCgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRMYXllclRyZWVTdGF0ZUlzRnJv emVuKGJvb2wpIHsgfQorICAgIHZpcnR1YWwgYm9vbCBsYXllclRyZWVTdGF0ZUlzRnJvemVuKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBkaWRJbnN0YWxsUGFn ZU92ZXJsYXkoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXko KSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3 aW5nQXJlYUltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5n QXJlYUltcGwuaAppbmRleCAzYzhjYjJlOTZjODdmNzllOWE5M2NlN2IxMGIzYTE4OTBhMGEyMTg1 Li5mMmJmZTM0Y2ZiYjhlMDYwYTkzZWE2MjJiMGVhYWJmMmUwOWFjOThiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oCkBAIC01 NCw2ICs1NCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHNldE5lZWRzRGlzcGxheShj b25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbChjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3Jv bGxPZmZzZXQpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRMYXllclRyZWVTdGF0ZUlzRnJvemVuKGJv b2wpOworICAgIHZpcnR1YWwgYm9vbCBsYXllclRyZWVTdGF0ZUlzRnJvemVuKCkgY29uc3QgeyBy ZXR1cm4gbV9sYXllclRyZWVTdGF0ZUlzRnJvemVuOyB9CiAgICAgdmlydHVhbCB2b2lkIGZvcmNl UmVwYWludCgpOwogCiAgICAgdmlydHVhbCB2b2lkIGVuYWJsZURpc3BsYXlUaHJvdHRsaW5nKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvY2EvTGF5ZXJU cmVlSG9zdENBLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9jYS9MYXll clRyZWVIb3N0Q0EuY3BwCmluZGV4IDY4NDkxZTc0NTA4ODNlOGZiODRmMGRmZDdkMTZjYjI1NjU5 MTcyOTIuLjFiOTU1M2Q0NjA1YjJiZmYyNTcxNjM2MGEyMzU3ZWQxY2Q1YjU5OGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9jYS9MYXllclRyZWVIb3N0Q0Eu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9jYS9MYXllclRyZWVI b3N0Q0EuY3BwCkBAIC03Nyw2ICs3Nyw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdENBOjppbml0aWFs aXplKCkKIAogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZShtX2xheWVyVHJlZUNvbnRleHQpOwogCisg ICAgc2V0TGF5ZXJGbHVzaFNjaGVkdWxpbmdFbmFibGVkKCFtX3dlYlBhZ2UtPmRyYXdpbmdBcmVh KCktPmxheWVyVHJlZVN0YXRlSXNGcm96ZW4oKSk7CiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7 CiB9CiAK