Audited and renamed uses of methods and variables named RootView

Source/web/ValidationMessageClientImpl.cpp

 /*
  * Copyright (C) 2012 Google 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 55 matching lines @@
 {
     if (message.isEmpty()) {
         hideValidationMessage(anchor);
         return;
     }
     if (!anchor.renderBox())
         return;
     if (m_currentAnchor)
         hideValidationMessage(*m_currentAnchor);
     m_currentAnchor = &anchor;
-    IntRect anchorInRootView = currentView()->contentsToRootView(anchor.pixelSnappedBoundingBox());
-    m_lastAnchorRectInScreen = currentView()->hostWindow()->rootViewToScreen(anchorInRootView);
+    IntRect anchorInViewport = currentView()->contentsToWindow(anchor.pixelSnappedBoundingBox());
+    m_lastAnchorRectInScreen = currentView()->hostWindow()->viewportToScreen(anchorInViewport);
     m_lastPageScaleFactor = m_webView.pageScaleFactor();
     m_message = message;
     const double minimumSecondToShowValidationMessage = 5.0;
     const double secondPerCharacter = 0.05;
     const double statusCheckInterval = 0.1;
 
-    m_webView.client()->showValidationMessage(anchorInRootView, m_message, toWebTextDirection(messageDir),
+    m_webView.client()->showValidationMessage(anchorInViewport, m_message, toWebTextDirection(messageDir),
         subMessage, toWebTextDirection(subMessageDir));
 
     m_finishTime = monotonicallyIncreasingTime() + std::max(minimumSecondToShowValidationMessage, (message.length() + subMessage.length()) * secondPerCharacter);
     // FIXME: We should invoke checkAnchorStatus actively when layout, scroll,
     // or page scale change happen.
     m_timer.startRepeating(statusCheckInterval, FROM_HERE);
 }
 
 void ValidationMessageClientImpl::hideValidationMessage(const Element& anchor)
 {
@@ skipping 20 matching lines @@
 void ValidationMessageClientImpl::checkAnchorStatus(Timer<ValidationMessageClientImpl>*)
 {
     ASSERT(m_currentAnchor);
     if (monotonicallyIncreasingTime() >= m_finishTime || !currentView()) {
         hideValidationMessage(*m_currentAnchor);
         return;
     }
 
     // Check the visibility of the element.
     // FIXME: Can we check invisibility by scrollable non-frame elements?
-    IntRect newAnchorRect = currentView()->contentsToRootView(m_currentAnchor->pixelSnappedBoundingBox());
-    newAnchorRect = intersection(currentView()->convertToContainingWindow(currentView()->boundsRect()), newAnchorRect);
-    if (newAnchorRect.isEmpty()) {
+    IntRect newAnchorRectInViewport = currentView()->contentsToWindow(m_currentAnchor->pixelSnappedBoundingBox());
+
+    // FIXME: This intersection eliminates the part of the rect outside the root view.
+    // If this is meant as a visiblity test, intersecting it against the viewport rect
+    // likely makes more sense.
+    newAnchorRectInViewport = intersection(currentView()->convertToContainingWindow(currentView()->boundsRect()), newAnchorRectInViewport);
+    if (newAnchorRectInViewport.isEmpty()) {
         hideValidationMessage(*m_currentAnchor);
         return;
     }
 
-    IntRect newAnchorRectInScreen = currentView()->hostWindow()->rootViewToScreen(newAnchorRect);
-    if (newAnchorRectInScreen == m_lastAnchorRectInScreen && m_webView.pageScaleFactor() == m_lastPageScaleFactor)
+    IntRect newAnchorRectInViewportInScreen = currentView()->hostWindow()->viewportToScreen(newAnchorRectInViewport);
+    if (newAnchorRectInViewportInScreen == m_lastAnchorRectInScreen && m_webView.pageScaleFactor() == m_lastPageScaleFactor)
         return;
-    m_lastAnchorRectInScreen = newAnchorRectInScreen;
+    m_lastAnchorRectInScreen = newAnchorRectInViewportInScreen;
     m_lastPageScaleFactor = m_webView.pageScaleFactor();
-    m_webView.client()->moveValidationMessage(newAnchorRect);
+    m_webView.client()->moveValidationMessage(newAnchorRectInViewport);
 }
 
 void ValidationMessageClientImpl::willBeDestroyed()
 {
     if (m_currentAnchor)
         hideValidationMessage(*m_currentAnchor);
 }
 
 DEFINE_TRACE(ValidationMessageClientImpl)
 {
     visitor->trace(m_currentAnchor);
     ValidationMessageClient::trace(visitor);
 }
 
 } // namespace blink