Title: [129694] trunk/Tools
- Revision
- 129694
- Author
- [email protected]
- Date
- 2012-09-26 13:25:55 -0700 (Wed, 26 Sep 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=97629
http/tests/security/cross-frame-access-put.html failing on Mac WK2 bots after
being unskipped
Reviewed by Tim Horton.
The test was failing because we were failing to use the fake window origin. We
should really always use the fake origin. This patch eliminates
_shouldUseFakeOrigin in favor of always using it.
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(-[WebKitTestRunnerWindow setFrameOrigin:]):
(-[WebKitTestRunnerWindow setFrame:display:animate:]):
(-[WebKitTestRunnerWindow setFrame:display:]):
(-[WebKitTestRunnerWindow frameRespectingFakeOrigin]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129693 => 129694)
--- trunk/Tools/ChangeLog 2012-09-26 20:21:30 UTC (rev 129693)
+++ trunk/Tools/ChangeLog 2012-09-26 20:25:55 UTC (rev 129694)
@@ -1,3 +1,20 @@
+2012-09-26 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=97629
+ http/tests/security/cross-frame-access-put.html failing on Mac WK2 bots after
+ being unskipped
+
+ Reviewed by Tim Horton.
+
+ The test was failing because we were failing to use the fake window origin. We
+ should really always use the fake origin. This patch eliminates
+ _shouldUseFakeOrigin in favor of always using it.
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ (-[WebKitTestRunnerWindow setFrameOrigin:]):
+ (-[WebKitTestRunnerWindow setFrame:display:animate:]):
+ (-[WebKitTestRunnerWindow setFrame:display:]):
+ (-[WebKitTestRunnerWindow frameRespectingFakeOrigin]):
+
2012-09-26 Tony Chang <[email protected]>
C++ style checker should warn when the indentation is wrong
Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (129693 => 129694)
--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2012-09-26 20:21:30 UTC (rev 129693)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2012-09-26 20:25:55 UTC (rev 129694)
@@ -33,7 +33,6 @@
@interface WebKitTestRunnerWindow : NSWindow {
WTR::PlatformWebView* _platformWebView;
NSPoint _fakeOrigin;
- bool _shouldUseFakeOrigin;
}
@property (nonatomic, assign) WTR::PlatformWebView* platformWebView;
@end
@@ -49,7 +48,6 @@
- (void)setFrameOrigin:(NSPoint)point
{
_fakeOrigin = point;
- _shouldUseFakeOrigin = YES;
}
- (void)setFrame:(NSRect)windowFrame display:(BOOL)displayViews animate:(BOOL)performAnimation
@@ -57,7 +55,6 @@
NSRect currentFrame = [super frame];
_fakeOrigin = windowFrame.origin;
- _shouldUseFakeOrigin = YES;
[super setFrame:NSMakeRect(currentFrame.origin.x, currentFrame.origin.y, windowFrame.size.width, windowFrame.size.height) display:displayViews animate:performAnimation];
}
@@ -67,7 +64,6 @@
NSRect currentFrame = [super frame];
_fakeOrigin = windowFrame.origin;
- _shouldUseFakeOrigin = YES;
[super setFrame:NSMakeRect(currentFrame.origin.x, currentFrame.origin.y, windowFrame.size.width, windowFrame.size.height) display:displayViews];
}
@@ -75,11 +71,7 @@
- (NSRect)frameRespectingFakeOrigin
{
NSRect currentFrame = [self frame];
-
- if (_shouldUseFakeOrigin)
- return NSMakeRect(_fakeOrigin.x, _fakeOrigin.y, currentFrame.size.width, currentFrame.size.height);
-
- return currentFrame;
+ return NSMakeRect(_fakeOrigin.x, _fakeOrigin.y, currentFrame.size.width, currentFrame.size.height);
}
@end
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
