Title: [162664] trunk/Source/WebCore
- Revision
- 162664
- Author
- simon.fra...@apple.com
- Date
- 2014-01-23 17:08:55 -0800 (Thu, 23 Jan 2014)
Log Message
Try to fix Windows build.
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::visibleSize):
* platform/win/PopupMenuWin.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (162663 => 162664)
--- trunk/Source/WebCore/ChangeLog 2014-01-24 00:39:46 UTC (rev 162663)
+++ trunk/Source/WebCore/ChangeLog 2014-01-24 01:08:55 UTC (rev 162664)
@@ -1,5 +1,13 @@
2014-01-23 Simon Fraser <simon.fra...@apple.com>
+ Try to fix Windows build.
+
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::PopupMenuWin::visibleSize):
+ * platform/win/PopupMenuWin.h:
+
+2014-01-23 Simon Fraser <simon.fra...@apple.com>
+
Make visibleContentRect() return actualVisibleContentRect() on iOS most of the time
https://bugs.webkit.org/show_bug.cgi?id=127456
Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (162663 => 162664)
--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2014-01-24 00:39:46 UTC (rev 162663)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2014-01-24 01:08:55 UTC (rev 162664)
@@ -745,16 +745,11 @@
::InvalidateRect(m_popup, &r, false);
}
-int PopupMenuWin::visibleHeight() const
+IntSize PopupMenuWin::visibleSize() const
{
- return m_scrollbar ? m_scrollbar->visibleSize() : m_windowRect.height();
+ return IntSize(m_windowRect.width(), m_scrollbar ? m_scrollbar->visibleSize() : m_windowRect.height());
}
-int PopupMenuWin::visibleWidth() const
-{
- return m_windowRect.width();
-}
-
IntSize PopupMenuWin::contentsSize() const
{
return m_windowRect.size();
Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.h (162663 => 162664)
--- trunk/Source/WebCore/platform/win/PopupMenuWin.h 2014-01-24 00:39:46 UTC (rev 162663)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.h 2014-01-24 01:08:55 UTC (rev 162664)
@@ -98,8 +98,7 @@
virtual bool isScrollCornerVisible() const override { return false; }
virtual IntRect scrollCornerRect() const override { return IntRect(); }
virtual Scrollbar* verticalScrollbar() const override { return m_scrollbar.get(); }
- virtual int visibleHeight() const override;
- virtual int visibleWidth() const override;
+ virtual IntSize visibleSize() const override;
virtual IntSize contentsSize() const override;
virtual IntRect scrollableAreaBoundingBox() const override;
virtual bool updatesScrollLayerPositionOnMainThread() const override { return true; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
