Fix the build
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Oct 2015 17:12:38 +0000 (17:12 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Oct 2015 17:12:38 +0000 (17:12 +0000)
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::collectKeyboardLayoutCommandsForEvent):

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h
Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm

index 9d75b875260f8aebafbbdc45c5f08dc2998eb837..5e0caa5737f9461f4da63a02c4b9adf4fb9edb8e 100644 (file)
@@ -1,3 +1,11 @@
+2015-10-30  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build
+
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::collectKeyboardLayoutCommandsForEvent):
+
 2015-10-30  Tim Horton  <timothy_horton@apple.com>
 
         WKView being inside WKWebView leads to weird API issues
index cb44c0aa8770507f8baaddcf39764b99c0122750..1966a35ac3d4c3b7e41ef5d1a1ada4e34940c32c 100644 (file)
@@ -454,7 +454,7 @@ private:
     void setUserInterfaceItemState(NSString *commandName, bool enabled, int state);
 
 #if USE(ASYNC_NSTEXTINPUTCLIENT)
-    void collectKeyboardLayoutCommandsForEvent(NSEvent *, Vector<WebCore::KeypressCommand>&);
+    Vector<WebCore::KeypressCommand> collectKeyboardLayoutCommandsForEvent(NSEvent *);
     void interpretKeyEvent(NSEvent *, void(^completionHandler)(BOOL handled, const Vector<WebCore::KeypressCommand>&));
 #else
     void executeSavedKeypressCommands();
index 9e68cef9b86b975f064472e9136be5e629c4754f..6a5449f8b9ee30dd8ed53e42b4f84376186a2947 100644 (file)
@@ -3135,10 +3135,10 @@ static bool eventKeyCodeIsZeroOrNumLockOrFn(NSEvent *event)
 
 Vector<WebCore::KeypressCommand> WebViewImpl::collectKeyboardLayoutCommandsForEvent(NSEvent *event)
 {
-    Vector<WebCore::KeypressCommand>& commands;
+    Vector<WebCore::KeypressCommand> commands;
 
     if ([event type] != NSKeyDown)
-        return;
+        return commands;
 
     ASSERT(!m_collectedKeypressCommands);
     m_collectedKeypressCommands = &commands;