WebCore:

        Reviewed by John Sullivan.

        Removing use of SPI in favor of Carbon API to enable and disable secure event input.

        * WebCore.exp: Removed wkSecureEventInput and wkSetSecureEventInput.
        * platform/mac/WebCoreSystemInterface.h: ditto.
        * platform/mac/WebCoreSystemInterface.mm: ditto.

        * bridge/mac/FrameMac.mm:
        (WebCore::FrameMac::setSecureKeyboardEntry): Uses EnableSecureEventInput and DisableSecureEventInput.
        (WebCore::FrameMac::secureKeyboardEntry): Uses IsSecureEventInputEnabled.

WebKit:

        Reviewed by John Sullivan.

        Removed wkSecureEventInput and wkSetSecureEventInput, since this can be done with API.

        * WebCoreSupport/WebSystemInterface.m: (InitWebCoreSystemInterface):

WebKitLibraries:

        Reviewed by John Sullivan.

        Removed wkSecureEventInput and wkSetSecureEventInput, since this can be done with API.

        * WebKitSystemInterface.h:
        * libWebKitSystemInterface.a:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2f06542c5a2c51cf79400622ca029f717f018816..6948464490a060c9e6dd139bb2664a5c8b65c38a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2006-08-31  Adele Peterson  <adele@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Removing use of SPI in favor of Carbon API to enable and disable secure event input.
+
+        * WebCore.exp: Removed wkSecureEventInput and wkSetSecureEventInput.
+        * platform/mac/WebCoreSystemInterface.h: ditto.
+        * platform/mac/WebCoreSystemInterface.mm: ditto.
+
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::setSecureKeyboardEntry): Uses EnableSecureEventInput and DisableSecureEventInput.
+        (WebCore::FrameMac::secureKeyboardEntry): Uses IsSecureEventInputEnabled.
+
 2006-08-30  Brady Eidson  <beidson@apple.com>
 
         Reviewed by "common sense" (and Maciej)

diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index 77d1738c82535abd508177547b5e088306e618f4..86e6c8e5bceef6ee2647ae596cca3bb4d790ee47 100644 (file)
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -154,12 +154,10 @@ _wkInitializeGlyphVector
 _wkPathFromFont
 _wkPopupMenu
 _wkReleaseStyleGroup
-_wkSecureEventInput
 _wkSetCGFontRenderingMode
 _wkSetDragImage
 _wkSetNSURLConnectionDefersCallbacks
 _wkSetPatternPhaseInUserSpace
-_wkSetSecureEventInput
 _wkSetUpFontCache
 _wkSignalCFReadStreamEnd
 _wkSignalCFReadStreamError

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index 0830f955d1a407f6dfd7f157b6c424eecb71aa90..dcb28bc65a1b306115e18d2fd8d5326c9b3dfcb0 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -76,6 +76,7 @@
 #import "kjs_window.h"
 #import "visible_units.h"
 #import "WebCoreSystemInterface.h"
+#import <Carbon/Carbon.h>
 #import <JavaScriptCore/NP_jsobject.h>
 #import <JavaScriptCore/npruntime_impl.h>
 
@@ -3341,12 +3342,15 @@ bool FrameMac::inputManagerHasMarkedText() const
 
 void FrameMac::setSecureKeyboardEntry(bool enable)
 {
-    wkSetSecureEventInput(enable);
+    if (enable)
+        EnableSecureEventInput();
+    else
+        DisableSecureEventInput();
 }
 
 bool FrameMac::secureKeyboardEntry()
 {
-    return wkSecureEventInput();
+    return IsSecureEventInputEnabled();
 }
 
 static DeprecatedValueList<MarkedTextUnderline> convertAttributesToUnderlines(const Range *markedTextRange, NSArray *attributes, NSArray *ranges)

diff --git a/WebCore/platform/mac/WebCoreSystemInterface.h b/WebCore/platform/mac/WebCoreSystemInterface.h
index ca47891152408f16701e5e9ecbac2f4427001aa8..c952620001fd942b08be93c0d6d199ff35fa3dab 100644 (file)
--- a/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -89,11 +89,9 @@ extern OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs);
 extern NSString* (*wkPathFromFont)(NSFont*);
 extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*);
 extern void (*wkReleaseStyleGroup)(void* group);
-extern BOOL (*wkSecureEventInput)(void);
 extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
 extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
 extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
-extern void (*wkSetSecureEventInput)(BOOL);
 extern void (*wkSetUpFontCache)(size_t);
 extern void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
 extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);

diff --git a/WebCore/platform/mac/WebCoreSystemInterface.mm b/WebCore/platform/mac/WebCoreSystemInterface.mm
index 67d4d1769a673586deb5fcc49786fda80b431d3a..b339b138f42dc1bf8eeabe1056a9d36571024835 100644 (file)
--- a/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -49,11 +49,9 @@ OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs);
 NSString* (*wkPathFromFont)(NSFont*);
 void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*);
 void (*wkReleaseStyleGroup)(void* group);
-BOOL (*wkSecureEventInput)(void);
 void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
 void (*wkSetDragImage)(NSImage*, NSPoint offset);
 void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
-void (*wkSetSecureEventInput)(BOOL);
 void (*wkSetUpFontCache)(size_t);
 void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
 void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fe50d4c54e6e45ab7df4286eff3bd932db9d170b..bf5827dafb087830f20f2a7d62deb99f29854488 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-31  Adele Peterson  <adele@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Removed wkSecureEventInput and wkSetSecureEventInput, since this can be done with API.
+
+        * WebCoreSupport/WebSystemInterface.m: (InitWebCoreSystemInterface):
+
 2006-08-31  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Tim Omernick

diff --git a/WebKit/WebCoreSupport/WebSystemInterface.m b/WebKit/WebCoreSupport/WebSystemInterface.m
index dcc53c58b4bbf9ff3b53b0688f53aca2086c7bac..f73629de99b9771bc46449637ee6b5ef011df92b 100644 (file)
--- a/WebKit/WebCoreSupport/WebSystemInterface.m
+++ b/WebKit/WebCoreSupport/WebSystemInterface.m
@@ -62,11 +62,9 @@ void InitWebCoreSystemInterface(void)
     INIT(PathFromFont);
     INIT(PopupMenu);
     INIT(ReleaseStyleGroup);
-    INIT(SecureEventInput);
     INIT(SetCGFontRenderingMode);
     INIT(SetDragImage);
     INIT(SetPatternPhaseInUserSpace);
-    INIT(SetSecureEventInput);
     INIT(SetUpFontCache);
     INIT(SignalCFReadStreamEnd);
     INIT(SignalCFReadStreamHasBytes);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 192d9c218aa1066ce6932397795fb46d335693c5..6940b72f046fce64aa0e4c9dbfb27e0b33608215 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-31  Adele Peterson  <adele@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Removed wkSecureEventInput and wkSetSecureEventInput, since this can be done with API.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterface.a:
+
 2006-08-30  Adele Peterson  <adele@apple.com>
 
         Reviewed by Hyatt.

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 701e6ea008a5f8c7d830a9efb1e9262697c501b9..f7128e9a44b823465ce92faf7e6a77de19b33f00 100644 (file)
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -51,9 +51,6 @@ WKNSURLConnectionDelegateProxyPtr WKCreateNSURLConnectionDelegateProxy(void);
 
 void WKDisableCGDeferredUpdates(void);
 
-void WKSetSecureEventInput(BOOL enable);
-BOOL WKSecureEventInput(void);
-
 Class WKNSURLProtocolClassForReqest(NSURLRequest *request);
 
 unsigned WKGetNSAutoreleasePoolCount(void);

diff --git a/WebKitLibraries/libWebKitSystemInterface.a b/WebKitLibraries/libWebKitSystemInterface.a
index 249cbe2a8869b48fc1fce732d4161ee0007467f9..5f989d0dd50b8be0e0e0bf6ea25655d99bd2cb32 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterface.a and b/WebKitLibraries/libWebKitSystemInterface.a differ