WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/page/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *
  * 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 607 matching lines @@
             stopAutoscrollTimer();
             return;
         }
 #if ENABLE(PAN_SCROLLING)
         setPanScrollCursor();
         toRenderBox(r)->panScroll(m_panScrollStartPos);
 #endif
     }
 }
 
+#if ENABLE(PAN_SCROLLING)
 void EventHandler::setPanScrollCursor()
 {
     // At the original click location we draw a 4 arrowed icon. Over this icon there won't be any scroll
     // So we don't want to change the cursor over this area
     const int noScrollRadius = 9;
     bool east = m_panScrollStartPos.x() < (m_currentMousePosition.x() - noScrollRadius);
     bool west = m_panScrollStartPos.x() > (m_currentMousePosition.x() + noScrollRadius);
     bool north = m_panScrollStartPos.y() > (m_currentMousePosition.y() + noScrollRadius);
     bool south = m_panScrollStartPos.y() < (m_currentMousePosition.y() - noScrollRadius);
          
@@ skipping 11 matching lines @@
             m_frame->view()->setCursor(southWestPanningCursor());
         else
             m_frame->view()->setCursor(southPanningCursor());
     } else if (east)
         m_frame->view()->setCursor(eastPanningCursor());
     else if (west)
         m_frame->view()->setCursor(westPanningCursor());
     else
         m_frame->view()->setCursor(middlePanningCursor());
 }
+#endif  // ENABLE(PAN_SCROLLING)
 
 RenderObject* EventHandler::autoscrollRenderer() const
 {
     return m_autoscrollRenderer;
 }
 
 void EventHandler::updateAutoscrollRenderer()
 {
     if (!m_autoscrollRenderer)
         return;
@@ skipping 896 matching lines @@
         while (renderer) {
             node = renderer->element();
             if (node && node->isFocusable()) {
                 // To fix <rdar://problem/4895428> Can't drag selected ToDo, we don't focus a 
                 // node on mouse down if it's selected and inside a focused node. It will be 
                 // focused if the user does a mouseup over it, however, because the mouseup
                 // will set a selection inside it, which will call setFocuseNodeIfNeeded.
                 ExceptionCode ec = 0;
                 Node* n = node->isShadowNode() ? node->shadowParentNode() : node;
                 if (m_frame->selection()->isRange() && 
-                    m_frame->selection()->toRange()->compareNode(n, ec) == Range::NODE_INSIDE &&
+                    m_frame->selection()->toNormalizedRange()->compareNode(n, ec) == Range::NODE_INSIDE &&
                     n->isDescendantOf(m_frame->document()->focusedNode()))
                     return false;
                     
                 break;
             }
             
             renderer = renderer->parent();
         }
         // If focus shift is blocked, we eat the event.  Note we should never clear swallowEvent
         // if the page already set it (e.g., by canceling default behavior).
@@ skipping 728 matching lines @@
 }
 
 bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev, Scrollbar* scrollbar)
 {
     if (!scrollbar || !scrollbar->enabled())
         return false;
     return scrollbar->mouseDown(mev.event());
 }
 
 }