[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4c3f670b1f55cef61dd2b58c5f9381a0e73695dd
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 15:10:54 2010 +0000

    2010-03-12  Scott Byer  <scottbyer at chromium.org>
    
            Reviewed by David Levin.
    
            Popup font size needs to be exposed to clients.
            https://bugs.webkit.org/show_bug.cgi?id=35990
    
            Add function to expose the popup menu font size, add a field to
            WebPopupMenuInfo that receives that information to convey that to
            the web view client's createPopupMenu() call.
    
            * WebCore/platform/chromium/PopupMenuChromium.cpp:
            * WebCore/platform/chromium/PopupMenuChromium.h:
            * WebKit/chromium/public/WebPopupMenuInfo.h:
            * WebKit/chromium/src/ChromeClientImpl.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 64db3f4..de386b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-12  Scott Byer  <scottbyer at chromium.org>
+
+        Reviewed by David Levin.
+
+        Popup font size needs to be exposed to clients.
+        https://bugs.webkit.org/show_bug.cgi?id=35990
+
+        Add function to expose the popup menu font size, add a field to
+        WebPopupMenuInfo that receives that information to convey that to
+        the web view client's createPopupMenu() call.
+
+        * WebCore/platform/chromium/PopupMenuChromium.cpp:
+        * WebCore/platform/chromium/PopupMenuChromium.h:
+        * WebKit/chromium/public/WebPopupMenuInfo.h:
+        * WebKit/chromium/src/ChromeClientImpl.cpp:
+
 2010-03-11  Adam Roben  <aroben at apple.com>
 
         Teach git about ObjC files
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index cab7ced..043969c 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -511,6 +511,11 @@ int PopupContainer::menuItemHeight() const
     return m_listBox->getRowHeight(0);
 }
 
+int PopupContainer::menuItemFontSize() const
+{
+    return m_listBox->getRowFont(0).size();
+}
+
 const WTF::Vector<PopupItem*>& PopupContainer:: popupData() const
 {
     return m_listBox->items();
diff --git a/WebCore/platform/chromium/PopupMenuChromium.h b/WebCore/platform/chromium/PopupMenuChromium.h
index ee094b3..50e2868 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.h
+++ b/WebCore/platform/chromium/PopupMenuChromium.h
@@ -166,6 +166,9 @@ namespace WebCore {
         // The height of a row in the menu.
         int menuItemHeight() const;
 
+        // The size of the font being used.
+        int menuItemFontSize() const;
+
     private:
         friend class WTF::RefCounted<PopupContainer>;
 
diff --git a/WebKit/chromium/public/WebPopupMenuInfo.h b/WebKit/chromium/public/WebPopupMenuInfo.h
index 876842d..7eb132e 100644
--- a/WebKit/chromium/public/WebPopupMenuInfo.h
+++ b/WebKit/chromium/public/WebPopupMenuInfo.h
@@ -41,6 +41,7 @@ struct WebPopupMenuInfo {
     // FIXME: migrate clients to WebMenuItemInfo and remove this temporary Item typedef.
     typedef WebMenuItemInfo Item;
     int itemHeight;
+    int itemFontSize;
     int selectedIndex;
     WebVector<WebMenuItemInfo> items;
 };
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 6e899bd..1d22856 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -671,6 +671,7 @@ void ChromeClientImpl::getPopupMenuInfo(PopupContainer* popupContainer,
     }
 
     info->itemHeight = popupContainer->menuItemHeight();
+    info->itemFontSize = popupContainer->menuItemFontSize();
     info->selectedIndex = popupContainer->selectedIndex();
     info->items.swap(outputItems);
 }

-- 
WebKit Debian packaging