Title: [97811] trunk/Source/WebKit2
- Revision
- 97811
- Author
- [email protected]
- Date
- 2011-10-18 16:25:41 -0700 (Tue, 18 Oct 2011)
Log Message
Stop leaking internal names in WKView API header
https://bugs.webkit.org/show_bug.cgi?id=70380
Reviewed by Anders Carlsson.
Move _frameSizeUpdatesDisabledCount to WKViewData. Since we cannot change the size of
WKView due to the fragile Objective-C ABI, we must rename the existing variable unused. If
drop 32-bit support, we will be able to remove it.
* UIProcess/API/mac/WKView.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView disableFrameSizeUpdates]):
(-[WKView enableFrameSizeUpdates]):
(-[WKView frameSizeUpdatesDisabled]):
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97810 => 97811)
--- trunk/Source/WebKit2/ChangeLog 2011-10-18 23:20:08 UTC (rev 97810)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-18 23:25:41 UTC (rev 97811)
@@ -1,3 +1,21 @@
+2011-10-18 Sam Weinig <[email protected]>
+
+ Stop leaking internal names in WKView API header
+ https://bugs.webkit.org/show_bug.cgi?id=70380
+
+ Reviewed by Anders Carlsson.
+
+ Move _frameSizeUpdatesDisabledCount to WKViewData. Since we cannot change the size of
+ WKView due to the fragile Objective-C ABI, we must rename the existing variable unused. If
+ drop 32-bit support, we will be able to remove it.
+
+ * UIProcess/API/mac/WKView.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView disableFrameSizeUpdates]):
+ (-[WKView enableFrameSizeUpdates]):
+ (-[WKView frameSizeUpdatesDisabled]):
+ * WebKit2.xcodeproj/project.pbxproj:
+
2011-10-18 Alexey Proskuryakov <[email protected]>
Expose PDF information in hit test result
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.h (97810 => 97811)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2011-10-18 23:20:08 UTC (rev 97810)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2011-10-18 23:25:41 UTC (rev 97811)
@@ -31,7 +31,7 @@
WK_EXPORT
@interface WKView : NSView <NSTextInputClient> {
WKViewData *_data;
- unsigned _frameSizeUpdatesDisabledCount;
+ unsigned _unused;
}
- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (97810 => 97811)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-18 23:20:08 UTC (rev 97810)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-18 23:25:41 UTC (rev 97811)
@@ -170,6 +170,8 @@
BOOL _inSecureInputState;
NSRect _windowBottomCornerIntersectionRect;
+
+ unsigned _frameSizeUpdatesDisabledCount;
}
@end
@@ -2641,21 +2643,21 @@
- (void)disableFrameSizeUpdates
{
- _frameSizeUpdatesDisabledCount++;
+ _data->_frameSizeUpdatesDisabledCount++;
}
- (void)enableFrameSizeUpdates
{
- if (!_frameSizeUpdatesDisabledCount)
+ if (!_data->_frameSizeUpdatesDisabledCount)
return;
- if (!(--_frameSizeUpdatesDisabledCount))
+ if (!(--_data->_frameSizeUpdatesDisabledCount))
[self _setDrawingAreaSize:[self frame].size];
}
- (BOOL)frameSizeUpdatesDisabled
{
- return _frameSizeUpdatesDisabledCount > 0;
+ return _data->_frameSizeUpdatesDisabledCount > 0;
}
- (void)performDictionaryLookupAtCurrentMouseLocation
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (97810 => 97811)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2011-10-18 23:20:08 UTC (rev 97810)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2011-10-18 23:25:41 UTC (rev 97811)
@@ -3195,7 +3195,6 @@
BCCF085C113F3B7500C650C5 /* mac */ = {
isa = PBXGroup;
children = (
- F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */,
1A64292C12DE5F9800CAAE2C /* BackingStoreMac.mm */,
B878B613133428DC006888E9 /* CorrectionPanel.h */,
B878B614133428DC006888E9 /* CorrectionPanel.mm */,
@@ -3203,6 +3202,7 @@
1A1C648611F415B700553C19 /* WebContextMac.mm */,
51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */,
51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */,
+ F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */,
CDCA85DE132AD05300E961DF /* WebFullScreenManagerProxyMac.mm */,
1CA8B935127C774E00576C2B /* WebInspectorProxyMac.mm */,
BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */,
@@ -3210,8 +3210,8 @@
BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */,
BC84EB1712A7100C0083F2DA /* WebPreferencesMac.mm */,
51D130571382F10500351EDD /* WebProcessProxyMac.mm */,
+ CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */,
CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */,
- CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */,
);
path = mac;
sourceTree = "<group>";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
