Diff
Modified: trunk/Source/WebCore/ChangeLog (106879 => 106880)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 01:07:59 UTC (rev 106880)
@@ -1,3 +1,23 @@
+2012-02-06 Emil A Eklund <[email protected]>
+
+ Convert PopupMenuClient::clientPadding over to new layout abstraction
+ https://bugs.webkit.org/show_bug.cgi?id=77798
+
+ Reviewed by Eric Seidel.
+
+ Change PopupMenuClient and all classes inheriting from it to use the new
+ layout types for padding.
+
+ No new tests.
+
+ * platform/PopupMenuClient.h:
+ (PopupMenuClient):
+ * rendering/RenderMenuList.h:
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::clientPaddingLeft):
+ (WebCore::RenderTextControlSingleLine::clientPaddingRight):
+ * rendering/RenderTextControlSingleLine.h:
+
2012-02-06 Philip Rogers <[email protected]>
Fix color animations by value
Modified: trunk/Source/WebCore/platform/PopupMenuClient.h (106879 => 106880)
--- trunk/Source/WebCore/platform/PopupMenuClient.h 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebCore/platform/PopupMenuClient.h 2012-02-07 01:07:59 UTC (rev 106880)
@@ -22,6 +22,7 @@
#ifndef PopupMenuClient_h
#define PopupMenuClient_h
+#include "LayoutTypes.h"
#include "PopupMenuStyle.h"
#include "ScrollTypes.h"
#include <wtf/Forward.h>
@@ -51,8 +52,8 @@
virtual PopupMenuStyle menuStyle() const = 0;
virtual int clientInsetLeft() const = 0;
virtual int clientInsetRight() const = 0;
- virtual int clientPaddingLeft() const = 0;
- virtual int clientPaddingRight() const = 0;
+ virtual LayoutUnit clientPaddingLeft() const = 0;
+ virtual LayoutUnit clientPaddingRight() const = 0;
virtual int listSize() const = 0;
virtual int selectedIndex() const = 0;
virtual void popupDidHide() = 0;
Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (106879 => 106880)
--- trunk/Source/WebCore/rendering/RenderMenuList.h 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebCore/rendering/RenderMenuList.h 2012-02-07 01:07:59 UTC (rev 106880)
@@ -91,8 +91,8 @@
virtual PopupMenuStyle menuStyle() const OVERRIDE;
virtual int clientInsetLeft() const OVERRIDE;
virtual int clientInsetRight() const OVERRIDE;
- virtual int clientPaddingLeft() const OVERRIDE;
- virtual int clientPaddingRight() const OVERRIDE;
+ virtual LayoutUnit clientPaddingLeft() const OVERRIDE;
+ virtual LayoutUnit clientPaddingRight() const OVERRIDE;
virtual int listSize() const OVERRIDE;
virtual int selectedIndex() const OVERRIDE;
virtual void popupDidHide() OVERRIDE;
Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (106879 => 106880)
--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2012-02-07 01:07:59 UTC (rev 106880)
@@ -638,9 +638,9 @@
return height() / 2;
}
-int RenderTextControlSingleLine::clientPaddingLeft() const
+LayoutUnit RenderTextControlSingleLine::clientPaddingLeft() const
{
- int padding = paddingLeft();
+ LayoutUnit padding = paddingLeft();
HTMLElement* resultsButton = resultsButtonElement();
if (RenderBox* resultsRenderer = resultsButton ? resultsButton->renderBox() : 0)
@@ -649,9 +649,9 @@
return padding;
}
-int RenderTextControlSingleLine::clientPaddingRight() const
+LayoutUnit RenderTextControlSingleLine::clientPaddingRight() const
{
- int padding = paddingRight();
+ LayoutUnit padding = paddingRight();
HTMLElement* cancelButton = cancelButtonElement();
if (RenderBox* cancelRenderer = cancelButton ? cancelButton->renderBox() : 0)
Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h (106879 => 106880)
--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2012-02-07 01:07:59 UTC (rev 106880)
@@ -103,8 +103,8 @@
virtual PopupMenuStyle menuStyle() const OVERRIDE;
virtual int clientInsetLeft() const OVERRIDE;
virtual int clientInsetRight() const OVERRIDE;
- virtual int clientPaddingLeft() const OVERRIDE;
- virtual int clientPaddingRight() const OVERRIDE;
+ virtual LayoutUnit clientPaddingLeft() const OVERRIDE;
+ virtual LayoutUnit clientPaddingRight() const OVERRIDE;
virtual int listSize() const OVERRIDE;
virtual int selectedIndex() const OVERRIDE;
virtual void popupDidHide() OVERRIDE;
Modified: trunk/Source/WebKit/chromium/ChangeLog (106879 => 106880)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-07 01:07:59 UTC (rev 106880)
@@ -1,3 +1,22 @@
+2012-02-06 Emil A Eklund <[email protected]>
+
+ Convert PopupMenuClient::clientPadding over to new layout abstraction
+ https://bugs.webkit.org/show_bug.cgi?id=77798
+
+ Reviewed by Eric Seidel.
+
+ Change PopupMenuClient and all classes inheriting from it to use the new
+ layout types for padding.
+
+ * src/AutofillPopupMenuClient.cpp:
+ (WebKit::AutofillPopupMenuClient::clientPaddingLeft):
+ (WebKit::AutofillPopupMenuClient::clientPaddingRight):
+ * src/AutofillPopupMenuClient.h:
+ (AutofillPopupMenuClient):
+ * tests/PopupMenuTest.cpp:
+ (WebKit::TestPopupMenuClient::clientPaddingLeft):
+ (WebKit::TestPopupMenuClient::clientPaddingRight):
+
2012-02-06 James Robinson <[email protected]>
[chromium] Drop tiles completely outside of layer bounds when resizing to a smaller size
Modified: trunk/Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp (106879 => 106880)
--- trunk/Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp 2012-02-07 01:07:59 UTC (rev 106880)
@@ -196,7 +196,7 @@
return *m_regularStyle;
}
-int AutofillPopupMenuClient::clientPaddingLeft() const
+WebCore::LayoutUnit AutofillPopupMenuClient::clientPaddingLeft() const
{
// Bug http://crbug.com/7708 seems to indicate the style can be 0.
RenderStyle* style = textFieldStyle();
@@ -206,7 +206,7 @@
return RenderTheme::defaultTheme()->popupInternalPaddingLeft(style);
}
-int AutofillPopupMenuClient::clientPaddingRight() const
+WebCore::LayoutUnit AutofillPopupMenuClient::clientPaddingRight() const
{
// Bug http://crbug.com/7708 seems to indicate the style can be 0.
RenderStyle* style = textFieldStyle();
Modified: trunk/Source/WebKit/chromium/src/AutofillPopupMenuClient.h (106879 => 106880)
--- trunk/Source/WebKit/chromium/src/AutofillPopupMenuClient.h 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebKit/chromium/src/AutofillPopupMenuClient.h 2012-02-07 01:07:59 UTC (rev 106880)
@@ -84,8 +84,8 @@
virtual WebCore::PopupMenuStyle menuStyle() const;
virtual int clientInsetLeft() const { return 0; }
virtual int clientInsetRight() const { return 0; }
- virtual int clientPaddingLeft() const;
- virtual int clientPaddingRight() const;
+ virtual WebCore::LayoutUnit clientPaddingLeft() const;
+ virtual WebCore::LayoutUnit clientPaddingRight() const;
virtual int listSize() const { return getSuggestionsCount(); }
virtual int selectedIndex() const { return m_selectedIndex; }
virtual void popupDidHide();
Modified: trunk/Source/WebKit/chromium/tests/PopupMenuTest.cpp (106879 => 106880)
--- trunk/Source/WebKit/chromium/tests/PopupMenuTest.cpp 2012-02-07 01:07:32 UTC (rev 106879)
+++ trunk/Source/WebKit/chromium/tests/PopupMenuTest.cpp 2012-02-07 01:07:59 UTC (rev 106880)
@@ -100,8 +100,8 @@
virtual PopupMenuStyle menuStyle() const { return itemStyle(0); }
virtual int clientInsetLeft() const { return 0; }
virtual int clientInsetRight() const { return 0; }
- virtual int clientPaddingLeft() const { return 0; }
- virtual int clientPaddingRight() const { return 0; }
+ virtual LayoutUnit clientPaddingLeft() const { return 0; }
+ virtual LayoutUnit clientPaddingRight() const { return 0; }
virtual int listSize() const { return 10; }
virtual int selectedIndex() const { return m_selectIndex; }
virtual void popupDidHide() { }
