View Details Raw Unified Return to Bug 108134
Collapse All Expand All
- a/Source/WebCore/ChangeLog +14 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1 
2013-01-28  KyungTae Kim  <ktf.kim@samsung.com>
2 

            

            

              3
              
        min/max-content as min/max-width is not set properly

            

            

              4
              
        https://bugs.webkit.org/show_bug.cgi?id=108134

            

            

              5
              

            

            

              6
              
        Reviewed by NOBODY (OOPS!).

            

            

              7
              

            

            

              8
              
        The preferredWidth should be updated when the min/max-width is min/max-content.

            

            

              9
              

            

            

              10
              
        Test: fast/css-intrinsic-dimensions/minmax-width-minmax-content.html

            

            

              11
              

            

            

              12
              
        * rendering/RenderBlock.cpp:

            

            

              13
              
        (WebCore::RenderBlock::computePreferredLogicalWidths):

            

            

              14
              

            

        

          1
          
2013-01-28  Sheriff Bot  <webkit.review.bot@gmail.com>

          15
          
2013-01-28  Sheriff Bot  <webkit.review.bot@gmail.com>

        

        

          2
          

          16
          

        

        

          3
          
        Unreviewed, rolling out r140869.

          17
          
        Unreviewed, rolling out r140869.

        



-
  a/Source/WebCore/rendering/RenderBlock.cpp
    
      -1 / +3 lines
    




  

    
      
            Lines 5666-5672
      
      void RenderBlock::computePreferredLogicalWidths()
      
        a/Source/WebCore/rendering/RenderBlock.cpp_sec1
      
    
  

        

          5666
          

          5666
          

        

        

          5667
          
    RenderStyle* styleToUse = style();

          5667
          
    RenderStyle* styleToUse = style();

        

        

          5668
          
    if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->logicalWidth().value() >= 0 

          5668
          
    if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->logicalWidth().value() >= 0 

        

          
            

              5669
              
        && !(isDeprecatedFlexItem() && !styleToUse->logicalWidth().intValue()))


              5669
              
        && !(isDeprecatedFlexItem() && !styleToUse->logicalWidth().intValue())

            

            

              
              

              5670
              
        && !styleToUse->logicalMinWidth().isMinContent() && !styleToUse->logicalMaxWidth().isMinContent()

            

            


              5671
              
        && !styleToUse->logicalMinWidth().isMaxContent() && !styleToUse->logicalMaxWidth().isMaxContent())

            

        

          5670
          
        m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalWidth().value());

          5672
          
        m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalWidth().value());

        

        

          5671
          
    else {

          5673
          
    else {

        

        

          5672
          
        m_minPreferredLogicalWidth = 0;

          5674
          
        m_minPreferredLogicalWidth = 0;

        



-
  a/LayoutTests/ChangeLog
    
      +10 lines
    




  

    
      
            Lines 1-3
      
      
      
        a/LayoutTests/ChangeLog_sec1
      
    
  

            

              
              
              1
              
2013-01-28  KyungTae Kim  <ktf.kim@samsung.com>

            

            

              2
              

            

            

              3
              
        min/max-content as min/max-width is not set properly

            

            

              4
              
        https://bugs.webkit.org/show_bug.cgi?id=108134

            

            

              5
              

            

            

              6
              
        Add a test case for the min/max-content as the min/max-width when the width is fixed.

            

            

              7
              

            

            

              8
              
        * fast/css-intrinsic-dimensions/minmax-width-minmax-content-expected.html: Added.

            

            

              9
              
        * fast/css-intrinsic-dimensions/minmax-width-minmax-content.html: Added.

            

            

              10
              

            

        

          1
          
2013-01-28  Joshua Bell  <jsbell@chromium.org>

          11
          
2013-01-28  Joshua Bell  <jsbell@chromium.org>

        

        

          2
          

          12
          

        

        

          3
          
        [Chromium] Unreviewed gardening, removing Crash expectations from storage/indexeddb tests.

          13
          
        [Chromium] Unreviewed gardening, removing Crash expectations from storage/indexeddb tests.

        



-
  a/LayoutTests/fast/css-intrinsic-dimensions/minmax-width-minmax-content-expected.html
    
      +30 lines
    




  

    
      
            Line 0
      
      
      
        a/LayoutTests/fast/css-intrinsic-dimensions/minmax-width-minmax-content-expected.html_sec1
      
    
  

            

              
              
              1
              
<!DOCTYPE html>

            

            

              2
              
<html>

            

            

              3
              
<head>

            

            

              4
              
<style>

            

            

              5
              
.testcontents{

            

            

              6
              
    margin: 5px;

            

            

              7
              
    border: 5px solid red;

            

            

              8
              
}

            

            

              9
              
#minwidth_mincontent {

            

            

              10
              
    width: -webkit-min-content;

            

            

              11
              
}

            

            

              12
              
#minwidth_maxcontent {

            

            

              13
              
    width: -webkit-max-content;

            

            

              14
              
}

            

            

              15
              
#maxwidth_mincontent {

            

            

              16
              
    width: -webkit-min-content;

            

            

              17
              
}

            

            

              18
              
#maxwidth_maxcontent {

            

            

              19
              
    width: -webkit-max-content;

            

            

              20
              
}

            

            

              21
              
</style>

            

            

              22
              
</head>

            

            

              23
              

            

            

              24
              
<body>

            

            

              25
              
<div class="testcontents" id="minwidth_mincontent">min-width: min-content</div>

            

            

              26
              
<div class="testcontents" id="minwidth_maxcontent">min-width: max-content</div>

            

            

              27
              
<div class="testcontents" id="maxwidth_mincontent">max-width: min-content</div>

            

            

              28
              
<div class="testcontents" id="maxwidth_maxcontent">max-width: max-content</div>

            

            

              29
              
</body>

            

            

              30
              
</html>

            



-
  a/LayoutTests/fast/css-intrinsic-dimensions/minmax-width-minmax-content.html
    
      +34 lines
    




  

    
      
            Line 0
      
      
      
        a/LayoutTests/fast/css-intrinsic-dimensions/minmax-width-minmax-content.html_sec1
      
    
  

            

              
              
              1
              
<!DOCTYPE html>

            

            

              2
              
<html>

            

            

              3
              
<head>

            

            

              4
              
<style>

            

            

              5
              
.testcontents{

            

            

              6
              
    margin: 5px;

            

            

              7
              
    border: 5px solid red;

            

            

              8
              
}

            

            

              9
              
#minwidth_mincontent {

            

            

              10
              
    width: 10px;

            

            

              11
              
    min-width: -webkit-min-content; /* Should be same with width:-webkit-min-content */

            

            

              12
              
}

            

            

              13
              
#minwidth_maxcontent {

            

            

              14
              
    width: 10px;

            

            

              15
              
    min-width: -webkit-max-content; /* Should be same with width:-webkit-max-content */

            

            

              16
              
}

            

            

              17
              
#maxwidth_mincontent {

            

            

              18
              
    width: 1000px;

            

            

              19
              
    max-width: -webkit-min-content; /* Should be same with width:-webkit-min-content */

            

            

              20
              
}

            

            

              21
              
#maxwidth_maxcontent {

            

            

              22
              
    width: 1000px;

            

            

              23
              
    max-width: -webkit-max-content; /* Should be same with width:-webkit-max-content */

            

            

              24
              
}

            

            

              25
              
</style>

            

            

              26
              
</head>

            

            

              27
              

            

            

              28
              
<body>

            

            

              29
              
<div class="testcontents" id="minwidth_mincontent">min-width: min-content</div>

            

            

              30
              
<div class="testcontents" id="minwidth_maxcontent">min-width: max-content</div>

            

            

              31
              
<div class="testcontents" id="maxwidth_mincontent">max-width: min-content</div>

            

            

              32
              
<div class="testcontents" id="maxwidth_maxcontent">max-width: max-content</div>

            

            

              33
              
</body>

            

            

              34
              
</html>

            






  

  Return to Bug 108134