[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mitz at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 6ba1afda158e6747603bbd37123cf944656fb3ab
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 01:32:37 2011 +0000

    Several WKView Internal category methods are implemented in the main category.
    https://bugs.webkit.org/show_bug.cgi?id=53195
    
    Patch by Jing Jin <jjin at apple.com> on 2011-01-26
    Rubber-stamped by Dan Bernstein.
    
    * UIProcess/API/mac/WKView.mm:
    (-[WKView _setEventBeingResent:]): Moved into implementation of WKView (Internal).
    (-[WKView _interceptKeyEvent:]): Moved into implementation of WKView (Internal).
    (-[WKView _getTextInputState:selectionEnd:underlines:WebCore::]): Moved into implementation of WKView (Internal).
    (-[WKView _setAccessibilityChildToken:]): Moved into implementation of WKView (Internal).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 647a151..1c4e9f7 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-26  Jing Jin  <jjin at apple.com>
+
+        Rubber-stamped by Dan Bernstein.
+        
+        Several WKView Internal category methods are implemented in the main category.
+        https://bugs.webkit.org/show_bug.cgi?id=53195
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _setEventBeingResent:]): Moved into implementation of WKView (Internal).
+        (-[WKView _interceptKeyEvent:]): Moved into implementation of WKView (Internal).
+        (-[WKView _getTextInputState:selectionEnd:underlines:WebCore::]): Moved into implementation of WKView (Internal).
+        (-[WKView _setAccessibilityChildToken:]): Moved into implementation of WKView (Internal).
+
 2011-01-26  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index a14be39..98701d5 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -842,27 +842,6 @@ EVENT_HANDLER(scrollWheel, Wheel)
     return [self _handleStyleKeyEquivalent:event] || [super performKeyEquivalent:event];
 }
 
-- (void)_setEventBeingResent:(NSEvent *)event
-{
-    _data->_keyDownEventBeingResent = [event retain];
-}
-
-- (Vector<KeypressCommand>&)_interceptKeyEvent:(NSEvent *)theEvent 
-{
-    _data->_commandsList.clear();
-    // interpretKeyEvents will trigger one or more calls to doCommandBySelector or setText
-    // that will populate the commandsList vector.
-    [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
-    return _data->_commandsList;
-}
-
-- (void)_getTextInputState:(unsigned)start selectionEnd:(unsigned)end underlines:(Vector<WebCore::CompositionUnderline>&)lines
-{
-    start = _data->_selectionStart;
-    end = _data->_selectionEnd;
-    lines = _data->_underlines;
-}
-
 - (void)keyUp:(NSEvent *)theEvent
 {
     _data->_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent, self));
@@ -1304,14 +1283,6 @@ static void drawPageBackground(CGContextRef context, WebPageProxy* page, const I
     _data->_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
 }
 
-- (void)_setAccessibilityChildToken:(NSData *)data
-{
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
-    _data->_remoteAccessibilityChild = WKAXRemoteElementForToken((CFDataRef)data);
-    [self _setRemoteAccessibilityWindow:[self window]];
-#endif
-}
-
 - (BOOL)accessibilityIsIgnored
 {
     return NO;
@@ -1446,6 +1417,27 @@ static void drawPageBackground(CGContextRef context, WebPageProxy* page, const I
     }
 }
 
+- (void)_setEventBeingResent:(NSEvent *)event
+{
+    _data->_keyDownEventBeingResent = [event retain];
+}
+
+- (Vector<KeypressCommand>&)_interceptKeyEvent:(NSEvent *)theEvent 
+{
+    _data->_commandsList.clear();
+    // interpretKeyEvents will trigger one or more calls to doCommandBySelector or setText
+    // that will populate the commandsList vector.
+    [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
+    return _data->_commandsList;
+}
+
+- (void)_getTextInputState:(unsigned)start selectionEnd:(unsigned)end underlines:(Vector<WebCore::CompositionUnderline>&)lines
+{
+    start = _data->_selectionStart;
+    end = _data->_selectionEnd;
+    lines = _data->_underlines;
+}
+
 - (NSRect)_convertToDeviceSpace:(NSRect)rect
 {
     return toDeviceSpace(rect, [self window]);
@@ -1684,6 +1676,14 @@ static void drawPageBackground(CGContextRef context, WebPageProxy* page, const I
 }
 #endif // USE(ACCELERATED_COMPOSITING)
 
+- (void)_setAccessibilityChildToken:(NSData *)data
+{
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
+    _data->_remoteAccessibilityChild = WKAXRemoteElementForToken((CFDataRef)data);
+    [self _setRemoteAccessibilityWindow:[self window]];
+#endif
+}
+
 - (void)_setComplexTextInputEnabled:(BOOL)complexTextInputEnabled pluginComplexTextInputIdentifier:(uint64_t)pluginComplexTextInputIdentifier
 {
     BOOL inputSourceChanged = _data->_pluginComplexTextInputIdentifier;

-- 
WebKit Debian packaging