diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
| commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
| tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebCore/rendering/RenderFrameSet.cpp | |
| parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
| download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz | |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebCore/rendering/RenderFrameSet.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderFrameSet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderFrameSet.cpp b/Source/WebCore/rendering/RenderFrameSet.cpp index ac449a240..7c89d8db8 100644 --- a/Source/WebCore/rendering/RenderFrameSet.cpp +++ b/Source/WebCore/rendering/RenderFrameSet.cpp @@ -667,7 +667,7 @@ bool RenderFrameSet::flattenFrameSet() const void RenderFrameSet::startResizing(GridAxis& axis, int position) { int split = hitTestSplit(axis, position); - if (split == noSplit || !axis.m_allowBorder[split] || axis.m_preventResize[split]) { + if (split == noSplit || axis.m_preventResize[split]) { axis.m_splitBeingResized = noSplit; return; } @@ -746,13 +746,13 @@ bool RenderFrameSet::isResizingColumn() const bool RenderFrameSet::canResizeRow(const IntPoint& p) const { int r = hitTestSplit(m_rows, p.y()); - return r != noSplit && m_rows.m_allowBorder[r] && !m_rows.m_preventResize[r]; + return r != noSplit && !m_rows.m_preventResize[r]; } bool RenderFrameSet::canResizeColumn(const IntPoint& p) const { int c = hitTestSplit(m_cols, p.x()); - return c != noSplit && m_cols.m_allowBorder[c] && !m_cols.m_preventResize[c]; + return c != noSplit && !m_cols.m_preventResize[c]; } int RenderFrameSet::splitPosition(const GridAxis& axis, int split) const |