Fix mac bustage in FrameMac.mm and FrameViewMac.mm

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16684 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 4f0b1f3183beb2933b652fe04e34d98078743270..712bdb6001246e83e7c3eb5cf7db877dded0b401 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -2335,23 +2335,6 @@
                FAE04190097596C9000540BE /* SVGImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE0418E097596C9000540BE /* SVGImageLoader.h */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-               BCCA09250ACCF95C00E0C915 /* Development */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                       };
-                       name = Development;
-               };
-               BCCA09260ACCF95C00E0C915 /* Deployment */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                       };
-                       name = Deployment;
-               };
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
                DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -9193,12 +9176,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                       buildSettings = {
-                       };
-                       buildStyles = (
-                               BCCA09250ACCF95C00E0C915 /* Development */,
-                               BCCA09260ACCF95C00E0C915 /* Deployment */,
-                       );
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index 1b08cf4b6fe5709f31f088b25927263043d80c15..dd8b82aa409f49ae9eebe041c4a4669f2fd9d920 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -57,6 +57,7 @@
 #import "Logging.h"
 #import "MouseEventWithHitTestResults.h"
 #import "PlatformKeyboardEvent.h"
+#import "PlatformScrollBar.h"
 #import "PlatformWheelEvent.h"
 #import "Plugin.h"
 #import "RegularExpression.h"
@@ -1384,7 +1385,7 @@ void FrameMac::handleMousePressEvent(const MouseEventWithHitTestResults& event)
 
     _mouseDownMayStartAutoscroll = d->m_mousePressNode && d->m_mousePressNode->renderer() && d->m_mousePressNode->renderer()->shouldAutoscroll();
     
-    if (!passWidgetMouseDownEventToWidget(event, false)) {
+    if (!passWidgetMouseDownEventToWidget(event)) {
         // We don't do this at the start of mouse down handling (before calling into WebCore),
         // because we don't want to do it until we know we didn't hit a widget.
         NSView *view = d->m_view->getDocumentView();

diff --git a/WebCore/bridge/mac/FrameViewMac.mm b/WebCore/bridge/mac/FrameViewMac.mm
index c8dfeb87241cb7ef632d01b229b04de16dafce32..7c22809534f7ab38d5094d29ff1b85dec60a7728 100644 (file)
--- a/WebCore/bridge/mac/FrameViewMac.mm
+++ b/WebCore/bridge/mac/FrameViewMac.mm
@@ -57,19 +57,19 @@ bool FrameView::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev,
     return Mac(m_frame.get())->passSubframeEventToSubframe(mev, subframe);
 }
 
-bool FrameView::passMouseMoveEventToSubframe(MouseEventWithHitTestResults&, Frame*)
+bool FrameView::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
 {
     return Mac(m_frame.get())->passSubframeEventToSubframe(mev, subframe);
 }
 
-bool FrameView::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&, Frame*)
+bool FrameView::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
 {
     return Mac(m_frame.get())->passSubframeEventToSubframe(mev, subframe);
 }
 
-bool FrameView::passWheelEventToSubframe(PlatformWheelEvent&, Frame*)
+bool FrameView::passWheelEventToSubframe(PlatformWheelEvent&, Frame* subframe)
 {
-    return Mac(m_frame.get())->passWheelEventToWidget(subframe);
+    return Mac(m_frame.get())->passWheelEventToWidget(subframe->view());
 }
     
 }