Title: [93337] trunk/Source/WebKit2
- Revision
- 93337
- Author
- [email protected]
- Date
- 2011-08-18 13:01:08 -0700 (Thu, 18 Aug 2011)
Log Message
Made some code even more private to a particular file and class
https://bugs.webkit.org/show_bug.cgi?id=66428
Reviewed by Anders Carlsson.
* UIProcess/API/mac/WKView.mm:
(-[WKView _setDrawingAreaSize:]): Made this file internal.
* UIProcess/API/mac/WKViewInternal.h: Removed _setDrawingAreaSize.
* UIProcess/DrawingAreaProxy.h: Made sizeDidChange private.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (93336 => 93337)
--- trunk/Source/WebKit2/ChangeLog 2011-08-18 19:43:13 UTC (rev 93336)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-18 20:01:08 UTC (rev 93337)
@@ -1,3 +1,15 @@
+2011-08-18 Darin Adler <[email protected]>
+
+ Made some code even more private to a particular file and class
+ https://bugs.webkit.org/show_bug.cgi?id=66428
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setDrawingAreaSize:]): Made this file internal.
+ * UIProcess/API/mac/WKViewInternal.h: Removed _setDrawingAreaSize.
+ * UIProcess/DrawingAreaProxy.h: Made sizeDidChange private.
+
2011-08-18 Amruth Raj <[email protected]>
[GTK] [WK2] Activating sub menus cause the WebProcess to crash
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (93336 => 93337)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-18 19:43:13 UTC (rev 93336)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-18 20:01:08 UTC (rev 93337)
@@ -109,8 +109,9 @@
Vector<KeypressCommand>* commands;
};
-@interface WKView (FileInternal)
+@interface WKView (WKFileInternal)
- (float)_deviceScaleFactor;
+- (void)_setDrawingAreaSize:(NSSize)size;
@end
@interface WKViewData : NSObject {
@@ -2431,15 +2432,6 @@
}
}
-- (void)_setDrawingAreaSize:(NSSize)size
-{
- if (!_data->_page->drawingArea())
- return;
-
- _data->_page->drawingArea()->setSize(IntSize(size), IntSize(_data->_resizeScrollOffset));
- _data->_resizeScrollOffset = NSZeroSize;
-}
-
- (void)_didChangeScrollbarsForMainFrame
{
[self _updateGrowBoxForWindowFrameChange];
@@ -2592,7 +2584,7 @@
@end
-@implementation WKView (FileInternal)
+@implementation WKView (WKFileInternal)
- (float)_deviceScaleFactor
{
@@ -2608,4 +2600,13 @@
#endif
}
+- (void)_setDrawingAreaSize:(NSSize)size
+{
+ if (!_data->_page->drawingArea())
+ return;
+
+ _data->_page->drawingArea()->setSize(IntSize(size), IntSize(_data->_resizeScrollOffset));
+ _data->_resizeScrollOffset = NSZeroSize;
+}
+
@end
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (93336 => 93337)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2011-08-18 19:43:13 UTC (rev 93336)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2011-08-18 20:01:08 UTC (rev 93337)
@@ -78,8 +78,6 @@
- (void)_updateTextInputStateIncludingSecureInputState:(BOOL)updateSecureInputState;
- (void)_resetTextInputState;
-- (void)_setDrawingAreaSize:(NSSize)size;
-
- (void)_didChangeScrollbarsForMainFrame;
#if ENABLE(FULLSCREEN_API)
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (93336 => 93337)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2011-08-18 19:43:13 UTC (rev 93336)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2011-08-18 20:01:08 UTC (rev 93337)
@@ -77,7 +77,6 @@
// Returns true if painting was successful, false otherwise.
virtual bool paint(const WebCore::IntRect&, PlatformDrawingContext) = 0;
- virtual void sizeDidChange() = 0;
virtual void deviceScaleFactorDidChange() = 0;
// FIXME: These should be pure virtual.
@@ -101,6 +100,8 @@
WebCore::IntSize m_scrollOffset;
private:
+ virtual void sizeDidChange() = 0;
+
// CoreIPC message handlers.
// FIXME: These should be pure virtual.
virtual void update(uint64_t backingStoreStateID, const UpdateInfo&) { }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
