Title: [96571] trunk/Source/WebCore
Revision
96571
Author
rn...@webkit.org
Date
2011-10-03 21:16:29 -0700 (Mon, 03 Oct 2011)

Log Message

Mac release build fix after r96561, and Leopard build fix after r96568.

* editing/TextCheckingHelper.h:
(WebCore::TextCheckingParagraph::textCharAt):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::wheelEvent):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (96570 => 96571)


--- trunk/Source/WebCore/ChangeLog	2011-10-04 03:52:43 UTC (rev 96570)
+++ trunk/Source/WebCore/ChangeLog	2011-10-04 04:16:29 UTC (rev 96571)
@@ -1,5 +1,14 @@
 2011-10-03  Ryosuke Niwa  <rn...@webkit.org>
 
+        Mac release build fix after r96561, and Leopard build fix after r96568.
+
+        * editing/TextCheckingHelper.h:
+        (WebCore::TextCheckingParagraph::textCharAt):
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::wheelEvent):
+
+2011-10-03  Ryosuke Niwa  <rn...@webkit.org>
+
         Build fix after r96568.
 
         * accessibility/AccessibilityObject.cpp:

Modified: trunk/Source/WebCore/editing/TextCheckingHelper.h (96570 => 96571)


--- trunk/Source/WebCore/editing/TextCheckingHelper.h	2011-10-04 03:52:43 UTC (rev 96570)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.h	2011-10-04 04:16:29 UTC (rev 96571)
@@ -41,7 +41,7 @@
     int textLength() const { return text().length(); }
     String textSubstring(unsigned pos, unsigned len = UINT_MAX) const { return text().substring(pos, len); }
     const UChar* textCharacters() const { return text().characters(); }
-    UChar textCharAt(int index) const { return text()[index]; }
+    UChar textCharAt(int index) const { return text()[static_cast<unsigned>(index)]; }
 
     bool isEmpty() const;
     bool isTextEmpty() const { return text().isEmpty(); }

Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (96570 => 96571)


--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm	2011-10-04 03:52:43 UTC (rev 96570)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm	2011-10-04 04:16:29 UTC (rev 96571)
@@ -109,7 +109,7 @@
     bool handled = handleWheelEvent(wheelEvent);
 
     ASSERT(handled == wheelEvent.isAccepted());
-    return wheelEvent.isAccepted();
+    return handled;
 }
 
 bool EventHandler::keyEvent(NSEvent *event)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to