Simplify computation of the invalidation rect for a frame.

ppapi/tests/test_view.cc

 // Copyright (c) 2011 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.
 
 #include "ppapi/tests/test_view.h"
 
 #include <sstream>
 
 #include "ppapi/c/pp_time.h"
 #include "ppapi/c/private/ppb_testing_private.h"
@@ skipping 124 matching lines @@
   ASSERT_TRUE(last_view_.GetRect() == desired_rect);
 
   PASS();
 }
 
 std::string TestView::TestClipChange() {
   pp::Rect original_rect = last_view_.GetRect();
 
   // Original clip should be the full frame.
   pp::Rect original_clip = last_view_.GetClipRect();
-  ASSERT_TRUE(original_clip.x() == 0);
-  ASSERT_TRUE(original_clip.y() == 0);
+  ASSERT_TRUE(original_clip.x() == 1);
+  ASSERT_TRUE(original_clip.y() == 1);
   ASSERT_TRUE(original_clip.width() == original_rect.width());
   ASSERT_TRUE(original_clip.height() == original_rect.height());
 
   int clip_amount = original_rect.height() / 2;
 
   // It might be nice to set the position to be absolute and set the location,
   // but this will cause WebKit to actually tear down the plugin and recreate
   // it. So instead we add a big div to cause the document to be scrollable,
   // and scroll it down.
   std::ostringstream script_stream;
   script_stream
       << "var big = document.createElement('div');"
       << "big.setAttribute('style', 'position:absolute; left:100px; "
                                     "top:0px; width:1px; height:5000px;');"
       << "document.body.appendChild(big);"
       << "window.scrollBy(0, " << original_rect.y() + clip_amount << ");";
 
   instance_->EvalScript(script_stream.str());
 
   pp::Rect desired_clip = original_clip;
-  desired_clip.set_y(clip_amount);
-  desired_clip.set_height(desired_clip.height() - desired_clip.y());
+  desired_clip.set_y(clip_amount + original_clip.y());
+  desired_clip.set_height(
+    desired_clip.height() - desired_clip.y() +  original_clip.y());
 
   while (WaitUntilViewChanged() && last_view_.GetClipRect() != desired_clip) {
   }
   ASSERT_TRUE(last_view_.GetClipRect() == desired_clip);
   PASS();
 }
 
 std::string TestView::TestScrollOffsetChange() {
   instance_->EvalScript("document.body.style.width = '5000px';"
                         "document.body.style.height = '5000px';");
   instance_->EvalScript("window.scrollTo(5, 1);");
 
   while (WaitUntilViewChanged() &&
          last_view_.GetScrollOffset() != pp::Point(5, 1)) {
   }
   ASSERT_EQ(pp::Point(5, 1), last_view_.GetScrollOffset());
 
   instance_->EvalScript("window.scrollTo(0, 0);");
 
   while (WaitUntilViewChanged() &&
          last_view_.GetScrollOffset() != pp::Point(0, 0)) {
   }
   ASSERT_EQ(pp::Point(0, 0), last_view_.GetScrollOffset());
 
   PASS();
 }