Title: [191794] trunk/Source/WebKit2
- Revision
- 191794
- Author
- [email protected]
- Date
- 2015-10-30 10:12:38 -0700 (Fri, 30 Oct 2015)
Log Message
Fix the build
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::collectKeyboardLayoutCommandsForEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191793 => 191794)
--- trunk/Source/WebKit2/ChangeLog 2015-10-30 17:05:58 UTC (rev 191793)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-30 17:12:38 UTC (rev 191794)
@@ -1,5 +1,13 @@
2015-10-30 Tim Horton <[email protected]>
+ Fix the build
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::collectKeyboardLayoutCommandsForEvent):
+
+2015-10-30 Tim Horton <[email protected]>
+
WKView being inside WKWebView leads to weird API issues
https://bugs.webkit.org/show_bug.cgi?id=150174
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (191793 => 191794)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-30 17:05:58 UTC (rev 191793)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-30 17:12:38 UTC (rev 191794)
@@ -454,7 +454,7 @@
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();
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (191793 => 191794)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-30 17:05:58 UTC (rev 191793)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-30 17:12:38 UTC (rev 191794)
@@ -3135,10 +3135,10 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
