Bug 769437 - Remove a check that has been dead since 2005 to fix a build warning; r=mounir
authorMs2ger <ms2ger@gmail.com>
Mon, 02 Jul 2012 08:23:56 +0200
changeset 102895 a31fc905284031559f3c6ea2211feae6b295f0f1
parent 102894 4004407a1f493acb9373378b081472ad2e3c26f0
child 102908 62667de136fb4d601b57e8e54fedcf019a0c1246
push id1316
push userakeybl@mozilla.com
push dateMon, 27 Aug 2012 22:37:00 +0000
treeherdermozilla-beta@db4b09302ee2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmounir
bugs769437
milestone16.0a1
first release with
nightly linux32
a31fc9052840 / 16.0a1 / 20120702030551 / files
nightly linux64
a31fc9052840 / 16.0a1 / 20120702030551 / files
nightly mac
a31fc9052840 / 16.0a1 / 20120702030551 / files
nightly win32
a31fc9052840 / 16.0a1 / 20120702030551 / files
nightly win64
a31fc9052840 / 16.0a1 / 20120702030551 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 769437 - Remove a check that has been dead since 2005 to fix a build warning; r=mounir
layout/base/nsCSSFrameConstructor.cpp
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -2904,30 +2904,29 @@ nsresult
 nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
                                             FrameConstructionItem&   aItem,
                                             nsIFrame*                aParentFrame,
                                             const nsStyleDisplay*    aStyleDisplay,
                                             nsFrameItems&            aFrameItems,
                                             nsIFrame**               aNewFrame)
 {
   nsresult rv = NS_OK;
-  const PRInt32 kNoSizeSpecified = -1;
 
   nsIContent* const content = aItem.mContent;
   nsStyleContext* const styleContext = aItem.mStyleContext;
 
   // Construct a frame-based listbox or combobox
   nsCOMPtr<nsIDOMHTMLSelectElement> sel(do_QueryInterface(content));
   PRUint32 size = 1;
   if (sel) {
     sel->GetSize(&size); 
     bool multipleSelect = false;
     sel->GetMultiple(&multipleSelect);
      // Construct a combobox if size=1 or no size is specified and its multiple select
-    if (((1 == size || 0 == size) || (kNoSizeSpecified  == size)) && (false == multipleSelect)) {
+    if ((1 == size || 0 == size) && !multipleSelect) {
         // Construct a frame-based combo box.
         // The frame-based combo box is built out of three parts. A display area, a button and
         // a dropdown list. The display area and button are created through anonymous content.
         // The drop-down list's frame is created explicitly. The combobox frame shares its content
         // with the drop-down list.
       PRUint32 flags = NS_BLOCK_FLOAT_MGR;
       nsIFrame* comboboxFrame = NS_NewComboboxControlFrame(mPresShell, styleContext, flags);