Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: Source/WebCore/rendering/RenderListBox.cpp

Issue 12641003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderListBox.h ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 paintItemBackground(paintInfo, paintOffset, index); 320 paintItemBackground(paintInfo, paintOffset, index);
321 index++; 321 index++;
322 } 322 }
323 break; 323 break;
324 } 324 }
325 default: 325 default:
326 break; 326 break;
327 } 327 }
328 } 328 }
329 329
330 void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset) 330 void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
331 { 331 {
332 if (!isSpatialNavigationEnabled(frame())) 332 if (!isSpatialNavigationEnabled(frame()))
333 return RenderBlock::addFocusRingRects(rects, additionalOffset); 333 return RenderBlock::addFocusRingRects(rects, additionalOffset, paintCont ainer);
334 334
335 HTMLSelectElement* select = selectElement(); 335 HTMLSelectElement* select = selectElement();
336 336
337 // Focus the last selected item. 337 // Focus the last selected item.
338 int selectedItem = select->activeSelectionEndListIndex(); 338 int selectedItem = select->activeSelectionEndListIndex();
339 if (selectedItem >= 0) { 339 if (selectedItem >= 0) {
340 rects.append(pixelSnappedIntRect(itemBoundingBoxRect(additionalOffset, s electedItem))); 340 rects.append(pixelSnappedIntRect(itemBoundingBoxRect(additionalOffset, s electedItem)));
341 return; 341 return;
342 } 342 }
343 343
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 m_vBar->styleChanged(); 881 m_vBar->styleChanged();
882 882
883 // Force an update since we know the scrollbars have changed things. 883 // Force an update since we know the scrollbars have changed things.
884 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) 884 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION)
885 if (document()->hasAnnotatedRegions()) 885 if (document()->hasAnnotatedRegions())
886 document()->setAnnotatedRegionsDirty(true); 886 document()->setAnnotatedRegionsDirty(true);
887 #endif 887 #endif
888 } 888 }
889 889
890 } // namespace WebCore 890 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderListBox.h ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698