[webkit-changes] cvs commit: WebCore/kwq KWQExceptions.h
KWQExceptions.mm KWQFileButton.mm KWQKCursor.mm
KWQKHTMLPart.mm KWQKHTMLPartBrowserExtension.mm
KWQLineEdit.mm KWQListBox.mm KWQLoader.mm KWQWidget.mm
Justin
justing at opensource.apple.com
Tue Dec 20 16:00:24 PST 2005
justing 05/12/20 16:00:23
Modified: WebCore.xcodeproj project.pbxproj
kcanvas/device/quartz KCanvasFilterQuartz.mm
kwq KWQExceptions.h KWQExceptions.mm KWQFileButton.mm
KWQKCursor.mm KWQKHTMLPart.mm
KWQKHTMLPartBrowserExtension.mm KWQLineEdit.mm
KWQListBox.mm KWQLoader.mm KWQWidget.mm
Log:
Reviewed by: eric, thatcher
<rdar://problem/4172984> KWQExceptions needs to use @try/@catch instead of relying on NSException.h internals
Needed to undef try/catch because of 4333439. Moved the
declarations of variables that are returned from within a @try
block outside the @try block (because of "might be clobbered by
a longjmp or vfork" warnings). Moved some return statements
inside the @try block to fix volatilization errors with gcc4.
Revision Changes Path
1.59 +4 -0 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- project.pbxproj 19 Dec 2005 10:32:02 -0000 1.58
+++ project.pbxproj 21 Dec 2005 00:00:19 -0000 1.59
@@ -7092,6 +7092,7 @@
149C284408902B11008A9EFC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = Development;
@@ -7099,6 +7100,7 @@
149C284508902B11008A9EFC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = Deployment;
@@ -7106,6 +7108,7 @@
149C284608902B11008A9EFC /* OptimizedWithSymbols */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = OptimizedWithSymbols;
@@ -7113,6 +7116,7 @@
149C284708902B11008A9EFC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = Default;
1.21 +33 -25 WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
Index: KCanvasFilterQuartz.mm
===================================================================
RCS file: /cvs/root/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- KCanvasFilterQuartz.mm 12 Dec 2005 17:25:56 -0000 1.20
+++ KCanvasFilterQuartz.mm 21 Dec 2005 00:00:20 -0000 1.21
@@ -231,8 +231,9 @@
#define FE_QUARTZ_SETUP_INPUT(name) \
CIImage *inputImage = quartzFilter->inputImage(this); \
FE_QUARTZ_CHECK_INPUT(inputImage) \
- KWQ_BLOCK_EXCEPTIONS \
- CIFilter *filter = [CIFilter filterWithName:name]; \
+ CIFilter *filter; \
+ KWQ_BLOCK_EXCEPTIONS; \
+ filter = [CIFilter filterWithName:name]; \
[filter setDefaults]; \
[filter setValue:inputImage forKey:@"inputImage"];
@@ -245,7 +246,7 @@
#define FE_QUARTZ_OUTPUT_RETURN \
quartzFilter->setOutputImage(this, [filter valueForKey:@"outputImage"]); \
return filter; \
- KWQ_UNBLOCK_EXCEPTIONS \
+ KWQ_UNBLOCK_EXCEPTIONS; \
return nil;
#define FE_QUARTZ_CROP_TO_RECT(rect) \
@@ -259,8 +260,8 @@
CIFilter *KCanvasFEBlendQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- KWQ_BLOCK_EXCEPTIONS
CIFilter *filter = nil;
+ KWQ_BLOCK_EXCEPTIONS;
switch (blendMode()) {
case BM_NORMAL:
@@ -307,8 +308,8 @@
CIFilter *KCanvasFEColorMatrixQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- KWQ_BLOCK_EXCEPTIONS
CIFilter *filter = nil;
+ KWQ_BLOCK_EXCEPTIONS;
switch (type()) {
case CMT_MATRIX:
{
@@ -371,8 +372,9 @@
CIFilter *KCanvasFECompositeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- KWQ_BLOCK_EXCEPTIONS
CIFilter *filter = nil;
+ KWQ_BLOCK_EXCEPTIONS;
+
switch (operation()) {
case CO_OVER:
filter = [CIFilter filterWithName:@"CISourceOverCompositing"];
@@ -415,8 +417,9 @@
static inline CIFilter *getPointLightVectors(CIFilter * normals, CIVector * lightPosition, float surfaceScale)
{
- KWQ_BLOCK_EXCEPTIONS
- CIFilter *filter = [CIFilter filterWithName:@"WKPointLight"];
+ CIFilter *filter;
+ KWQ_BLOCK_EXCEPTIONS;
+ filter = [CIFilter filterWithName:@"WKPointLight"];
if (!filter)
return nil;
[filter setDefaults];
@@ -424,7 +427,7 @@
[filter setValue:lightPosition forKey:@"inputLightPosition"];
[filter setValue:[NSNumber numberWithFloat:surfaceScale] forKey:@"inputSurfaceScale"];
return filter;
- KWQ_UNBLOCK_EXCEPTIONS
+ KWQ_UNBLOCK_EXCEPTIONS;
return nil;
}
@@ -433,9 +436,9 @@
[WKDistantLightFilter class];
[WKPointLightFilter class];
[WKSpotLightFilter class];
-
- KWQ_BLOCK_EXCEPTIONS
- CIFilter *filter = nil;
+
+ CIFilter *filter = nil;
+ KWQ_BLOCK_EXCEPTIONS;
switch (light->type()) {
case LS_DISTANT:
@@ -483,21 +486,22 @@
return filter;
}
}
- KWQ_UNBLOCK_EXCEPTIONS
+ KWQ_UNBLOCK_EXCEPTIONS;
return nil;
}
static CIFilter *getNormalMap(CIImage *bumpMap, float scale)
{
[WKNormalMapFilter class];
- KWQ_BLOCK_EXCEPTIONS
- CIFilter *filter = [CIFilter filterWithName:@"WKNormalMap"];
+ CIFilter *filter;
+ KWQ_BLOCK_EXCEPTIONS;
+ filter = [CIFilter filterWithName:@"WKNormalMap"];
[filter setDefaults];
[filter setValue:bumpMap forKey:@"inputImage"];
[filter setValue:[NSNumber numberWithFloat:scale] forKey:@"inputSurfaceScale"];
return filter;
- KWQ_UNBLOCK_EXCEPTIONS
+ KWQ_UNBLOCK_EXCEPTIONS;
return nil;
}
@@ -509,8 +513,9 @@
[WKDiffuseLightingFilter class];
- KWQ_BLOCK_EXCEPTIONS
- CIFilter *filter = [CIFilter filterWithName:@"WKDiffuseLighting"];
+ CIFilter *filter;
+ KWQ_BLOCK_EXCEPTIONS;
+ filter = [CIFilter filterWithName:@"WKDiffuseLighting"];
if (!filter)
return nil;
@@ -536,8 +541,9 @@
CIFilter *KCanvasFEFloodQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- KWQ_BLOCK_EXCEPTIONS
- CIFilter *filter = [CIFilter filterWithName:@"CIConstantColorGenerator"];
+ CIFilter *filter;
+ KWQ_BLOCK_EXCEPTIONS;
+ filter = [CIFilter filterWithName:@"CIConstantColorGenerator"];
[filter setDefaults];
CGColorRef color = cgColor(floodColor());
CGColorRef withAlpha = CGColorCreateCopyWithAlpha(color,CGColorGetAlpha(color) * floodOpacity());
@@ -556,12 +562,13 @@
CIFilter *KCanvasFEImageQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- KWQ_BLOCK_EXCEPTIONS
+ CIFilter *filter;
+ KWQ_BLOCK_EXCEPTIONS;
// FIXME: This is only partially implemented (only supports pixmaps)
CIImage *ciImage = [CIImage imageWithCGImage:pixmap().imageRef()];
// FIXME: There is probably a nicer way to perform both of these transforms.
- CIFilter *filter = [CIFilter filterWithName:@"CIAffineTransform"];
+ filter = [CIFilter filterWithName:@"CIAffineTransform"];
[filter setDefaults];
[filter setValue:ciImage forKey:@"inputImage"];
@@ -602,8 +609,8 @@
CIFilter *KCanvasFEMergeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- KWQ_BLOCK_EXCEPTIONS
CIFilter *filter = nil;
+ KWQ_BLOCK_EXCEPTIONS;
QStringList inputs = mergeInputs();
QValueListIterator<QString> it = inputs.begin();
QValueListIterator<QString> end = inputs.end();
@@ -639,8 +646,9 @@
[WKSpecularLightingFilter class];
- KWQ_BLOCK_EXCEPTIONS
- CIFilter *filter = [CIFilter filterWithName:@"WKSpecularLighting"];
+ CIFilter *filter;
+ KWQ_BLOCK_EXCEPTIONS;
+ filter = [CIFilter filterWithName:@"WKSpecularLighting"];
[filter setDefaults];
CIFilter *normals = getNormalMap(quartzFilter->inputImage(this), surfaceScale());
if (!normals)
1.5 +3 -26 WebCore/kwq/KWQExceptions.h
Index: KWQExceptions.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQExceptions.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KWQExceptions.h 27 Sep 2005 22:37:28 -0000 1.4
+++ KWQExceptions.h 21 Dec 2005 00:00:21 -0000 1.5
@@ -24,32 +24,9 @@
*/
#import <Foundation/NSException.h>
-#import <kxmlcore/Assertions.h>
-class KWQNSHandler
-{
- public:
- KWQNSHandler() { _NSAddHandler2(&handler); }
- ~KWQNSHandler() { _NSRemoveHandler2(&handler); }
+void KWQReportBlockedException(NSException *);
- NSHandler2 handler;
- private:
- KWQNSHandler(const KWQNSHandler &);
- KWQNSHandler &operator=(const KWQNSHandler &);
-};
-
-
-void KWQReportBlockedException(KWQNSHandler& _localHandler);
-
-#define KWQ_BLOCK_EXCEPTIONS \
-{ \
- KWQNSHandler _localHandler; \
- if (!_NSSETJMP(_localHandler.handler._state, 0)) {
-
-
-#define KWQ_UNBLOCK_EXCEPTIONS \
- } else { \
- KWQReportBlockedException(_localHandler); \
- } \
-}
+#define KWQ_BLOCK_EXCEPTIONS @try {
+#define KWQ_UNBLOCK_EXCEPTIONS } @catch(NSException *localException) { KWQReportBlockedException(localException); }
1.3 +4 -4 WebCore/kwq/KWQExceptions.mm
Index: KWQExceptions.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQExceptions.mm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KWQExceptions.mm 3 Oct 2005 21:13:02 -0000 1.2
+++ KWQExceptions.mm 21 Dec 2005 00:00:21 -0000 1.3
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
+#import "config.h"
#import "KWQExceptions.h"
+#import <kxmlcore/Assertions.h>
-void KWQReportBlockedException(KWQNSHandler& _localHandler)
+void KWQReportBlockedException(NSException *localException)
{
- NSException *localException = _NSExceptionObjectFromHandler2(&_localHandler.handler);
#if ASSERT_DISABLED
NSLog(@"Uncaught exception - %@\n", localException);
#else
- ASSERT_WITH_MESSAGE(0, "Uncaught exception - %@", localException );
+ ASSERT_WITH_MESSAGE(0, "Uncaught exception - %@", localException);
#endif
}
1.31 +4 -4 WebCore/kwq/KWQFileButton.mm
Index: KWQFileButton.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQFileButton.mm,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- KWQFileButton.mm 25 Oct 2005 21:14:43 -0000 1.30
+++ KWQFileButton.mm 21 Dec 2005 00:00:21 -0000 1.31
@@ -97,9 +97,9 @@
NSSize size = {0,0};
KWQ_BLOCK_EXCEPTIONS;
size = [button bestVisualFrameSizeForCharacterCount:characters];
- KWQ_UNBLOCK_EXCEPTIONS;
-
return QSize(size);
+ KWQ_UNBLOCK_EXCEPTIONS;
+ return QSize(0, 0);
}
QRect KWQFileButton::frameGeometry() const
@@ -109,9 +109,9 @@
NSRect frame = {{0,0},{0,0}};
KWQ_BLOCK_EXCEPTIONS;
frame = [button visualFrame];
- KWQ_UNBLOCK_EXCEPTIONS;
-
return QRect(frame);
+ KWQ_UNBLOCK_EXCEPTIONS;
+ return QRect();
}
void KWQFileButton::setFrameGeometry(const QRect &rect)
1.19 +2 -1 WebCore/kwq/KWQKCursor.mm
Index: KWQKCursor.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKCursor.mm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- KWQKCursor.mm 3 Oct 2005 21:13:03 -0000 1.18
+++ KWQKCursor.mm 21 Dec 2005 00:00:21 -0000 1.19
@@ -49,8 +49,9 @@
nameToCursor = [[NSMutableDictionary alloc] init];
}
+ NSCursor *cursor;
KWQ_BLOCK_EXCEPTIONS;
- NSCursor * cursor = [nameToCursor objectForKey:name];
+ cursor = [nameToCursor objectForKey:name];
if (!cursor) {
NSImage *cursorImage = [[NSImage alloc] initWithContentsOfFile:
[[NSBundle bundleForClass:[KWQKCursorBundleDummy class]]
1.708 +14 -9 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -r1.707 -r1.708
--- KWQKHTMLPart.mm 20 Dec 2005 17:05:52 -0000 1.707
+++ KWQKHTMLPart.mm 21 Dec 2005 00:00:21 -0000 1.708
@@ -739,8 +739,8 @@
ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url, const QString &mimeType)
{
- KWQ_BLOCK_EXCEPTIONS;
ReadOnlyPart *part;
+ KWQ_BLOCK_EXCEPTIONS;
ObjectElementType objectType = ObjectElementFrame;
if (child.m_type == ChildFrame::Object)
@@ -1233,9 +1233,10 @@
NSView *KWQKHTMLPart::nextKeyView(NodeImpl *node, KWQSelectionDirection direction)
{
+ NSView * next;
KWQ_BLOCK_EXCEPTIONS;
- NSView * next = nextKeyViewInFrameHierarchy(node, direction);
+ next = nextKeyViewInFrameHierarchy(node, direction);
if (next) {
return next;
}
@@ -1791,10 +1792,11 @@
QString defaultValueText = defaultValue;
defaultValueText.replace(QChar('\\'), backslashAsCurrencySymbol());
+ bool ok;
KWQ_BLOCK_EXCEPTIONS;
NSString *returnedText = nil;
- bool ok = [_bridge runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
+ ok = [_bridge runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
defaultText:defaultValue.getNSString() returningText:&returnedText];
if (ok) {
@@ -1879,6 +1881,7 @@
bool KWQKHTMLPart::keyEvent(NSEvent *event)
{
+ bool result;
KWQ_BLOCK_EXCEPTIONS;
ASSERT([event type] == NSKeyDown || [event type] == NSKeyUp);
@@ -1905,7 +1908,7 @@
_currentEvent = KWQRetain(event);
QKeyEvent qEvent(event);
- bool result = !node->dispatchKeyEvent(&qEvent);
+ result = !node->dispatchKeyEvent(&qEvent);
// We want to send both a down and a press for the initial key event.
// To get KHTML to do this, we send a second KeyPress QKeyEvent with "is repeat" set to true,
@@ -2818,6 +2821,7 @@
return false;
}
+ bool swallowEvent;
KWQ_BLOCK_EXCEPTIONS;
NSEvent *oldCurrentEvent = _currentEvent;
@@ -2831,7 +2835,7 @@
NodeImpl::MouseEvent mev(qev.stateAfter(), NodeImpl::MousePress);
doc->prepareMouseEvent(false, xm, ym, &mev);
- bool swallowEvent = v->dispatchMouseEvent(contextmenuEvent,
+ swallowEvent = v->dispatchMouseEvent(contextmenuEvent,
mev.innerNode.get(), true, 0, &qev, true, NodeImpl::MousePress);
if (!swallowEvent && !isPointInsideSelection(xm, ym) &&
([_bridge selectWordBeforeMenuEvent] || [_bridge isEditable] || mev.innerNode->isContentEditable())) {
@@ -2856,10 +2860,9 @@
NSFileWrapper *KWQKHTMLPart::fileWrapperForElement(ElementImpl *e)
{
+ NSFileWrapper *wrapper = nil;
KWQ_BLOCK_EXCEPTIONS;
- NSFileWrapper *wrapper = nil;
-
const AtomicString& attr = e->getAttribute(srcAttr);
if (!attr.isEmpty()) {
NSURL *URL = completeURL(attr.qstring()).getNSURL();
@@ -2915,6 +2918,7 @@
NSAttributedString *KWQKHTMLPart::attributedString(NodeImpl *_start, int startOffset, NodeImpl *endNode, int endOffset)
{
+ NSMutableAttributedString *result;
KWQ_BLOCK_EXCEPTIONS;
NodeImpl * _startNode = _start;
@@ -2923,7 +2927,7 @@
return nil;
}
- NSMutableAttributedString *result = [[[NSMutableAttributedString alloc] init] autorelease];
+ result = [[[NSMutableAttributedString alloc] init] autorelease];
bool hasNewLine = true;
bool addedSpace = true;
@@ -3394,10 +3398,11 @@
return nil;
}
+ NSImage *resultImage;
KWQ_BLOCK_EXCEPTIONS;
NSRect bounds = [view bounds];
- NSImage *resultImage = [[[NSImage alloc] initWithSize:rect.size] autorelease];
+ resultImage = [[[NSImage alloc] initWithSize:rect.size] autorelease];
if (rect.size.width != 0 && rect.size.height != 0) {
[resultImage setFlipped:YES];
1.53 +2 -1 WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
Index: KWQKHTMLPartBrowserExtension.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- KWQKHTMLPartBrowserExtension.mm 20 Dec 2005 17:05:53 -0000 1.52
+++ KWQKHTMLPartBrowserExtension.mm 21 Dec 2005 00:00:21 -0000 1.53
@@ -23,9 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
+#import "config.h"
#import "KWQKHTMLPartBrowserExtension.h"
+#import <kxmlcore/Assertions.h>
#import "KWQExceptions.h"
#import "WebCoreBridge.h"
#import "khtml_part.h"
1.76 +2 -2 WebCore/kwq/KWQLineEdit.mm
Index: KWQLineEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLineEdit.mm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- KWQLineEdit.mm 21 Oct 2005 21:27:51 -0000 1.75
+++ KWQLineEdit.mm 21 Dec 2005 00:00:21 -0000 1.76
@@ -283,9 +283,9 @@
size.width += ceilf([renderer floatWidthForRun:&run style:&style] * numCharacters);
- KWQ_UNBLOCK_EXCEPTIONS;
-
return QSize(size);
+ KWQ_UNBLOCK_EXCEPTIONS;
+ return QSize(0, 0);
}
int QLineEdit::baselinePosition(int height) const
1.69 +2 -2 WebCore/kwq/KWQListBox.mm
Index: KWQListBox.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQListBox.mm,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- KWQListBox.mm 3 Dec 2005 20:16:41 -0000 1.68
+++ KWQListBox.mm 21 Dec 2005 00:00:21 -0000 1.69
@@ -322,9 +322,9 @@
size = [NSScrollView frameSizeForContentSize:contentSize hasHorizontalScroller:NO hasVerticalScroller:YES borderType:NSBezelBorder];
size.width += [NSScroller scrollerWidthForControlSize:NSSmallControlSize] - [NSScroller scrollerWidth] + leftMargin + rightMargin;
- KWQ_UNBLOCK_EXCEPTIONS;
-
return QSize(size);
+ KWQ_UNBLOCK_EXCEPTIONS;
+ return QSize(0, 0);
}
QWidget::FocusPolicy QListBox::focusPolicy() const
1.125 +7 -9 WebCore/kwq/KWQLoader.mm
Index: KWQLoader.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLoader.mm,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- KWQLoader.mm 19 Dec 2005 19:50:45 -0000 1.124
+++ KWQLoader.mm 21 Dec 2005 00:00:21 -0000 1.125
@@ -246,18 +246,16 @@
// Notify the caller that we "loaded".
KWQKHTMLPart *part = static_cast<KWQKHTMLPart *>(loader->part());
- QString urlString = cachedObject->url().qstring();
-
- if (!part->haveToldBridgeAboutLoad(urlString)) {
- WebCoreBridge *bridge = part->bridge();
-
- KWQ_BLOCK_EXCEPTIONS;
- [bridge objectLoadedFromCacheWithURL:KURL(cachedObject->url().qstring()).getNSURL()
+ if (!part->haveToldBridgeAboutLoad(cachedObject->url().qstring())) {
+ WebCoreBridge *bridge = part->bridge();
+
+ KWQ_BLOCK_EXCEPTIONS;
+ [bridge objectLoadedFromCacheWithURL:KURL(cachedObject->url().qstring()).getNSURL()
response:(NSURLResponse *)cachedObject->response()
data:(NSData *)cachedObject->allData()];
- KWQ_UNBLOCK_EXCEPTIONS;
+ KWQ_UNBLOCK_EXCEPTIONS;
- part->didTellBridgeAboutLoad(urlString);
+ part->didTellBridgeAboutLoad(cachedObject->url().qstring());
}
}
1.116 +4 -5 WebCore/kwq/KWQWidget.mm
Index: KWQWidget.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQWidget.mm,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- KWQWidget.mm 8 Dec 2005 08:40:27 -0000 1.115
+++ KWQWidget.mm 21 Dec 2005 00:00:21 -0000 1.116
@@ -190,12 +190,11 @@
QRect QWidget::frameGeometry() const
{
QRect rect;
-
KWQ_BLOCK_EXCEPTIONS;
rect = QRect([getOuterView() frame]);
- KWQ_UNBLOCK_EXCEPTIONS;
-
return rect;
+ KWQ_UNBLOCK_EXCEPTIONS;
+ return QRect();
}
int QWidget::baselinePosition(int height) const
@@ -419,9 +418,9 @@
KWQ_BLOCK_EXCEPTIONS;
bp = [[KWQKHTMLPart::bridgeForWidget(this) window] convertScreenToBase:[data->view convertPoint:p toView:nil]];
- KWQ_UNBLOCK_EXCEPTIONS;
-
return QPoint(bp);
+ KWQ_UNBLOCK_EXCEPTIONS;
+ return QPoint();
}
NSView *QWidget::getView() const
More information about the webkit-changes
mailing list