Shrink the window used for the NPN_ConvertPoint test

webkit/glue/plugins/test/plugin_windowless_test.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define STRSAFE_NO_DEPRECATE
 #include "base/string_util.h"
 #include "webkit/glue/plugins/test/plugin_windowless_test.h"
 #include "webkit/glue/plugins/test/plugin_client.h"
 
 #if defined(OS_MACOSX)
@@ skipping 190 matching lines @@
   double window_x, window_y;
   browser->convertpoint(id(), 0, 0, NPCoordinateSpacePlugin,
                         &window_x, &window_y, NPCoordinateSpaceWindow);
   double flipped_window_x, flipped_window_y;
   browser->convertpoint(id(), 0, 0, NPCoordinateSpacePlugin,
                         &flipped_window_x, &flipped_window_y,
                         NPCoordinateSpaceFlippedWindow);
 
   CGRect main_display_bounds = CGDisplayBounds(CGMainDisplayID());
 
-  // Check that all the coordinates are right. The plugin is in a 600x600 window
-  // at (100, 100), with a content area origin of (100, 100).
-  // Y-coordinates are not checked exactly so that the test is robust against
-  // toolbar changes, info bar visibility, etc.
+  // Check that all the coordinates are right. The constants below are based on
+  // the window frame set in the UI test and the content offset in the test
+  // html. Y-coordinates are not checked exactly so that the test is robust
+  // against toolbar changes, info and bookmark bar visibility, etc.
+  const int kWindowHeight = 400;
+  const int kWindowXOrigin = 50;
+  const int kWindowYOrigin = 50;
+  const int kPluginXContentOffset = 50;
+  const int kPluginYContentOffset = 50;
+  const int kChromeYTolerance = 200;
+
   std::string error_string;
   if (screen_x != flipped_screen_x)
     error_string = "Flipping screen coordinates shouldn't change x";
   else if (flipped_screen_y != main_display_bounds.size.height - screen_y)
     error_string = "Flipped screen coordinates should be flipped vertically";
-  else if (screen_x != 200)
+  else if (screen_x != kWindowXOrigin + kPluginXContentOffset)
     error_string = "Screen x location is wrong";
-  else if (flipped_screen_y < 200 || flipped_screen_y > 400)
+  else if (flipped_screen_y < kWindowYOrigin + kPluginYContentOffset ||
+           flipped_screen_y > kWindowYOrigin + kPluginYContentOffset +
+                              kChromeYTolerance)
     error_string = "Screen y location is wrong";
   else if (window_x != flipped_window_x)
     error_string = "Flipping window coordinates shouldn't change x";
-  else if (flipped_window_y != 600 - window_y)
+  else if (flipped_window_y != kWindowHeight - window_y)
     error_string = "Flipped window coordinates should be flipped vertically";
-  else if (window_x != 100)
+  else if (window_x != kPluginXContentOffset)
     error_string = "Window x location is wrong";
-  else if (flipped_screen_y < 100 || flipped_screen_y > 300)
+  else if (flipped_window_y < kPluginYContentOffset ||
+           flipped_window_y > kPluginYContentOffset + kChromeYTolerance)
     error_string = "Window y location is wrong";
 
   if (!error_string.empty()) {
     error_string.append(" - ");
     error_string.append(StringForPoint(screen_x, screen_y));
     error_string.append(" - ");
     error_string.append(StringForPoint(flipped_screen_x, flipped_screen_y));
     error_string.append(" - ");
     error_string.append(StringForPoint(window_x, window_y));
     error_string.append(" - ");
     error_string.append(StringForPoint(flipped_window_x, flipped_window_y));
     SetError(error_string);
   }
 #else
   SetError("Unimplemented");
 #endif
   SignalTestCompleted();
 }
 
 } // namespace NPAPIClient