Changeset 190732 in webkit


Ignore:
Timestamp:
Oct 8, 2015 10:40:09 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Add NULL check for renderBox::layer() on applying zoom level change
https://bugs.webkit.org/show_bug.cgi?id=149302
<rdar://problem/22747292>

Patch by Jiewen Tan <jiewen_tan@apple.com> on 2015-10-08
Reviewed by Darin Adler.

Source/WebCore:

Test: fast/css/zoom-on-nested-scroll-crash.html

This is a merge of Blink r158238:
https://chromiumcodereview.appspot.com/23526081

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::styleDidChange):

LayoutTests:

  • fast/css/zoom-on-nested-scroll-crash-expected.txt: Added.
  • fast/css/zoom-on-nested-scroll-crash.html: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r190729 r190732  
     12015-10-08  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Add NULL check for renderBox::layer() on applying zoom level change
     4        https://bugs.webkit.org/show_bug.cgi?id=149302
     5        <rdar://problem/22747292>
     6
     7        Reviewed by Darin Adler.
     8
     9        * fast/css/zoom-on-nested-scroll-crash-expected.txt: Added.
     10        * fast/css/zoom-on-nested-scroll-crash.html: Added.
     11
    1122015-10-08  Ryan Haddad  <ryanhaddad@apple.com>
    213
  • trunk/Source/WebCore/ChangeLog

    r190731 r190732  
     12015-10-08  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Add NULL check for renderBox::layer() on applying zoom level change
     4        https://bugs.webkit.org/show_bug.cgi?id=149302
     5        <rdar://problem/22747292>
     6
     7        Reviewed by Darin Adler.
     8
     9        Test: fast/css/zoom-on-nested-scroll-crash.html
     10
     11        This is a merge of Blink r158238:
     12        https://chromiumcodereview.appspot.com/23526081
     13
     14        * rendering/RenderBox.cpp:
     15        (WebCore::RenderBox::styleDidChange):
     16
    1172015-10-08  Brady Eidson  <beidson@apple.com>
    218
  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r190685 r190732  
    353353    // If our zoom factor changes and we have a defined scrollLeft/Top, we need to adjust that value into the
    354354    // new zoomed coordinate space.
    355     if (hasOverflowClip() && oldStyle && oldStyle->effectiveZoom() != newStyle.effectiveZoom()) {
     355    if (hasOverflowClip() && oldStyle && oldStyle->effectiveZoom() != newStyle.effectiveZoom() && layer()) {
    356356        if (int left = layer()->scrollXOffset()) {
    357357            left = (left / oldStyle->effectiveZoom()) * newStyle.effectiveZoom();
Note: See TracChangeset for help on using the changeset viewer.