- Revision
- 184339
- Author
- [email protected]
- Date
- 2015-05-14 09:37:27 -0700 (Thu, 14 May 2015)
Log Message
Fix typo in RenderBox::instrinsicScrollbarLogicalWidth()
https://bugs.webkit.org/show_bug.cgi?id=144999
Reviewed by Sergio Villar Senin.
Rename RenderBox::instrinsicScrollbarLogicalWidth() to
RenderBox::intrinsicScrollbarLogicalWidth().
No new tests, no behavior changes.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeIntrinsicLogicalWidths):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeIntrinsicLogicalWidths):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::intrinsicScrollbarLogicalWidth):
(WebCore::RenderBox::instrinsicScrollbarLogicalWidth): Deleted.
* rendering/RenderBox.h:
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184338 => 184339)
--- trunk/Source/WebCore/ChangeLog 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/ChangeLog 2015-05-14 16:37:27 UTC (rev 184339)
@@ -1,3 +1,28 @@
+2015-05-14 Manuel Rego Casasnovas <[email protected]>
+
+ Fix typo in RenderBox::instrinsicScrollbarLogicalWidth()
+ https://bugs.webkit.org/show_bug.cgi?id=144999
+
+ Reviewed by Sergio Villar Senin.
+
+ Rename RenderBox::instrinsicScrollbarLogicalWidth() to
+ RenderBox::intrinsicScrollbarLogicalWidth().
+
+ No new tests, no behavior changes.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeIntrinsicLogicalWidths):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::computeIntrinsicLogicalWidths):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::intrinsicScrollbarLogicalWidth):
+ (WebCore::RenderBox::instrinsicScrollbarLogicalWidth): Deleted.
+ * rendering/RenderBox.h:
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths):
+
2015-05-14 Youenn Fablet <[email protected]>
SharedBuffer::createWithContentsOfFile should use map file routines
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (184338 => 184339)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-05-14 16:37:27 UTC (rev 184339)
@@ -2647,7 +2647,7 @@
maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
- int scrollbarWidth = instrinsicScrollbarLogicalWidth();
+ int scrollbarWidth = intrinsicScrollbarLogicalWidth();
maxLogicalWidth += scrollbarWidth;
minLogicalWidth += scrollbarWidth;
}
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (184338 => 184339)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-05-14 16:37:27 UTC (rev 184339)
@@ -373,7 +373,7 @@
maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(tableCellWidth.value()));
}
- int scrollbarWidth = instrinsicScrollbarLogicalWidth();
+ int scrollbarWidth = intrinsicScrollbarLogicalWidth();
maxLogicalWidth += scrollbarWidth;
minLogicalWidth += scrollbarWidth;
}
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (184338 => 184339)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-14 16:37:27 UTC (rev 184339)
@@ -793,7 +793,7 @@
return includeHorizontalScrollbarSize() ? layer()->horizontalScrollbarHeight() : 0;
}
-int RenderBox::instrinsicScrollbarLogicalWidth() const
+int RenderBox::intrinsicScrollbarLogicalWidth() const
{
if (!hasOverflowClip())
return 0;
Modified: trunk/Source/WebCore/rendering/RenderBox.h (184338 => 184339)
--- trunk/Source/WebCore/rendering/RenderBox.h 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-05-14 16:37:27 UTC (rev 184339)
@@ -459,7 +459,7 @@
virtual int verticalScrollbarWidth() const;
int horizontalScrollbarHeight() const;
- int instrinsicScrollbarLogicalWidth() const;
+ int intrinsicScrollbarLogicalWidth() const;
int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint());
virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr);
Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (184338 => 184339)
--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-05-14 16:37:27 UTC (rev 184339)
@@ -199,7 +199,7 @@
maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
- LayoutUnit scrollbarWidth = instrinsicScrollbarLogicalWidth();
+ LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth();
maxLogicalWidth += scrollbarWidth;
minLogicalWidth += scrollbarWidth;
}
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (184338 => 184339)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-05-14 16:37:27 UTC (rev 184339)
@@ -125,7 +125,7 @@
maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
- LayoutUnit scrollbarWidth = instrinsicScrollbarLogicalWidth();
+ LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth();
maxLogicalWidth += scrollbarWidth;
minLogicalWidth += scrollbarWidth;
}
