[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:56:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 86b7336329d0bf6714f8c064999ed8a803551c63
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 22 02:21:58 2002 +0000
IFCarbonWindowView is no longer necessary. Removing.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Plugins.subproj/IFCarbonWindowView.h b/WebKit/Plugins.subproj/IFCarbonWindowView.h
deleted file mode 100644
index 2f7794f..0000000
--- a/WebKit/Plugins.subproj/IFCarbonWindowView.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- IFCarbonWindowView.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <AppKit/NSView.h>
-
- at interface IFCarbonWindowView : NSView
-{
- at private
- void* _qdPort;
- void* _savePort;
- BOOL _synchToView;
-}
-
-- (void*) qdPort;
-
- at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/IFCarbonWindowView.m b/WebKit/Plugins.subproj/IFCarbonWindowView.m
deleted file mode 100644
index a5756d3..0000000
--- a/WebKit/Plugins.subproj/IFCarbonWindowView.m
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- IFCarbonWindowView.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#define USE_CARBON 1
-
-#import "IFCarbonWindowView.h"
-#import <Foundation/Foundation.h>
-#import <AppKit/NSWindow.h>
-#import <AppKit/NSGraphicsContext.h>
-#import <AppKit/NSGraphicsContextPrivate.h>
-#import <AppKit/NSWindow_Private.h>
-#import <CoreGraphics/CGSGraphics.h>
-#import <CoreGraphics/CGGraphicsPrivate.h>
-#import <CoreGraphics/CGContext.h>
-#import <CoreGraphics/CGGraphicsPrivate.h>
-#import <CoreGraphics/CGContext.h>
-#import <CoreGraphics/CGGraphicsPrivate.h>
-#import <CoreGraphics/CGContext.h>
-#import <CoreGraphics/CGSWindow.h>
-#import <CarbonCore/MacMemory.h>
-#import <QD/Quickdraw.h>
-#import <QD/QuickdrawPriv.h> // for QDBindPortToNativeWindow
-
- at interface NSView(IFCarbonWindowView_Internal)
-- _invalidateGStatesForTree;
- at end
-
- at interface IFCarbonWindowView(IFCarbonWindowView_Internal)
-- (void) _lockQuickDrawPort;
-- (void) _unlockQuickDrawPort;
-- (void) _adjustPort;
- at end
-
- at implementation IFCarbonWindowView
-
-- (void) dealloc
-{
- // just in case
- //
- [self _unlockQuickDrawPort];
-
- // if (_qdPort != NULL) {
- // DisposePort(_qdPort);
- // }
-
- [super dealloc];
-}
-
-// these are called when we need to update the quickdraw port to match
-//
-- (void)setFrameOrigin:(NSPoint)newOrigin
-{
- _synchToView = YES;
- [super setFrameOrigin:newOrigin];
-}
-
-- (void)setFrameSize:(NSSize)newSize
-{
- _synchToView = YES;
- [super setFrameSize:newSize];
-}
-
-- _invalidateGStatesForTree
-{
- _synchToView = YES;
- return [super _invalidateGStatesForTree];
-}
-
-// here is where we setup QuickDraw focus
-
-- (void)lockFocus
-{
- [super lockFocus];
- [self _lockQuickDrawPort];
-}
-
-- (void)unlockFocus
-{
- [super unlockFocus];
- [self _unlockQuickDrawPort];
-}
-
-- (void*) qdPort
-{
- return _qdPort;
-}
-
-- (BOOL) isFlipped
-{
- // so we match QD's version
- //
- return YES;
-}
-
-- (BOOL) isOpaque
-{
- return NO;
-}
-
- at end
-
- at implementation IFCarbonWindowView(IFCarbonWindowView_Internal)
-
-- (void) _lockQuickDrawPort
-{
- // create the port if this is the first time through
- //
- if (_qdPort == NULL)
- {
- [[self window] _windowRef];
-
- _qdPort = GetWindowPort([[self window] _windowRef]);
- // create a new QuickDraw port
- //
- //_qdPort = CreateNewPort();
-
- // and tell port that it should use windowID for output
- //
- //QDBindPortToNativeWindow(_qdPort, (CGSWindowID)[_window windowNumber]);
-
- // and force a synch
- //
- _synchToView = YES;
- }
-
- // if we have one now
- //
- if (_qdPort != NULL)
- {
- // in case we have moved to new window, reattach
- //
- //if (QDGetNativeWindowFromPort(_qdPort) != (CGSWindowID)[_window windowNumber]) {
- // QDBindPortToNativeWindow(_qdPort, (CGSWindowID)[_window windowNumber]);
- //}
-
- // now set the port
- //
- GetPort((CGrafPtr*)&_savePort);
- SetPort(_qdPort);
-
- // adjust port origin and clip
- //
- if (_synchToView)
- {
- // make sure it is the right size and location
- //
- [self _adjustPort];
-
- // no longer need to synchronize
- //
- _synchToView = NO;
- }
- }
-}
-
-- (void) _unlockQuickDrawPort
-{
- // just restore it if we have one
- //
- if (_savePort != NULL)
- {
- // restore saved port
- //
- SetPort((CGrafPtr)_savePort);
- }
-}
-
-- (void) _adjustPort
-{
- CGSRegionObj windowShape;
- CGRect windowRect;
- CGSWindowID windowID = (CGSWindowID) [_window windowNumber];
- NSRect portRect, bounds, visibleBounds;
-
- // don't try anything if window is no more
- //
- if ((int)windowID <= 0 || _qdPort == NULL)
- return;
-
- // get window bounds in CGS coordinates
- //
- (void) CGSGetWindowShape([[NSGraphicsContext currentContext] contextID], windowID, &windowShape);
- (void) CGSGetRegionBounds(windowShape, &windowRect);
-
- // get bounds for drawing. this bounds will have a lower left origin
- //
- bounds = [self bounds];
- visibleBounds = [self visibleRect];
- portRect = [self convertRect:visibleBounds toView:nil];
-
- // flip the vertical location
- //
- portRect.origin.y = windowRect.size.height - NSMaxY(portRect);
-
- MovePortTo ((int)NSMinX(portRect), (int)NSMinY(portRect));
- PortSize ((int)NSWidth(portRect), (int)NSHeight(portRect));
-
- // adjust port origin to account for scrolling. we don't need to invert
- // coordinates since this is already a flipped view
- //
- SetOrigin((int)floor(NSMinX(visibleBounds)), (int)floor(NSMinY(visibleBounds)));
-}
-
- at end
-
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c06fb94..05091c6 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -190,7 +190,6 @@
39446097020F50ED0ECA1767,
39446098020F50ED0ECA1767,
F520FB1B0221DEFD01C1A525,
- F5EBC45702134BC301CA1520,
F5EBC45802134BC301CA1520,
9CF0E24B021361B10ECA16EA,
F5B92B840223191D01C1A525,
@@ -221,7 +220,6 @@
394460A8020F50ED0ECA1767,
394460A9020F50ED0ECA1767,
394460AA020F50ED0ECA1767,
- F5EBC45902134BC301CA1520,
F5EBC45A02134BC301CA1520,
9CF0E24C021361B10ECA16EA,
F5143A380221DCCE01A80181,
@@ -1047,8 +1045,6 @@
};
F5EBC45202134BB601CA1520 = {
children = (
- F5EBC45302134BC301CA1520,
- F5EBC45402134BC301CA1520,
F5EBC45502134BC301CA1520,
F5EBC45602134BC301CA1520,
);
@@ -1056,18 +1052,6 @@
name = Plugins;
refType = 4;
};
- F5EBC45302134BC301CA1520 = {
- isa = PBXFileReference;
- name = IFCarbonWindowView.h;
- path = Plugins.subproj/IFCarbonWindowView.h;
- refType = 4;
- };
- F5EBC45402134BC301CA1520 = {
- isa = PBXFileReference;
- name = IFCarbonWindowView.m;
- path = Plugins.subproj/IFCarbonWindowView.m;
- refType = 4;
- };
F5EBC45502134BC301CA1520 = {
isa = PBXFileReference;
name = IFPluginView.h;
@@ -1080,24 +1064,12 @@
path = Plugins.subproj/IFPluginView.mm;
refType = 4;
};
- F5EBC45702134BC301CA1520 = {
- fileRef = F5EBC45302134BC301CA1520;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5EBC45802134BC301CA1520 = {
fileRef = F5EBC45502134BC301CA1520;
isa = PBXBuildFile;
settings = {
};
};
- F5EBC45902134BC301CA1520 = {
- fileRef = F5EBC45402134BC301CA1520;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5EBC45A02134BC301CA1520 = {
fileRef = F5EBC45602134BC301CA1520;
isa = PBXBuildFile;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list