Fix for PDF menu should not come when mouse pointer is on the scrollbar.

pdf/instance.cc

 // Copyright (c) 2012 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 "pdf/instance.h"
 
 #include <algorithm>  // for min()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 416 matching lines @@
   }
 
 #ifdef ENABLE_THUMBNAILS
   if (event.GetType() == PP_INPUTEVENT_TYPE_MOUSELEAVE)
     thumbnails_.SlideOut();
 
   if (thumbnails_.HandleEvent(event_device_res))
     return true;
 #endif
 
-  if (toolbar_->HandleEvent(event_device_res))
+  if (!IsMouseOnScrollbar(event_device_res) &&
+      toolbar_->HandleEvent(event_device_res))
     return true;
 
 #ifdef ENABLE_THUMBNAILS
   if (v_scrollbar_.get() && event.GetType() == PP_INPUTEVENT_TYPE_MOUSEMOVE) {
     pp::MouseInputEvent mouse_event(event);
     pp::Point pt = mouse_event.GetPosition();
     pp::Rect v_scrollbar_rc;
     v_scrollbar_->GetLocation(&v_scrollbar_rc);
     // There is a bug (https://bugs.webkit.org/show_bug.cgi?id=45208)
     // in the webkit that makes event.u.mouse.button
@@ skipping 41 matching lines @@
           event.GetTimeStamp(),
           event.GetModifiers(),
           mouse_event.GetButton(),
           point,
           mouse_event.GetClickCount(),
           mouse_event.GetMovement());
       if (!engine_->IsSelecting()) {
         if (!IsOverlayScrollbar() &&
             !available_area_.Contains(mouse_event.GetPosition())) {
           try_engine_first = false;
-        } else if (IsOverlayScrollbar()) {
-          pp::Rect temp;
-          if ((v_scrollbar_.get() && v_scrollbar_->GetLocation(&temp) &&
-              temp.Contains(mouse_event_dip.GetPosition())) ||
-              (h_scrollbar_.get() && h_scrollbar_->GetLocation(&temp) &&
-              temp.Contains(mouse_event_dip.GetPosition()))) {
+        } else if (IsOverlayScrollbar() && IsMouseOnScrollbar(event)) {
             try_engine_first = false;
-          }
         }
       }
       break;
     }
     default:
       break;
   }
   if (try_engine_first && engine_->HandleEvent(offset_event))
     return true;
 
@@ skipping 1080 matching lines @@
 }
 
 void Instance::RotateClockwise() {
   engine_->RotateClockwise();
 }
 
 void Instance::RotateCounterclockwise() {
   engine_->RotateCounterclockwise();
 }
 
+bool Instance::IsMouseOnScrollbar(const pp::InputEvent& event) {
+  pp::MouseInputEvent mouse_event(event);
+  if (mouse_event.is_null())
+    return false;
+
+  pp::Point pt = mouse_event.GetPosition();
+  pp::Rect temp;
+  if ((v_scrollbar_.get() && v_scrollbar_->GetLocation(&temp) &&
+       temp.Contains(pt)) ||
+      (h_scrollbar_.get() && h_scrollbar_->GetLocation(&temp) &&
+       temp.Contains(pt))) {
+    return true;
+  }
+  return false;
+}
+
 void Instance::PreviewDocumentLoadComplete() {
   if (preview_document_load_state_ != LOAD_STATE_LOADING ||
       preview_pages_info_.empty()) {
     return;
   }
 
   preview_document_load_state_ = LOAD_STATE_COMPLETE;
 
   int dest_page_index = preview_pages_info_.front().second;
   int src_page_index =
@@ skipping 1175 matching lines @@
   return instance_->HasScriptableMethod(name, exception);
 }
 
 pp::Var PDFScriptableObject::Call(const pp::Var& method,
                                   const std::vector<pp::Var>& args,
                                   pp::Var* exception) {
   return instance_->CallScriptableMethod(method, args, exception);
 }
 
 }  // namespace chrome_pdf