Unreviewed build fix after r185964.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Jun 2015 01:09:51 +0000 (01:09 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Jun 2015 01:09:51 +0000 (01:09 +0000)
Correct a few pointers-that-should-be-references-now errors.

* platform/win/PopupMenuWin.cpp:
(WebCore::AccessiblePopupMenu::accLocation):
(WebCore::AccessiblePopupMenu::accHitTest):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/win/PopupMenuWin.cpp

index 2e9a9f8..ff9fc84 100644 (file)
@@ -1,3 +1,13 @@
+2015-06-25  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed build fix after r185964.
+
+        Correct a few pointers-that-should-be-references-now errors.
+
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::AccessiblePopupMenu::accLocation):
+        (WebCore::AccessiblePopupMenu::accHitTest):
+
 2015-06-25  Doug Russell  <d_russell@apple.com>
 
         Bug 146300 AX: AccessibilityObject focus events that don't cause a selection 
index d0e0c3f..1967fae 100644 (file)
@@ -1282,9 +1282,10 @@ HRESULT AccessiblePopupMenu::accLocation(long* left, long* top, long* width, lon
         if (!m_popupMenu.scrollbar())
             return E_FAIL;
 
+        Scrollbar& scrollbar = *m_popupMenu.scrollbar();
         WebCore::ScrollbarPart part = static_cast<WebCore::ScrollbarPart>(-vChild.lVal);
 
-        ScrollbarThemeWin* theme = static_cast<ScrollbarThemeWin*>(m_popupMenu.scrollbar()->theme());
+        ScrollbarThemeWin* theme = static_cast<ScrollbarThemeWin*>(scrollbar.theme());
         if (!theme)
             return E_FAIL;
 
@@ -1293,17 +1294,17 @@ HRESULT AccessiblePopupMenu::accLocation(long* left, long* top, long* width, lon
         switch (part) {
         case BackTrackPart:
         case BackButtonStartPart:
-            partRect = theme->backButtonRect(m_popupMenu.scrollbar(), WebCore::BackTrackPart);
+            partRect = theme->backButtonRect(scrollbar, WebCore::BackTrackPart);
             break;
         case ThumbPart:
-            partRect = theme->thumbRect(m_popupMenu.scrollbar());
+            partRect = theme->thumbRect(scrollbar);
             break;
         case ForwardTrackPart:
         case ForwardButtonEndPart:
-            partRect = theme->forwardButtonRect(m_popupMenu.scrollbar(), WebCore::ForwardTrackPart);
+            partRect = theme->forwardButtonRect(scrollbar, WebCore::ForwardTrackPart);
             break;
         case ScrollbarBGPart:
-            partRect = theme->trackRect(m_popupMenu.scrollbar());
+            partRect = theme->trackRect(scrollbar);
             break;
         default:
             return E_FAIL;
@@ -1354,12 +1355,13 @@ HRESULT AccessiblePopupMenu::accHitTest(long x, long y, VARIANT* pvChildAtPoint)
         scrollRect = m_popupMenu.scrollbar()->frameRect();
 
     if (m_popupMenu.scrollbar() && scrollRect.contains(pt)) {
-        if (!m_popupMenu.scrollbar()->theme())
+        Scrollbar& scrollbar = *m_popupMenu.scrollbar();
+        if (!scrollbar.theme())
             return E_FAIL;
 
         pt.move(-scrollRect.x(), -scrollRect.y());
 
-        WebCore::ScrollbarPart part = m_popupMenu.scrollbar()->theme()->hitTest(m_popupMenu.scrollbar(), pt);
+        WebCore::ScrollbarPart part = scrollbar.theme()->hitTest(scrollbar, pt);
 
         V_VT(pvChildAtPoint) = VT_I4;
         V_I4(pvChildAtPoint) = -part; // Scrollbar parts are encoded as negative, to avoid mixup with item indexes.