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

Side by Side Diff: Source/core/rendering/RenderMenuList.cpp

Issue 15820002: Page::chrome() should return a reference. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the select element renderer in WebCore. 2 * This file is part of the select element renderer in WebCore.
3 * 3 *
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
6 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 6 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 m_maxPreferredLogicalWidth += toAdd; 313 m_maxPreferredLogicalWidth += toAdd;
314 314
315 setPreferredLogicalWidthsDirty(false); 315 setPreferredLogicalWidthsDirty(false);
316 } 316 }
317 317
318 void RenderMenuList::showPopup() 318 void RenderMenuList::showPopup()
319 { 319 {
320 if (m_popupIsVisible) 320 if (m_popupIsVisible)
321 return; 321 return;
322 322
323 if (document()->page()->chrome()->hasOpenedPopup()) 323 if (document()->page()->chrome().hasOpenedPopup())
324 return; 324 return;
325 325
326 // Create m_innerBlock here so it ends up as the first child. 326 // Create m_innerBlock here so it ends up as the first child.
327 // This is important because otherwise we might try to create m_innerBlock 327 // This is important because otherwise we might try to create m_innerBlock
328 // inside the showPopup call and it would fail. 328 // inside the showPopup call and it would fail.
329 createInnerBlock(); 329 createInnerBlock();
330 if (!m_popup) 330 if (!m_popup)
331 m_popup = document()->page()->chrome()->createPopupMenu(*document()->fra me(), this); 331 m_popup = document()->page()->chrome().createPopupMenu(*document()->fram e(), this);
332 m_popupIsVisible = true; 332 m_popupIsVisible = true;
333 333
334 FloatQuad quad(localToAbsoluteQuad(FloatQuad(borderBoundingBox()))); 334 FloatQuad quad(localToAbsoluteQuad(FloatQuad(borderBoundingBox())));
335 IntSize size = pixelSnappedIntRect(frameRect()).size(); 335 IntSize size = pixelSnappedIntRect(frameRect()).size();
336 HTMLSelectElement* select = selectElement(); 336 HTMLSelectElement* select = selectElement();
337 m_popup->show(quad, size, select->optionToListIndex(select->selectedIndex()) ); 337 m_popup->show(quad, size, select->optionToListIndex(select->selectedIndex()) );
338 } 338 }
339 339
340 void RenderMenuList::hidePopup() 340 void RenderMenuList::hidePopup()
341 { 341 {
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 { 606 {
607 setTextFromOption(selectElement()->listToOptionIndex(listIndex)); 607 setTextFromOption(selectElement()->listToOptionIndex(listIndex));
608 } 608 }
609 609
610 FontSelector* RenderMenuList::fontSelector() const 610 FontSelector* RenderMenuList::fontSelector() const
611 { 611 {
612 return document()->styleResolver()->fontSelector(); 612 return document()->styleResolver()->fontSelector();
613 } 613 }
614 614
615 } 615 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerCompositor.cpp ('k') | Source/core/rendering/svg/RenderSVGRoot.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698