Fixes for re-enabling more MSVC level 4 warnings: Source/core/ edition

Source/core/accessibility/AXObject.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 702 matching lines @@
     ASSERT_NOT_REACHED();
 
     // This shouldn't happen.
     return currentScrollOffset;
 }
 
 void AXObject::scrollToMakeVisibleWithSubFocus(const IntRect& subfocus) const
 {
     // Search up the parent chain until we find the first one that's scrollable.
     AXObject* scrollParent = parentObject();
-    ScrollableArea* scrollableArea;
-    for (scrollableArea = 0;
-        scrollParent && !(scrollableArea = scrollParent->getScrollableAreaIfScrollable());
-        scrollParent = scrollParent->parentObject()) { }
+    ScrollableArea* scrollableArea = scrollParent ? scrollParent->getScrollableAreaIfScrollable() : 0;
+    for (; scrollParent && !scrollableArea; scrollableArea = scrollParent ? scrollParent->getScrollableAreaIfScrollable() : 0)

[dmazzoni, 2014/07/16 21:21:16]

I find this change a little harder to read. How about this instead:

ScrollableArea* scrollableArea = 0;
while (scrollParent) {
    if (scrollableArea = scrollParent->getScrollableAreaIfScrollable())
        break;
    scrollParent = scrollParent->parentObject();
}

If it complains about equality in the conditional, I'd still prefer this:

ScrollableArea* scrollableArea = 0;
while (scrollParent) {
    scrollableArea = scrollParent->getScrollableAreaIfScrollable();
    if (scrollableArea)
        break;
    scrollParent = scrollParent->parentObject();
}

[Peter Kasting, 2014/07/16 23:06:58]

Your first form won't work, but the second will.  Changed.

+        scrollParent = scrollParent->parentObject();
     if (!scrollableArea)
         return;
 
     IntRect objectRect = pixelSnappedIntRect(elementRect());
     IntPoint scrollPosition = scrollableArea->scrollPosition();
     IntRect scrollVisibleRect = scrollableArea->visibleContentRect();
 
     int desiredX = computeBestScrollOffset(
         scrollPosition.x(),
         objectRect.x() + subfocus.x(), objectRect.x() + subfocus.maxX(),
@@ skipping 153 matching lines @@
         return ToggleButtonRole;
     if (ariaHasPopup())
         return PopUpButtonRole;
     // We don't contemplate RadioButtonRole, as it depends on the input
     // type.
 
     return ButtonRole;
 }
 
 } // namespace WebCore