Removed remaining references to CPDOMWindowBridge.

Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-07-27 12:06:07 -07:00
1 parent 92594a7ef9
commit 2e37945b4f
4 files changed
+10 -10

No files matched your search

+2 -2
View File
@@ -112,7 +112,7 @@ var CPDragServerUpdateDragging = function(anEvent)
bridgeLocation = [[anEvent window] convertBaseToBridge:location];
// We have to convert base to bridge since the drag event comes from the source window, not the drag window.
var draggingDestination = [[CPDOMWindowBridge sharedDOMWindowBridge] _dragHitTest:bridgeLocation pasteboard:CPDragServerPasteboard];
var draggingDestination = [[CPPlatformWindow primaryPlatformWindow] _dragHitTest:bridgeLocation pasteboard:CPDragServerPasteboard];
CPDragServerLocation = [DRAGGING_WINDOW(draggingDestination) convertBridgeToBase:bridgeLocation];
@@ -326,7 +326,7 @@ var CPDragServerUpdateDragging = function(anEvent)
return nil;
// We don't need to do this because the only place this gets called
// -_dragHitTest: in CPDOMWindowBridge does this already. Perhaps to
// -_dragHitTest: in CPPlatformWindow does this already. Perhaps to
// be safe?
// if (![self containsPoint:aPoint])
// return nil;
+5 -5
View File
@@ -119,7 +119,7 @@ var _CPMenuBarVisible = NO,
// FIXME: There must be a better way to do this.
#if PLATFORM(DOM)
[window.platformWindow resizeEvent:nil];
[[CPPlatformWindow primaryPlatformWindow] resizeEvent:nil];
#endif
}
@@ -1078,7 +1078,7 @@ var STICKY_TIME_INTERVAL = 500,
{
_unconstrainedFrame = CGRectMakeCopy([self frame]);
var screenBounds = CGRectInset([[CPDOMWindowBridge sharedDOMWindowBridge] contentBounds], 5.0, 5.0),
var screenBounds = CGRectInset([[self platformWindow] contentBounds], 5.0, 5.0),
constrainedFrame = CGRectIntersection(_unconstrainedFrame, screenBounds),
menuViewOrigin = [self convertBaseToBridge:CGPointMake(LEFT_MARGIN, TOP_MARGIN)];
@@ -1158,7 +1158,7 @@ var STICKY_TIME_INTERVAL = 500,
if (type == CPPeriodic)
{
var constrainedBounds = CGRectInset([[CPDOMWindowBridge sharedDOMWindowBridge] contentBounds], 5.0, 5.0);
var constrainedBounds = CGRectInset([[self platformWindow] contentBounds], 5.0, 5.0);
if (_scrollingState == _CPMenuWindowScrollingStateUp)
{
@@ -1447,9 +1447,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
- (id)init
{
var bridgeWidth = CGRectGetWidth([[CPDOMWindowBridge sharedDOMWindowBridge] contentBounds]);
var platformWindowWidth = CGRectGetWidth([[CPPlatformWindow primaryPlatformWindow] contentBounds]);
self = [super initWithContentRect:CGRectMake(0.0, 0.0, bridgeWidth, MENUBAR_HEIGHT) styleMask:CPBorderlessWindowMask];
self = [super initWithContentRect:CGRectMake(0.0, 0.0, platformWindowWidth, MENUBAR_HEIGHT) styleMask:CPBorderlessWindowMask];
if (self)
{
+1 -1
View File
@@ -970,7 +970,7 @@ var DOMElementPrototype = nil,
{
_fullScreenModeState = _CPViewFullScreenModeStateMake(self);
var fullScreenWindow = [[CPWindow alloc] initWithContentRect:[[CPDOMWindowBridge sharedDOMWindowBridge] contentBounds] styleMask:CPBorderlessWindowMask];
var fullScreenWindow = [[CPWindow alloc] initWithContentRect:[[CPPlatformWindow primaryPlatformWindow] contentBounds] styleMask:CPBorderlessWindowMask];
[fullScreenWindow setLevel:CPScreenSaverWindowLevel];
[fullScreenWindow setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+2 -2
View File
@@ -145,7 +145,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
var visibleFrame = _cachedScreenFrame;
if (!visibleFrame)
visibleFrame = [[CPDOMWindowBridge sharedDOMWindowBridge] visibleFrame];
visibleFrame = [[CPPlatformWindow primaryPlatformWindow] usableContentFrame];
var restrictedPoint = CGPointMake(0, 0);
@@ -167,7 +167,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
else if (type === CPLeftMouseDown)
{
_mouseDraggedPoint = [[self window] convertBaseToBridge:[anEvent locationInWindow]];
_cachedScreenFrame = [[CPDOMWindowBridge sharedDOMWindowBridge] visibleFrame];
_cachedScreenFrame = [[CPPlatformWindow primaryPlatformWindow] usableContentFrame];
}
else if (type === CPLeftMouseDragged)
{