Diff
Modified: trunk/Source/WebKit2/ChangeLog (97803 => 97804)
--- trunk/Source/WebKit2/ChangeLog 2011-10-18 23:05:10 UTC (rev 97803)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-18 23:06:31 UTC (rev 97804)
@@ -1,5 +1,32 @@
2011-10-18 Sam Weinig <[email protected]>
+ Move spellCheckerDocumentTag and handleCorrectionPanelResult from WKViewPrivate to WKViewInternal
+ https://bugs.webkit.org/show_bug.cgi?id=70377
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView spellCheckerDocumentTag]):
+ (-[WKView handleCorrectionPanelResult:]):
+ Move definition of methods to (Internal) area.
+
+ * UIProcess/API/mac/WKViewInternal.h:
+ Add methods.
+
+ * UIProcess/API/mac/WKViewPrivate.h:
+ Remove methods.
+
+ * UIProcess/cf/WebBackForwardListCF.cpp:
+ Add missing newline.
+
+ * UIProcess/mac/CorrectionPanel.mm:
+ Change #include to WKViewInternal.h
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Sort some files.
+
+2011-10-18 Sam Weinig <[email protected]>
+
Move WKView helper files into a sub-group
https://bugs.webkit.org/show_bug.cgi?id=70375
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (97803 => 97804)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-18 23:05:10 UTC (rev 97803)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-18 23:06:31 UTC (rev 97804)
@@ -2621,6 +2621,20 @@
#endif
}
+- (NSInteger)spellCheckerDocumentTag
+{
+ if (!_data->_hasSpellCheckerDocumentTag) {
+ _data->_spellCheckerDocumentTag = [NSSpellChecker uniqueSpellDocumentTag];
+ _data->_hasSpellCheckerDocumentTag = YES;
+ }
+ return _data->_spellCheckerDocumentTag;
+}
+
+- (void)handleCorrectionPanelResult:(NSString*)result
+{
+ _data->_page->handleCorrectionPanelResult(result);
+}
+
@end
@implementation WKView (Private)
@@ -2653,20 +2667,6 @@
_data->_page->performDictionaryLookupAtLocation(FloatPoint(thePoint.x, thePoint.y));
}
-- (NSInteger)spellCheckerDocumentTag
-{
- if (!_data->_hasSpellCheckerDocumentTag) {
- _data->_spellCheckerDocumentTag = [NSSpellChecker uniqueSpellDocumentTag];
- _data->_hasSpellCheckerDocumentTag = YES;
- }
- return _data->_spellCheckerDocumentTag;
-}
-
-- (void)handleCorrectionPanelResult:(NSString*)result
-{
- _data->_page->handleCorrectionPanelResult(result);
-}
-
@end
@implementation WKResponderChainSink
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (97803 => 97804)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2011-10-18 23:05:10 UTC (rev 97803)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2011-10-18 23:06:31 UTC (rev 97804)
@@ -89,4 +89,8 @@
#endif
- (void)_cacheWindowBottomCornerRect;
+
+- (NSInteger)spellCheckerDocumentTag;
+- (void)handleCorrectionPanelResult:(NSString*)result;
+
@end
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h (97803 => 97804)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h 2011-10-18 23:05:10 UTC (rev 97803)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h 2011-10-18 23:06:31 UTC (rev 97804)
@@ -34,7 +34,4 @@
- (BOOL)frameSizeUpdatesDisabled;
- (void)performDictionaryLookupAtCurrentMouseLocation;
-
-- (NSInteger)spellCheckerDocumentTag;
-- (void)handleCorrectionPanelResult:(NSString*)result;
@end
Modified: trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp (97803 => 97804)
--- trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2011-10-18 23:05:10 UTC (rev 97803)
+++ trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2011-10-18 23:06:31 UTC (rev 97804)
@@ -25,6 +25,7 @@
#include "config.h"
#include "WebBackForwardList.h"
+
#include "Logging.h"
#include <wtf/RetainPtr.h>
#include <CoreFoundation/CoreFoundation.h>
Modified: trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm (97803 => 97804)
--- trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm 2011-10-18 23:05:10 UTC (rev 97803)
+++ trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm 2011-10-18 23:06:31 UTC (rev 97804)
@@ -29,7 +29,7 @@
#import "WebPageProxy.h"
#import "WKView.h"
-#import "WKViewPrivate.h"
+#import "WKViewInternal.h"
using namespace WebCore;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (97803 => 97804)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2011-10-18 23:05:10 UTC (rev 97803)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2011-10-18 23:06:31 UTC (rev 97804)
@@ -3168,17 +3168,17 @@
BCBAAC58144E38B90053F82F /* WKView Details */ = {
isa = PBXGroup;
children = (
- BC8699B4116AADAA002A925B /* WKViewInternal.h */,
1A9101081268C8CA001842F5 /* FindIndicatorWindow.h */,
1A9101091268C8CA001842F5 /* FindIndicatorWindow.mm */,
+ BC111B4B112F619200337BAB /* PageClientImpl.h */,
+ BC111B4C112F619200337BAB /* PageClientImpl.mm */,
1AAF061212B01131008E49E2 /* PDFViewController.h */,
1AAF061312B01131008E49E2 /* PDFViewController.mm */,
- BC111B4B112F619200337BAB /* PageClientImpl.h */,
- BC111B4C112F619200337BAB /* PageClientImpl.mm */,
E134F01512EA5D11004EC58D /* WKPrintingView.h */,
E134F01912EA5D99004EC58D /* WKPrintingView.mm */,
1A4A9AA612B7E796008FE984 /* WKTextInputWindowController.h */,
1A4A9AA712B7E796008FE984 /* WKTextInputWindowController.mm */,
+ BC8699B4116AADAA002A925B /* WKViewInternal.h */,
);
name = "WKView Details";
sourceTree = "<group>";
