Reviewed by Brady Eidson (with help from Mark Rowe)

        Fixed return values for unsigned-long-long delegate methods

        * WebView/WebView.mm:
        (CallDelegateReturningUnsignedLongLong):
        redid the change that Brady did at home over the weekend but forgot to check in

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

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index bdf6c36d134be52dfd22af91507b0d7aebd56e6b..569392e8c29040b6a34de2e59a0e055dcb253200 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-04  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Brady Eidson (with help from Mark Rowe)
+        
+        Fixed return values for unsigned-long-long delegate methods
+
+        * WebView/WebView.mm:
+        (CallDelegateReturningUnsignedLongLong):
+        redid the change that Brady did at home over the weekend but forgot to check in
+
 2007-11-27  Adam Roben  <aroben@apple.com>
 
         Remove -[WebFrameBridge setNeedsReapplyStyles]

diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 3c2b9b6246a4d5272ed7bb647e426651c3f6853c..f3241424478aae3932ea0b3cf1912736d331bae6 100644 (file)
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -4256,14 +4256,16 @@ static inline float CallDelegateReturningFloat(WebView *self, id delegate, SEL s
     return 0.0f;
 }
 
+typedef unsigned long long (*msg64)(id, SEL, ...);
+
 static inline unsigned long long CallDelegateReturningUnsignedLongLong(WebView *self, id delegate, SEL selector, id object1, id object2, unsigned long long integer)
 {
     if (!delegate || ![delegate respondsToSelector:selector])
         return 0;
     if (!self->_private->catchesDelegateExceptions)
-        return static_cast<unsigned long long>(objc_msgSend_fpret(delegate, selector, self, object1, object2, integer));
+        return reinterpret_cast<msg64>(objc_msgSend)(delegate, selector, self, object1, object2, integer);
     @try {
-        return static_cast<unsigned long long>(objc_msgSend_fpret(delegate, selector, self, object1, object2, integer));
+        return reinterpret_cast<msg64>(objc_msgSend)(delegate, selector, self, object1, object2, integer);
     } @catch(id exception) {
         ReportDiscardedDelegateException(selector, exception);
     }
@@ -4275,9 +4277,9 @@ static inline unsigned long long CallDelegateReturningUnsignedLongLong(WebView *
     if (!delegate || ![delegate respondsToSelector:selector])
         return 0;
     if (!self->_private->catchesDelegateExceptions)
-        return static_cast<unsigned long long>(objc_msgSend_fpret(delegate, selector, self, object1, integer, object2));
+        return reinterpret_cast<msg64>(objc_msgSend)(delegate, selector, self, object1, integer, object2);
     @try {
-        return static_cast<unsigned long long>(objc_msgSend_fpret(delegate, selector, self, object1, integer, object2));
+        return reinterpret_cast<msg64>(objc_msgSend)(delegate, selector, self, object1, integer, object2);
     } @catch(id exception) {
         ReportDiscardedDelegateException(selector, exception);
     }