Title: [93825] trunk/Source/WebKit2
- Revision
- 93825
- Author
- [email protected]
- Date
- 2011-08-25 15:33:12 -0700 (Thu, 25 Aug 2011)
Log Message
Move file internal methods to a class continuation in WKView
https://bugs.webkit.org/show_bug.cgi?id=66983
Reviewed by Dan Bernstein.
* UIProcess/API/mac/WKView.mm:
(-[WKView _deviceScaleFactor]):
(-[WKView _setDrawingAreaSize:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (93824 => 93825)
--- trunk/Source/WebKit2/ChangeLog 2011-08-25 21:20:49 UTC (rev 93824)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-25 22:33:12 UTC (rev 93825)
@@ -1,5 +1,16 @@
2011-08-25 Anders Carlsson <[email protected]>
+ Move file internal methods to a class continuation in WKView
+ https://bugs.webkit.org/show_bug.cgi?id=66983
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _deviceScaleFactor]):
+ (-[WKView _setDrawingAreaSize:]):
+
+2011-08-25 Anders Carlsson <[email protected]>
+
More work on the updated Cocoa text input specification
https://bugs.webkit.org/show_bug.cgi?id=66977
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (93824 => 93825)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-25 21:20:49 UTC (rev 93824)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-25 22:33:12 UTC (rev 93825)
@@ -109,7 +109,7 @@
Vector<KeypressCommand>* commands;
};
-@interface WKView (WKFileInternal)
+@interface WKView ()
- (float)_deviceScaleFactor;
- (void)_setDrawingAreaSize:(NSSize)size;
@end
@@ -2012,6 +2012,29 @@
}
}
+- (float)_deviceScaleFactor
+{
+ NSWindow *window = [self window];
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
+ if (window)
+ return [window backingScaleFactor];
+ return [[NSScreen mainScreen] backingScaleFactor];
+#else
+ if (window)
+ return [window userSpaceScaleFactor];
+ return [[NSScreen mainScreen] userSpaceScaleFactor];
+#endif
+}
+
+- (void)_setDrawingAreaSize:(NSSize)size
+{
+ if (!_data->_page->drawingArea())
+ return;
+
+ _data->_page->drawingArea()->setSize(IntSize(size), IntSize(_data->_resizeScrollOffset));
+ _data->_resizeScrollOffset = NSZeroSize;
+}
+
@end
@implementation WKView (Internal)
@@ -2622,30 +2645,3 @@
}
@end
-
-@implementation WKView (WKFileInternal)
-
-- (float)_deviceScaleFactor
-{
- NSWindow *window = [self window];
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
- if (window)
- return [window backingScaleFactor];
- return [[NSScreen mainScreen] backingScaleFactor];
-#else
- if (window)
- return [window userSpaceScaleFactor];
- return [[NSScreen mainScreen] userSpaceScaleFactor];
-#endif
-}
-
-- (void)_setDrawingAreaSize:(NSSize)size
-{
- if (!_data->_page->drawingArea())
- return;
-
- _data->_page->drawingArea()->setSize(IntSize(size), IntSize(_data->_resizeScrollOffset));
- _data->_resizeScrollOffset = NSZeroSize;
-}
-
-@end
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
