[webkit-changes] cvs commit: WebKit/WebView.subproj WebFrame.m
WebFrameView.m WebHTMLView.m WebView.m
Adele
adele at opensource.apple.com
Thu Jul 21 18:18:51 PDT 2005
adele 05/07/21 18:18:51
Modified: . Tag: Safari-2-0-branch ChangeLog
JavaScriptCore.pbproj Tag: Safari-2-0-branch project.pbxproj
bindings Tag: Safari-2-0-branch runtime_root.h
bindings/jni Tag: Safari-2-0-branch jni_jsobject.cpp
jni_utility.cpp
bindings/objc Tag: Safari-2-0-branch objc_utility.mm
kjs Tag: Safari-2-0-branch bool_object.cpp
collector.cpp nodes.cpp string_object.cpp
ustring.cpp
. Tag: Safari-2-0-branch ChangeLog
WebCore-combined.exp WebCore-tests.exp
WebCore.pbproj Tag: Safari-2-0-branch project.pbxproj
khtml/css Tag: Safari-2-0-branch parser.cpp parser.h
parser.y
khtml/dom Tag: Safari-2-0-branch dom2_events.cpp
dom_string.cpp
khtml/ecma Tag: Safari-2-0-branch kjs_binding.cpp
kjs_css.cpp kjs_dom.cpp kjs_events.cpp kjs_html.cpp
kjs_proxy.cpp kjs_traversal.cpp
khtml/editing Tag: Safari-2-0-branch selection.cpp
selection.h visible_position.cpp
khtml/misc Tag: Safari-2-0-branch loader.cpp loader_client.h
khtml/rendering Tag: Safari-2-0-branch render_block.cpp
khtml/xml Tag: Safari-2-0-branch dom_nodeimpl.cpp
dom_position.cpp
kwq Tag: Safari-2-0-branch DOM-CSS.mm DOMEvents.h
DOMEvents.mm DOMInternal.h DOMUtility.mm
KWQButton.mm KWQClipboard.mm KWQComboBox.mm
KWQCursor.h KWQCursor.mm KWQFileButton.mm
KWQKCursor.mm KWQKHTMLPart.mm
KWQKJavaAppletWidget.mm KWQKJobClasses.mm
KWQLineEdit.mm KWQListBox.mm KWQObject.mm
KWQScrollView.mm KWQSignal.h KWQSignal.mm KWQSlot.h
KWQSlot.mm KWQTextArea.mm KWQTextEdit.mm
KWQWidget.mm WebCoreBridge.mm
. Tag: Safari-2-0-branch ChangeLog
DOM.subproj Tag: Safari-2-0-branch DOMEvents.h
History.subproj Tag: Safari-2-0-branch WebHistoryItem.m
Misc.subproj Tag: Safari-2-0-branch WebNSPasteboardExtras.m
WebNSURLExtras.m
WebCoreSupport.subproj Tag: Safari-2-0-branch WebBridge.m
WebImageRendererFactory.m WebTextRenderer.m
WebKit.pbproj Tag: Safari-2-0-branch project.pbxproj
WebView.subproj Tag: Safari-2-0-branch WebFrame.m
WebFrameView.m WebHTMLView.m WebView.m
Log:
JavaScriptCore:
Merge from TOT to Safari-2-0-branch to build with gcc 4.0
<rdar://problem/4164127>
2005-05-16 Darin Adler <darin at apple.com>
Reviewed by Adele.
- fixed issues preventing us from compiling with newer versions of gcc 4.0
* kjs/ustring.cpp:
(KJS::operator==): Remove redundant and illegal KJS:: prefix on this function's definition.
(KJS::operator<): Ditto.
(KJS::compare): Ditto.
2005-05-04 Darin Adler <darin at apple.com>
Reviewed by Dave Hyatt.
- another gcc-4.0-related fix
* bindings/runtime_root.h: Take off extra namespace prefixes that apparently cause problems
compiling with gcc 4.0, although I have not observed the problems.
2005-04-28 Darin Adler <darin at apple.com>
Reviewed by Dave Harrison.
- fixed problems preventing us from compiling with gcc 4.0
* JavaScriptCore.pbproj/project.pbxproj: Removed -Wmissing-prototypes from
WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.
* bindings/jni/jni_jsobject.cpp:
(JSObject::getSlot): Changed some %d to %ld where the parameters where long ints.
(JSObject::setSlot): Ditto.
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJavaVM): Ditto.
(KJS::Bindings::getJNIEnv): Ditto.
* bindings/objc/objc_utility.mm: Fixed include of <JavascriptCore/internal.h> that needed the
letter "S" capitalized.
* kjs/bool_object.cpp: (BooleanProtoFuncImp::call): Rearranged how this function returns to
avoid incorrect gcc 4.0 warning.
* kjs/collector.cpp: (KJS::Collector::markStackObjectsConservatively): Changed code to check
the alignment of the passed-in pointers to only require pointer-level alignment, not 8-byte alignment.
Prevents a crash on garbage collect when compiled with gcc 4.0.
* kjs/nodes.cpp:
(WhileNode::execute): Added a redundant return after an infinite loop to work around incorrect gcc 4.0 warning.
(ForNode::execute): Ditto.
(SwitchNode::execute):Rearranged how this function returns to avoid incorrect gcc 4.0 warning.
(LabelNode::execute): Ditto.
* kjs/string_object.cpp: (replace): Ditto.
WebCore:
Merge from TOT to Safari-2-0-branch to build with gcc 4.0
<rdar://problem/4164127>
2005-07-12 Justin Garcia <justin.garcia at apple.com>
Reviewed by mjs
* kwq/KWQCursor.mm:
(QCursor::makeWithNSCursor):
Didn't KWQRetain() the NSCursor in yesterday's gcc 4.0 workaround
2005-07-11 Justin Garcia <justin.garcia at apple.com>
Reviewed by mjs
Workarounds to get WebCore to compile with gcc 4.0 build 5208
* kwq/KWQCursor.h:
* kwq/KWQCursor.mm:
(QCursor::makeWithNSCursor):
* kwq/KWQKCursor.mm:
(KCursor::crossCursor):
(KCursor::handCursor):
(KCursor::sizeAllCursor):
(KCursor::ibeamCursor):
(KCursor::waitCursor):
(KCursor::whatsThisCursor):
(KCursor::eastResizeCursor):
(KCursor::northResizeCursor):
(KCursor::northEastResizeCursor):
(KCursor::northWestResizeCursor):
(KCursor::southResizeCursor):
(KCursor::southEastResizeCursor):
(KCursor::southWestResizeCursor):
(KCursor::westResizeCursor):
* kwq/KWQKJobClasses.mm:
(KIO::TransferJob::emitResult):
(KIO::TransferJob::emitReceivedResponse):
* kwq/KWQSignal.h:
* kwq/KWQSignal.mm:
(KWQSignal::callWithData):
(KWQSignal::callWithResponse):
* kwq/KWQSlot.h:
* kwq/KWQSlot.mm:
(KWQSlot::callWithData):
(KWQSlot::callWithResponse):
* kwq/KWQWidget.mm:
(QWidget::cursor):
2005-07-08 Justin Garcia <justin.garcia at apple.com>
Reviewed by john
Changes needed in order to compile with gcc 4.0 build 5204
Mostly obj-c type and casting issues
* kwq/DOM-CSS.mm:
(+[DOMCSSPrimitiveValue _valueWithImpl:]): Wrote wrapper _valuewithimpl that calls parent class's method
* kwq/DOMEvents.h:
* kwq/DOMInternal.h:
(addDOMWrapper):
* kwq/KWQButton.mm:
(QButton::setWritingDirection):
* kwq/KWQClipboard.mm:
(KWQClipboard::dragNSImage):
* kwq/KWQComboBox.mm:
(QComboBox::setWritingDirection):
(QComboBox::populateMenu):
* kwq/KWQKHTMLPart.mm:
(regExpForLabels):
(KWQKHTMLPart::passWidgetMouseDownEventToWidget):
(KWQKHTMLPart::fileWrapperForElement): renderer->pixmap().image() was used as an NSImage, but a WebCoreImageRenderer doesn't have any association with NSImage, should be investigated further
* kwq/KWQLineEdit.mm:
(QLineEdit::QLineEdit):
* kwq/KWQListBox.mm:
(QListBox::~QListBox):
(QListBox::setSelectionMode):
(QListBox::doneAppendingItems):
(QListBox::setSelected):
(QListBox::isSelected):
(QListBox::setEnabled):
(QListBox::sizeForNumberOfLines):
(QListBox::setWritingDirection):
* kwq/KWQScrollView.mm:
(QScrollView::contentsX):
(QScrollView::contentsY):
* kwq/KWQTextEdit.mm:
(QTextEdit::setAlignment):
(QTextEdit::setWritingDirection):
(QTextEdit::sizeWithColumnsAndRows):
(QTextEdit::setPalette):
* kwq/KWQWidget.mm:
(QWidget::hasFocus):
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge elementAtPoint:]):
2005-05-16 Darin Adler <darin at apple.com>
Reviewed by Adele.
- fixed issues preventing us from compiling with newer versions of gcc 4.0
* khtml/dom/dom2_events.cpp: Add definitions of some static data member constants, as required
by the C++ standard and the gcc 4.0 compiler.
* khtml/editing/selection.h: Specified KHTMLPart friend class as ::KHTMLPart, since if it's
not explicitly qualified, it means DOM::KHTMLPart.
* khtml/dom/dom_string.cpp:
(DOM::strcasecmp): Removed redundant and illegal DOM:: prefix.
(DOM::operator==): Ditto.
* khtml/ecma/kjs_binding.cpp:
(KJS::getStringOrNull): Removed redundant and illegal KJS:: prefix.
(KJS::ValueToVariant): Ditto.
* khtml/ecma/kjs_css.cpp:
(KJS::getCSSRuleConstructor): Ditto.
(KJS::getCSSValueConstructor): Ditto.
(KJS::getCSSPrimitiveValueConstructor): Ditto.
* khtml/ecma/kjs_events.cpp:
(KJS::getEventConstructor): Ditto.
(KJS::getEventExceptionConstructor): Ditto.
(KJS::getMutationEventConstructor): Ditto.
* khtml/ecma/kjs_traversal.cpp:
(KJS::getNodeFilterConstructor): Ditto.
* khtml/misc/loader_client.h: Added an empty virtual destructor to CachedObjectClient
to quiet the compiler. This doesn't really do any good, but also does no harm.
* khtml/misc/loader.cpp: (CachedObjectClient::~CachedObjectClient): Added.
* khtml/rendering/render_block.cpp: (khtml::RenderBlock::fillBlockSelectionGaps):
Initialize a couple of variables that should have been initialized to 0.
Not just about making the compiler happy -- warning found a real bug!
* kwq/KWQTextArea.mm: (RangeOfParagraph): Change else structure to work around compiler
warning bug.
2005-04-28 Darin Adler <darin at apple.com>
Reviewed by Dave Harrison.
- fixed problems preventing us from compiling with gcc 4.0
* WebCore.pbproj/project.pbxproj: Removed -fobjc-exceptions because I can't figure out an easy
way to pass it only when compiling Objective-C/C++. Removed -Wmissing-prototypes from
WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.
* khtml/css/parser.y: Changed some rules that were using a float to pass around an enum to use an
int instead to avoid a warning.
* khtml/css/parser.cpp: Regenerated.
* khtml/css/parser.h: Regenerated.
* khtml/ecma/kjs_dom.cpp: (DOMTextProtoFunc::tryCall): Rearranged a return statement to avoid an incorrect
warning.
* khtml/ecma/kjs_html.cpp: (KJS::Context2DFunction::tryCall): Initialized a couple of variables to avoid
an incorrect warning.
* khtml/ecma/kjs_proxy.cpp: (KJSProxyImpl::evaluate): Rearranged how we exit from the function to avoid
an incorret warning.
* khtml/editing/selection.cpp: (khtml::Selection::debugPosition): Changed some %d to %ld where the
parameters where long ints.
* khtml/editing/visible_position.cpp: (khtml::VisiblePosition::debugPosition): Ditto.
* khtml/xml/dom_position.cpp: (DOM::Position::debugPosition): Ditto.
* kwq/DOMEvents.mm: (-[DOMMouseEvent initMouseEvent:::::::::::::::]): Rearranged code to avoid a cast
that was causing an incorrect warning.
* kwq/DOMUtility.mm:
(createObjCDOMNode): Broke out as a separate function.
(KJS::ScriptInterpreter::createObjcInstanceForValue): Rearranged code to avoid a namespace collision with
KJS::DOMNode and the Objective-C DOMNode class.
* kwq/KWQFileButton.mm: Made fields of KWQFileButtonAdapter public to avoid an error, new to gcc 4.0,
about accessing protected Objective-C fields.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::matchLabelsAgainstElement): Rearranged a return statement to avoid an incorrect warning.
(KWQKHTMLPart::imageFromRect): Rearranged how this function does its exception handling to avoid a
"may be clobbered" warning.
* kwq/KWQKJavaAppletWidget.mm: Fixed incorrect import that said "KHTMLView.h" instead of "khtmlview.h".
* kwq/KWQObject.mm: Made fields of KWQObjectTimerTarget public to avoid an error, new to gcc 4.0,
about accessing protected Objective-C fields.
* kwq/WebCoreBridge.mm: (partHasSelection): Used [bridge part] instead of getting directly at instance
variable to avoid an error, new to gcc 4.0, about accessing protected Objective-C fields.
* WebCore-combined.exp: Regenerated.
* WebCore-tests.exp: Added some additional symbols needed by the tests under gcc 4.0.
WebKit:
Merge from TOT to Safari-2-0-branch to build with gcc 4.0
<rdar://problem/4164127>
2005-07-08 Justin Garcia <justin.garcia at apple.com>
Reviewed by John
Changes to compile with gcc 4.0 build 5204
The construct "variable = if ? then : else" is more strict about the types of 'then' and 'else'
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem copyWithZone:]):
* Misc.subproj/WebNSPasteboardExtras.m:
(-[NSPasteboard _web_writeImage:URL:title:archive:types:]):
* Misc.subproj/WebNSURLExtras.m:
(-[NSURL _web_URLWithLowercasedScheme]):
(-[NSString _web_mapHostNameWithRange:encode:makeString:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge MIMETypeForPath:]):
* WebCoreSupport.subproj/WebImageRendererFactory.m:
(-[WebImageRendererFactory imageRendererWithBytes:length:MIMEType:]):
* WebCoreSupport.subproj/WebTextRenderer.m:
(-[WebTextRenderer initWithFont:usingPrinterFont:]):
* WebView.subproj/WebFrame.m:
(-[WebFrame _webDataRequestForData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView _styleFromFontAttributes:]):
* WebView.subproj/WebView.m:
(-[WebView _writeImageElement:withPasteboardTypes:toPasteboard:]):
(-[WebView mainFrameTitle]):
2005-04-28 Darin Adler <darin at apple.com>
Reviewed by Maciej.
- fixed problems preventing us from compiling with gcc 4.0
* WebKit.pbproj/project.pbxproj: Removed -fobjc-exceptions because I can't figure out an easy
way to pass it only when compiling Objective-C/C++. Removed -Wmissing-prototypes from
WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.
* History.subproj/WebHistoryItem.m: (-[WebHistoryItem pageCache]): Changed return type
to match the declaration.
* WebCoreSupport.subproj/WebBridge.m: (-[WebBridge _retrieveKeyboardUIModeFromPreferences:]):
Fixed a BOOL that should have been a Boolean.
* WebCoreSupport.subproj/WebTextRenderer.m: Removed redundant copy of ROUND_TO_INT, also in
a WebCore header.
(-[WebTextRenderer _computeWidthForSpace]): Had to add cast because of difference in type of
ROUND_TO_INT vs. CEIL_TO_INT.
(pathFromFont): Added a cast to convert UInt8 * to char *.
* WebView.subproj/WebFrameView.m:
(-[WebFrameView _setDocumentView:]): Fixed parameter type to match the declaration.
(-[WebFrameView documentView]): Fixed return type to match the declaration.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView _startDraggingImage:at:operation:event:sourceIsDHTML:DHTMLWroteData:]):
Initialized a variable to quiet an incorrect gcc 4.0 uninitialized variable warning.
(-[WebHTMLView deleteToMark:]): Switched from @try style to NS_DURING style of exception handler
because we can't pass -fobjc-exceptions just to Objective-C at the moment (see above).
(-[WebHTMLView selectToMark:]): Ditto.
(-[WebHTMLView swapWithMark:]): Ditto.
Revision Changes Path
No revision
No revision
1.677.6.9 +54 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.677.6.8
retrieving revision 1.677.6.9
diff -u -r1.677.6.8 -r1.677.6.9
--- ChangeLog 15 Jul 2005 17:32:00 -0000 1.677.6.8
+++ ChangeLog 22 Jul 2005 01:18:13 -0000 1.677.6.9
@@ -1,3 +1,57 @@
+2005-07-21 Adele Peterson <adele at apple.com>
+
+ Merge from TOT to Safari-2-0-branch to build with gcc 4.0
+ <rdar://problem/4164127>
+
+ 2005-05-16 Darin Adler <darin at apple.com>
+
+ Reviewed by Adele.
+
+ - fixed issues preventing us from compiling with newer versions of gcc 4.0
+
+ * kjs/ustring.cpp:
+ (KJS::operator==): Remove redundant and illegal KJS:: prefix on this function's definition.
+ (KJS::operator<): Ditto.
+ (KJS::compare): Ditto.
+
+ 2005-05-04 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ - another gcc-4.0-related fix
+
+ * bindings/runtime_root.h: Take off extra namespace prefixes that apparently cause problems
+ compiling with gcc 4.0, although I have not observed the problems.
+
+ 2005-04-28 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave Harrison.
+
+ - fixed problems preventing us from compiling with gcc 4.0
+
+ * JavaScriptCore.pbproj/project.pbxproj: Removed -Wmissing-prototypes from
+ WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.
+
+ * bindings/jni/jni_jsobject.cpp:
+ (JSObject::getSlot): Changed some %d to %ld where the parameters where long ints.
+ (JSObject::setSlot): Ditto.
+ * bindings/jni/jni_utility.cpp:
+ (KJS::Bindings::getJavaVM): Ditto.
+ (KJS::Bindings::getJNIEnv): Ditto.
+ * bindings/objc/objc_utility.mm: Fixed include of <JavascriptCore/internal.h> that needed the
+ letter "S" capitalized.
+ * kjs/bool_object.cpp: (BooleanProtoFuncImp::call): Rearranged how this function returns to
+ avoid incorrect gcc 4.0 warning.
+ * kjs/collector.cpp: (KJS::Collector::markStackObjectsConservatively): Changed code to check
+ the alignment of the passed-in pointers to only require pointer-level alignment, not 8-byte alignment.
+ Prevents a crash on garbage collect when compiled with gcc 4.0.
+ * kjs/nodes.cpp:
+ (WhileNode::execute): Added a redundant return after an infinite loop to work around incorrect gcc 4.0 warning.
+ (ForNode::execute): Ditto.
+ (SwitchNode::execute):Rearranged how this function returns to avoid incorrect gcc 4.0 warning.
+ (LabelNode::execute): Ditto.
+ * kjs/string_object.cpp: (replace): Ditto.
+
=== JavaScriptCore-412.5 ===
2005-07-12 Adele Peterson <adele at apple.com>
No revision
No revision
1.415.2.5 +3 -1 JavaScriptCore/JavaScriptCore.pbproj/Attic/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.pbproj/Attic/project.pbxproj,v
retrieving revision 1.415.2.4
retrieving revision 1.415.2.5
diff -u -r1.415.2.4 -r1.415.2.5
--- project.pbxproj 15 Jul 2005 17:32:01 -0000 1.415.2.4
+++ project.pbxproj 22 Jul 2005 01:18:14 -0000 1.415.2.5
@@ -147,7 +147,9 @@
SECTORDER_FLAGS = "-sectorder __TEXT __text /AppleInternal/OrderFiles/JavaScriptCore.order";
STYLE_LDFLAGS = "-umbrella WebKit -allowable_client JavaScriptGlue";
USE_GCC3_PFE_SUPPORT = YES;
- WARNING_CFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double";
+ WARNING_CFLAGS = "$(WARNING_COMMONFLAGS) -Wmissing-prototypes";
+ WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double";
+ WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
WRAPPER_EXTENSION = framework;
};
dependencies = (
No revision
No revision
1.6.10.1 +9 -9 JavaScriptCore/bindings/runtime_root.h
Index: runtime_root.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime_root.h,v
retrieving revision 1.6
retrieving revision 1.6.10.1
diff -u -r1.6 -r1.6.10.1
--- runtime_root.h 17 Jan 2005 22:41:22 -0000 1.6
+++ runtime_root.h 22 Jul 2005 01:18:15 -0000 1.6.10.1
@@ -38,9 +38,9 @@
typedef RootObject *(*FindRootObjectForNativeHandleFunctionPtr)(void *);
extern CFMutableDictionaryRef findReferenceDictionary(ObjectImp *imp);
-extern const Bindings::RootObject *rootForImp (ObjectImp *imp);
-extern const Bindings::RootObject *KJS::Bindings::rootForInterpreter (KJS::Interpreter *interpreter);
-extern void addNativeReference (const Bindings::RootObject *root, ObjectImp *imp);
+extern const RootObject *rootForImp (ObjectImp *imp);
+extern const RootObject *rootForInterpreter (Interpreter *interpreter);
+extern void addNativeReference (const RootObject *root, ObjectImp *imp);
extern void removeNativeReference (ObjectImp *imp);
class RootObject
@@ -57,7 +57,7 @@
#endif
}
- void setRootObjectImp (KJS::ObjectImp *i) {
+ void setRootObjectImp (ObjectImp *i) {
_imp = i;
#if !USE_CONSERVATIVE_GC
_imp->ref();
@@ -68,10 +68,10 @@
#endif
}
- KJS::ObjectImp *rootObjectImp() const { return _imp; }
+ ObjectImp *rootObjectImp() const { return _imp; }
- void setInterpreter (KJS::Interpreter *i);
- KJS::Interpreter *interpreter() const { return _interpreter; }
+ void setInterpreter (Interpreter *i);
+ Interpreter *interpreter() const { return _interpreter; }
void removeAllNativeReferences ();
@@ -91,8 +91,8 @@
private:
const void *_nativeHandle;
- KJS::ObjectImp *_imp;
- KJS::Interpreter *_interpreter;
+ ObjectImp *_imp;
+ Interpreter *_interpreter;
static FindRootObjectForNativeHandleFunctionPtr _findRootObjectForNativeHandleFunctionPtr;
static CFRunLoopRef _runLoop;
No revision
No revision
1.10.10.1 +2 -2 JavaScriptCore/bindings/jni/jni_jsobject.cpp
Index: jni_jsobject.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_jsobject.cpp,v
retrieving revision 1.10
retrieving revision 1.10.10.1
diff -u -r1.10 -r1.10.10.1
--- jni_jsobject.cpp 20 Jan 2005 01:39:19 -0000 1.10
+++ jni_jsobject.cpp 22 Jul 2005 01:18:15 -0000 1.10.10.1
@@ -254,7 +254,7 @@
jobject JSObject::getSlot(jint index) const
{
- JS_LOG ("index = %d\n", index);
+ JS_LOG ("index = %ld\n", index);
ExecState *exec = _root->interpreter()->globalExec();
Interpreter::lock();
@@ -267,7 +267,7 @@
void JSObject::setSlot(jint index, jobject value) const
{
- JS_LOG ("index = %d, value = %p\n", index, value);
+ JS_LOG ("index = %ld, value = %p\n", index, value);
ExecState *exec = _root->interpreter()->globalExec();
Interpreter::lock();
1.22.8.1 +2 -2 JavaScriptCore/bindings/jni/jni_utility.cpp
Index: jni_utility.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_utility.cpp,v
retrieving revision 1.22
retrieving revision 1.22.8.1
diff -u -r1.22 -r1.22.8.1
--- jni_utility.cpp 20 Jan 2005 01:39:19 -0000 1.22
+++ jni_utility.cpp 22 Jul 2005 01:18:15 -0000 1.22.8.1
@@ -50,7 +50,7 @@
jvm = jvmArray[0];
}
else
- fprintf(stderr, "%s: JNI_GetCreatedJavaVMs failed, returned %d\n", __PRETTY_FUNCTION__, jniError);
+ fprintf(stderr, "%s: JNI_GetCreatedJavaVMs failed, returned %ld\n", __PRETTY_FUNCTION__, jniError);
return jvm;
}
@@ -64,7 +64,7 @@
if ( jniError == JNI_OK )
return env;
else
- fprintf(stderr, "%s: AttachCurrentThread failed, returned %d\n", __PRETTY_FUNCTION__, jniError);
+ fprintf(stderr, "%s: AttachCurrentThread failed, returned %ld\n", __PRETTY_FUNCTION__, jniError);
return NULL;
}
No revision
No revision
1.17.8.1 +1 -1 JavaScriptCore/bindings/objc/objc_utility.mm
Index: objc_utility.mm
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/objc_utility.mm,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- objc_utility.mm 15 Mar 2005 23:52:26 -0000 1.17
+++ objc_utility.mm 22 Jul 2005 01:18:16 -0000 1.17.8.1
@@ -24,7 +24,7 @@
*/
#include <Foundation/Foundation.h>
-#include <JavascriptCore/internal.h>
+#include <JavaScriptCore/internal.h>
#include <objc_instance.h>
#include <objc_utility.h>
No revision
No revision
1.9.16.1 +1 -2 JavaScriptCore/kjs/bool_object.cpp
Index: bool_object.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/bool_object.cpp,v
retrieving revision 1.9
retrieving revision 1.9.16.1
diff -u -r1.9 -r1.9.16.1
--- bool_object.cpp 9 Apr 2004 20:07:46 -0000 1.9
+++ bool_object.cpp 22 Jul 2005 01:18:16 -0000 1.9.16.1
@@ -93,8 +93,7 @@
if (id == ToString)
return String(v.toString(exec));
- else
- return Boolean(v.toBoolean(exec)); /* TODO: optimize for bool case */
+ return Boolean(v.toBoolean(exec)); /* TODO: optimize for bool case */
}
// ------------------------------ BooleanObjectImp -----------------------------
1.30.8.1 +4 -3 JavaScriptCore/kjs/collector.cpp
Index: collector.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/collector.cpp,v
retrieving revision 1.30
retrieving revision 1.30.8.1
diff -u -r1.30 -r1.30.8.1
--- collector.cpp 23 Nov 2004 02:06:13 -0000 1.30
+++ collector.cpp 22 Jul 2005 01:18:16 -0000 1.30.8.1
@@ -224,9 +224,10 @@
}
}
+#define IS_POINTER_ALIGNED(p) (((int)(p) & (sizeof(char *) - 1)) == 0)
-// cells are 8-byte aligned
-#define IS_POINTER_ALIGNED(p) (((int)(p) & 7) == 0)
+// cells are 8-byte aligned
+#define IS_CELL_ALIGNED(p) (((int)(p) & 7) == 0)
void Collector::markStackObjectsConservatively(void *start, void *end)
{
@@ -245,7 +246,7 @@
while (p != e) {
char *x = *p++;
- if (IS_POINTER_ALIGNED(x) && x) {
+ if (IS_CELL_ALIGNED(x) && x) {
bool good = false;
for (int block = 0; block < heap.usedBlocks; block++) {
size_t offset = x - (char *)heap.blocks[block];
1.52.12.1 +6 -4 JavaScriptCore/kjs/nodes.cpp
Index: nodes.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/nodes.cpp,v
retrieving revision 1.52
retrieving revision 1.52.12.1
diff -u -r1.52 -r1.52.12.1
--- nodes.cpp 12 Aug 2004 17:21:29 -0000 1.52
+++ nodes.cpp 22 Jul 2005 01:18:16 -0000 1.52.12.1
@@ -1939,6 +1939,8 @@
if (c.complType() != Normal)
return c;
}
+
+ return Completion(); // work around gcc 4.0 bug
}
void WhileNode::processVarDecls(ExecState *exec)
@@ -2009,6 +2011,8 @@
KJS_CHECKEXCEPTION
}
}
+
+ return Completion(); // work around gcc 4.0 bug
}
void ForNode::processVarDecls(ExecState *exec)
@@ -2466,8 +2470,7 @@
if ((res.complType() == Break) && ls.contains(res.target()))
return Completion(Normal, res.value());
- else
- return res;
+ return res;
}
void SwitchNode::processVarDecls(ExecState *exec)
@@ -2505,8 +2508,7 @@
if ((e.complType() == Break) && (e.target() == label))
return Completion(Normal, e.value());
- else
- return e;
+ return e;
}
void LabelNode::processVarDecls(ExecState *exec)
1.31.8.1 +9 -10 JavaScriptCore/kjs/string_object.cpp
Index: string_object.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/string_object.cpp,v
retrieving revision 1.31
retrieving revision 1.31.8.1
diff -u -r1.31 -r1.31.8.1
--- string_object.cpp 17 Dec 2004 00:10:25 -0000 1.31
+++ string_object.cpp 22 Jul 2005 01:18:16 -0000 1.31.8.1
@@ -318,17 +318,16 @@
delete [] replacements;
return String(result);
- } else { // First arg is a string
- UString patternString = pattern.toString(exec);
- int matchPos = source.find(patternString);
- int matchLen = patternString.size();
- // Do the replacement
- if (matchPos == -1)
- return String(source);
- else {
- return String(source.substr(0, matchPos) + replacement.toString(exec) + source.substr(matchPos + matchLen));
- }
}
+
+ // First arg is a string
+ UString patternString = pattern.toString(exec);
+ int matchPos = source.find(patternString);
+ int matchLen = patternString.size();
+ // Do the replacement
+ if (matchPos == -1)
+ return String(source);
+ return String(source.substr(0, matchPos) + replacement.toString(exec) + source.substr(matchPos + matchLen));
}
// ECMA 15.5.4.2 - 15.5.4.20
1.51.10.1 +5 -5 JavaScriptCore/kjs/ustring.cpp
Index: ustring.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/ustring.cpp,v
retrieving revision 1.51
retrieving revision 1.51.10.1
diff -u -r1.51 -r1.51.10.1
--- ustring.cpp 9 Oct 2004 22:17:44 -0000 1.51
+++ ustring.cpp 22 Jul 2005 01:18:16 -0000 1.51.10.1
@@ -136,7 +136,7 @@
return *this;
}
-bool KJS::operator==(const KJS::CString& c1, const KJS::CString& c2)
+bool operator==(const CString& c1, const CString& c2)
{
int len = c1.size();
return len == c2.size() && (len == 0 || memcmp(c1.c_str(), c2.c_str(), len) == 0);
@@ -1149,7 +1149,7 @@
rep->deref();
}
-bool KJS::operator==(const UString& s1, const UString& s2)
+bool operator==(const UString& s1, const UString& s2)
{
if (s1.rep->len != s2.rep->len)
return false;
@@ -1158,7 +1158,7 @@
s1.rep->len * sizeof(UChar)) == 0);
}
-bool KJS::operator==(const UString& s1, const char *s2)
+bool operator==(const UString& s1, const char *s2)
{
if (s2 == 0) {
return s1.isEmpty();
@@ -1176,7 +1176,7 @@
return u == uend && *s2 == 0;
}
-bool KJS::operator<(const UString& s1, const UString& s2)
+bool operator<(const UString& s1, const UString& s2)
{
const int l1 = s1.size();
const int l2 = s2.size();
@@ -1195,7 +1195,7 @@
return (l1 < l2);
}
-int KJS::compare(const UString& s1, const UString& s2)
+int compare(const UString& s1, const UString& s2)
{
const int l1 = s1.size();
const int l2 = s2.size();
No revision
No revision
1.4104.2.69 +184 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4104.2.68
retrieving revision 1.4104.2.69
diff -u -r1.4104.2.68 -r1.4104.2.69
--- ChangeLog 15 Jul 2005 18:02:13 -0000 1.4104.2.68
+++ ChangeLog 22 Jul 2005 01:18:17 -0000 1.4104.2.69
@@ -1,3 +1,187 @@
+2005-07-21 Adele Peterson <adele at apple.com>
+
+ Merge from TOT to Safari-2-0-branch to build with gcc 4.0
+ <rdar://problem/4164127>
+
+ 2005-07-12 Justin Garcia <justin.garcia at apple.com>
+
+ Reviewed by mjs
+
+ * kwq/KWQCursor.mm:
+ (QCursor::makeWithNSCursor):
+ Didn't KWQRetain() the NSCursor in yesterday's gcc 4.0 workaround
+
+ 2005-07-11 Justin Garcia <justin.garcia at apple.com>
+
+ Reviewed by mjs
+
+ Workarounds to get WebCore to compile with gcc 4.0 build 5208
+
+ * kwq/KWQCursor.h:
+ * kwq/KWQCursor.mm:
+ (QCursor::makeWithNSCursor):
+ * kwq/KWQKCursor.mm:
+ (KCursor::crossCursor):
+ (KCursor::handCursor):
+ (KCursor::sizeAllCursor):
+ (KCursor::ibeamCursor):
+ (KCursor::waitCursor):
+ (KCursor::whatsThisCursor):
+ (KCursor::eastResizeCursor):
+ (KCursor::northResizeCursor):
+ (KCursor::northEastResizeCursor):
+ (KCursor::northWestResizeCursor):
+ (KCursor::southResizeCursor):
+ (KCursor::southEastResizeCursor):
+ (KCursor::southWestResizeCursor):
+ (KCursor::westResizeCursor):
+ * kwq/KWQKJobClasses.mm:
+ (KIO::TransferJob::emitResult):
+ (KIO::TransferJob::emitReceivedResponse):
+ * kwq/KWQSignal.h:
+ * kwq/KWQSignal.mm:
+ (KWQSignal::callWithData):
+ (KWQSignal::callWithResponse):
+ * kwq/KWQSlot.h:
+ * kwq/KWQSlot.mm:
+ (KWQSlot::callWithData):
+ (KWQSlot::callWithResponse):
+ * kwq/KWQWidget.mm:
+ (QWidget::cursor):
+
+ 2005-07-08 Justin Garcia <justin.garcia at apple.com>
+
+ Reviewed by john
+
+ Changes needed in order to compile with gcc 4.0 build 5204
+ Mostly obj-c type and casting issues
+
+ * kwq/DOM-CSS.mm:
+ (+[DOMCSSPrimitiveValue _valueWithImpl:]): Wrote wrapper _valuewithimpl that calls parent class's method
+ * kwq/DOMEvents.h:
+ * kwq/DOMInternal.h:
+ (addDOMWrapper):
+ * kwq/KWQButton.mm:
+ (QButton::setWritingDirection):
+ * kwq/KWQClipboard.mm:
+ (KWQClipboard::dragNSImage):
+ * kwq/KWQComboBox.mm:
+ (QComboBox::setWritingDirection):
+ (QComboBox::populateMenu):
+ * kwq/KWQKHTMLPart.mm:
+ (regExpForLabels):
+ (KWQKHTMLPart::passWidgetMouseDownEventToWidget):
+ (KWQKHTMLPart::fileWrapperForElement): renderer->pixmap().image() was used as an NSImage, but a WebCoreImageRenderer doesn't have any association with NSImage, should be investigated further
+ * kwq/KWQLineEdit.mm:
+ (QLineEdit::QLineEdit):
+ * kwq/KWQListBox.mm:
+ (QListBox::~QListBox):
+ (QListBox::setSelectionMode):
+ (QListBox::doneAppendingItems):
+ (QListBox::setSelected):
+ (QListBox::isSelected):
+ (QListBox::setEnabled):
+ (QListBox::sizeForNumberOfLines):
+ (QListBox::setWritingDirection):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::contentsX):
+ (QScrollView::contentsY):
+ * kwq/KWQTextEdit.mm:
+ (QTextEdit::setAlignment):
+ (QTextEdit::setWritingDirection):
+ (QTextEdit::sizeWithColumnsAndRows):
+ (QTextEdit::setPalette):
+ * kwq/KWQWidget.mm:
+ (QWidget::hasFocus):
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge elementAtPoint:]):
+
+ 2005-05-16 Darin Adler <darin at apple.com>
+
+ Reviewed by Adele.
+
+ - fixed issues preventing us from compiling with newer versions of gcc 4.0
+
+ * khtml/dom/dom2_events.cpp: Add definitions of some static data member constants, as required
+ by the C++ standard and the gcc 4.0 compiler.
+
+ * khtml/editing/selection.h: Specified KHTMLPart friend class as ::KHTMLPart, since if it's
+ not explicitly qualified, it means DOM::KHTMLPart.
+
+ * khtml/dom/dom_string.cpp:
+ (DOM::strcasecmp): Removed redundant and illegal DOM:: prefix.
+ (DOM::operator==): Ditto.
+ * khtml/ecma/kjs_binding.cpp:
+ (KJS::getStringOrNull): Removed redundant and illegal KJS:: prefix.
+ (KJS::ValueToVariant): Ditto.
+ * khtml/ecma/kjs_css.cpp:
+ (KJS::getCSSRuleConstructor): Ditto.
+ (KJS::getCSSValueConstructor): Ditto.
+ (KJS::getCSSPrimitiveValueConstructor): Ditto.
+ * khtml/ecma/kjs_events.cpp:
+ (KJS::getEventConstructor): Ditto.
+ (KJS::getEventExceptionConstructor): Ditto.
+ (KJS::getMutationEventConstructor): Ditto.
+ * khtml/ecma/kjs_traversal.cpp:
+ (KJS::getNodeFilterConstructor): Ditto.
+
+ * khtml/misc/loader_client.h: Added an empty virtual destructor to CachedObjectClient
+ to quiet the compiler. This doesn't really do any good, but also does no harm.
+ * khtml/misc/loader.cpp: (CachedObjectClient::~CachedObjectClient): Added.
+
+ * khtml/rendering/render_block.cpp: (khtml::RenderBlock::fillBlockSelectionGaps):
+ Initialize a couple of variables that should have been initialized to 0.
+ Not just about making the compiler happy -- warning found a real bug!
+
+ * kwq/KWQTextArea.mm: (RangeOfParagraph): Change else structure to work around compiler
+ warning bug.
+
+ 2005-04-28 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave Harrison.
+
+ - fixed problems preventing us from compiling with gcc 4.0
+
+ * WebCore.pbproj/project.pbxproj: Removed -fobjc-exceptions because I can't figure out an easy
+ way to pass it only when compiling Objective-C/C++. Removed -Wmissing-prototypes from
+ WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.
+
+ * khtml/css/parser.y: Changed some rules that were using a float to pass around an enum to use an
+ int instead to avoid a warning.
+ * khtml/css/parser.cpp: Regenerated.
+ * khtml/css/parser.h: Regenerated.
+
+ * khtml/ecma/kjs_dom.cpp: (DOMTextProtoFunc::tryCall): Rearranged a return statement to avoid an incorrect
+ warning.
+ * khtml/ecma/kjs_html.cpp: (KJS::Context2DFunction::tryCall): Initialized a couple of variables to avoid
+ an incorrect warning.
+ * khtml/ecma/kjs_proxy.cpp: (KJSProxyImpl::evaluate): Rearranged how we exit from the function to avoid
+ an incorret warning.
+ * khtml/editing/selection.cpp: (khtml::Selection::debugPosition): Changed some %d to %ld where the
+ parameters where long ints.
+ * khtml/editing/visible_position.cpp: (khtml::VisiblePosition::debugPosition): Ditto.
+ * khtml/xml/dom_position.cpp: (DOM::Position::debugPosition): Ditto.
+ * kwq/DOMEvents.mm: (-[DOMMouseEvent initMouseEvent:::::::::::::::]): Rearranged code to avoid a cast
+ that was causing an incorrect warning.
+ * kwq/DOMUtility.mm:
+ (createObjCDOMNode): Broke out as a separate function.
+ (KJS::ScriptInterpreter::createObjcInstanceForValue): Rearranged code to avoid a namespace collision with
+ KJS::DOMNode and the Objective-C DOMNode class.
+ * kwq/KWQFileButton.mm: Made fields of KWQFileButtonAdapter public to avoid an error, new to gcc 4.0,
+ about accessing protected Objective-C fields.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::matchLabelsAgainstElement): Rearranged a return statement to avoid an incorrect warning.
+ (KWQKHTMLPart::imageFromRect): Rearranged how this function does its exception handling to avoid a
+ "may be clobbered" warning.
+ * kwq/KWQKJavaAppletWidget.mm: Fixed incorrect import that said "KHTMLView.h" instead of "khtmlview.h".
+ * kwq/KWQObject.mm: Made fields of KWQObjectTimerTarget public to avoid an error, new to gcc 4.0,
+ about accessing protected Objective-C fields.
+ * kwq/WebCoreBridge.mm: (partHasSelection): Used [bridge part] instead of getting directly at instance
+ variable to avoid an error, new to gcc 4.0, about accessing protected Objective-C fields.
+
+ * WebCore-combined.exp: Regenerated.
+ * WebCore-tests.exp: Added some additional symbols needed by the tests under gcc 4.0.
+
=== WebCore-415.13 ===
2005-07-15 Adele Peterson <adele at apple.com>
1.39.10.1 +2 -0 WebCore/Attic/WebCore-combined.exp
Index: WebCore-combined.exp
===================================================================
RCS file: /cvs/root/WebCore/Attic/WebCore-combined.exp,v
retrieving revision 1.39
retrieving revision 1.39.10.1
diff -u -r1.39 -r1.39.10.1
--- WebCore-combined.exp 19 Nov 2004 00:12:20 -0000 1.39
+++ WebCore-combined.exp 22 Jul 2005 01:18:20 -0000 1.39.10.1
@@ -397,6 +397,8 @@
__ZNK8QCString7isEmptyEv
__ZNK8QCString8containsEcb
__ZNK9QDateTime6secsToERKS_
+__ZTI10KWQMapImpl
+__ZTI14QPtrCollection
__ZTV14QPtrCollection
__ZeqRK5QRectS1_
__ZeqRK5QSizeS1_
1.30.10.1 +2 -0 WebCore/WebCore-tests.exp
Index: WebCore-tests.exp
===================================================================
RCS file: /cvs/root/WebCore/WebCore-tests.exp,v
retrieving revision 1.30
retrieving revision 1.30.10.1
diff -u -r1.30 -r1.30.10.1
--- WebCore-tests.exp 19 Nov 2004 00:12:20 -0000 1.30
+++ WebCore-tests.exp 22 Jul 2005 01:18:20 -0000 1.30.10.1
@@ -285,6 +285,8 @@
__ZNK8QCString7isEmptyEv
__ZNK8QCString8containsEcb
__ZNK9QDateTime6secsToERKS_
+__ZTI10KWQMapImpl
+__ZTI14QPtrCollection
__ZTV14QPtrCollection
__ZeqRK5QRectS1_
__ZeqRK5QSizeS1_
No revision
No revision
1.524.2.15 +2 -2 WebCore/WebCore.pbproj/Attic/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.pbproj/Attic/project.pbxproj,v
retrieving revision 1.524.2.14
retrieving revision 1.524.2.15
diff -u -r1.524.2.14 -r1.524.2.15
--- project.pbxproj 15 Jul 2005 18:02:19 -0000 1.524.2.14
+++ project.pbxproj 22 Jul 2005 01:18:24 -0000 1.524.2.15
@@ -155,8 +155,8 @@
PRODUCT_NAME = WebCore;
SECTORDER_FLAGS = "-sectorder __TEXT __text /AppleInternal/OrderFiles/WebCore.order";
USE_GCC3_PFE_SUPPORT = YES;
- WARNING_CFLAGS = "$(WARNING_COMMONFLAGS)";
- WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+ WARNING_CFLAGS = "$(WARNING_COMMONFLAGS) -Wmissing-prototypes";
+ WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
WRAPPER_EXTENSION = framework;
};
No revision
No revision
1.33.10.1 +160 -159 WebCore/khtml/css/Attic/parser.cpp
Index: parser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/Attic/parser.cpp,v
retrieving revision 1.33
retrieving revision 1.33.10.1
diff -u -r1.33 -r1.33.10.1
--- parser.cpp 16 Nov 2004 00:47:54 -0000 1.33
+++ parser.cpp 22 Jul 2005 01:18:27 -0000 1.33.10.1
@@ -152,11 +152,12 @@
int element;
CSSSelector::Relation relation;
bool b;
+ int i;
char tok;
Value value;
ValueList *valueList;
} YYSTYPE;
-#line 105 "parser.y"
+#line 106 "parser.y"
static inline int cssyyerror(const char *x ) {
@@ -305,23 +306,23 @@
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 237, 239, 240, 241, 244, 251, 257, 282, 284, 287,
- 289, 290, 293, 295, 300, 301, 304, 306, 316, 318,
- 321, 323, 333, 335, 336, 337, 338, 339, 340, 343,
- 356, 359, 364, 373, 374, 377, 379, 382, 384, 387,
- 391, 395, 399, 403, 408, 414, 428, 430, 439, 461,
- 465, 470, 474, 479, 481, 482, 485, 487, 490, 509,
- 521, 535, 541, 545, 574, 580, 582, 583, 586, 591,
- 596, 601, 608, 617, 628, 645, 650, 654, 664, 670,
- 680, 681, 682, 685, 697, 717, 723, 729, 737, 748,
- 752, 755, 758, 761, 764, 769, 771, 774, 788, 795,
- 804, 808, 813, 816, 822, 830, 834, 837, 843, 849,
- 854, 860, 868, 891, 895, 903, 908, 915, 922, 924,
- 927, 932, 945, 951, 955, 958, 963, 965, 966, 967,
- 974, 975, 976, 977, 978, 979, 981, 986, 988, 989,
- 990, 991, 992, 993, 994, 995, 996, 997, 998, 999,
- 1000, 1001, 1002, 1003, 1004, 1008, 1016, 1031, 1038, 1045,
- 1053, 1063, 1089, 1091, 1094, 1096
+ 238, 240, 241, 242, 245, 252, 258, 283, 285, 288,
+ 290, 291, 294, 296, 301, 302, 305, 307, 317, 319,
+ 322, 324, 334, 336, 337, 338, 339, 340, 341, 344,
+ 357, 360, 365, 374, 375, 378, 380, 383, 385, 388,
+ 392, 396, 400, 404, 409, 415, 429, 431, 440, 462,
+ 466, 471, 475, 480, 482, 483, 486, 488, 491, 510,
+ 522, 536, 542, 546, 575, 581, 583, 584, 587, 592,
+ 597, 602, 609, 618, 629, 646, 651, 655, 665, 671,
+ 681, 682, 683, 686, 698, 718, 724, 730, 738, 749,
+ 753, 756, 759, 762, 765, 770, 772, 775, 789, 796,
+ 805, 809, 814, 817, 823, 831, 835, 838, 844, 850,
+ 855, 861, 869, 892, 896, 904, 909, 916, 923, 925,
+ 928, 933, 946, 952, 956, 959, 964, 966, 967, 968,
+ 975, 976, 977, 978, 979, 980, 982, 987, 989, 990,
+ 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000,
+ 1001, 1002, 1003, 1004, 1005, 1009, 1017, 1032, 1039, 1046,
+ 1054, 1064, 1090, 1092, 1095, 1097
};
#endif
@@ -1162,20 +1163,20 @@
switch (yyn) {
case 5:
-#line 245 "parser.y"
+#line 246 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
p->rule = yyvsp[-2].rule;
;
break;}
case 6:
-#line 252 "parser.y"
+#line 253 "parser.y"
{
/* can be empty */
;
break;}
case 7:
-#line 258 "parser.y"
+#line 259 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].valueList ) {
@@ -1200,7 +1201,7 @@
;
break;}
case 14:
-#line 295 "parser.y"
+#line 296 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "charset rule: " << qString(yyvsp[-2].string) << endl;
@@ -1208,7 +1209,7 @@
;
break;}
case 18:
-#line 306 "parser.y"
+#line 307 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
@@ -1219,7 +1220,7 @@
;
break;}
case 22:
-#line 323 "parser.y"
+#line 324 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
@@ -1230,7 +1231,7 @@
;
break;}
case 30:
-#line 344 "parser.y"
+#line 345 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "@import: " << qString(yyvsp[-3].string) << endl;
@@ -1245,19 +1246,19 @@
;
break;}
case 31:
-#line 356 "parser.y"
+#line 357 "parser.y"
{
yyval.rule = 0;
;
break;}
case 32:
-#line 359 "parser.y"
+#line 360 "parser.y"
{
yyval.rule = 0;
;
break;}
case 33:
-#line 365 "parser.y"
+#line 366 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "@namespace: " << qString(yyvsp[-2].string) << endl;
@@ -1268,34 +1269,34 @@
;
break;}
case 36:
-#line 378 "parser.y"
+#line 379 "parser.y"
{ yyval.string.string = 0; ;
break;}
case 37:
-#line 379 "parser.y"
+#line 380 "parser.y"
{ yyval.string = yyvsp[-1].string; ;
break;}
case 40:
-#line 388 "parser.y"
+#line 389 "parser.y"
{
yyval.mediaList = new MediaListImpl();
;
break;}
case 42:
-#line 396 "parser.y"
+#line 397 "parser.y"
{
yyval.mediaList = 0;
;
break;}
case 43:
-#line 399 "parser.y"
+#line 400 "parser.y"
{
yyval.mediaList = new MediaListImpl();
yyval.mediaList->appendMedium( domString(yyvsp[0].string).lower() );
;
break;}
case 44:
-#line 403 "parser.y"
+#line 404 "parser.y"
{
yyval.mediaList = yyvsp[-3].mediaList;
if (yyval.mediaList)
@@ -1303,14 +1304,14 @@
;
break;}
case 45:
-#line 408 "parser.y"
+#line 409 "parser.y"
{
delete yyvsp[-1].mediaList;
yyval.mediaList = 0;
;
break;}
case 46:
-#line 415 "parser.y"
+#line 416 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-4].mediaList && yyvsp[-1].ruleList &&
@@ -1324,11 +1325,11 @@
;
break;}
case 47:
-#line 429 "parser.y"
+#line 430 "parser.y"
{ yyval.ruleList = 0; ;
break;}
case 48:
-#line 430 "parser.y"
+#line 431 "parser.y"
{
yyval.ruleList = yyvsp[-2].ruleList;
if ( yyvsp[-1].rule ) {
@@ -1338,57 +1339,57 @@
;
break;}
case 49:
-#line 440 "parser.y"
+#line 441 "parser.y"
{
yyval.string = yyvsp[-1].string;
;
break;}
case 50:
-#line 462 "parser.y"
+#line 463 "parser.y"
{
yyval.rule = 0;
;
break;}
case 51:
-#line 465 "parser.y"
+#line 466 "parser.y"
{
yyval.rule = 0;
;
break;}
case 52:
-#line 471 "parser.y"
+#line 472 "parser.y"
{
yyval.rule = 0;
;
break;}
case 53:
-#line 474 "parser.y"
+#line 475 "parser.y"
{
yyval.rule = 0;
;
break;}
case 54:
-#line 480 "parser.y"
+#line 481 "parser.y"
{ yyval.relation = CSSSelector::Sibling; ;
break;}
case 55:
-#line 481 "parser.y"
+#line 482 "parser.y"
{ yyval.relation = CSSSelector::Child; ;
break;}
case 56:
-#line 482 "parser.y"
+#line 483 "parser.y"
{ yyval.relation = CSSSelector::Descendant; ;
break;}
case 57:
-#line 486 "parser.y"
-{ yyval.val = -1; ;
+#line 487 "parser.y"
+{ yyval.i = -1; ;
break;}
case 58:
-#line 487 "parser.y"
-{ yyval.val = 1; ;
+#line 488 "parser.y"
+{ yyval.i = 1; ;
break;}
case 59:
-#line 491 "parser.y"
+#line 492 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "got ruleset" << endl << " selector:" << endl;
@@ -1407,7 +1408,7 @@
;
break;}
case 60:
-#line 510 "parser.y"
+#line 511 "parser.y"
{
if ( yyvsp[0].selector ) {
yyval.selector = yyvsp[0].selector;
@@ -1421,7 +1422,7 @@
;
break;}
case 61:
-#line 521 "parser.y"
+#line 522 "parser.y"
{
if ( yyvsp[-3].selector && yyvsp[0].selector ) {
yyval.selector = yyvsp[-3].selector;
@@ -1438,20 +1439,20 @@
;
break;}
case 62:
-#line 535 "parser.y"
+#line 536 "parser.y"
{
delete yyvsp[-1].selector;
yyval.selector = 0;
;
break;}
case 63:
-#line 542 "parser.y"
+#line 543 "parser.y"
{
yyval.selector = yyvsp[0].selector;
;
break;}
case 64:
-#line 545 "parser.y"
+#line 546 "parser.y"
{
yyval.selector = yyvsp[0].selector;
if (!yyvsp[-2].selector) {
@@ -1483,33 +1484,33 @@
;
break;}
case 65:
-#line 574 "parser.y"
+#line 575 "parser.y"
{
delete yyvsp[-1].selector;
yyval.selector = 0;
;
break;}
case 66:
-#line 581 "parser.y"
+#line 582 "parser.y"
{ yyval.string.string = 0; yyval.string.length = 0; ;
break;}
case 67:
-#line 582 "parser.y"
+#line 583 "parser.y"
{ static unsigned short star = '*'; yyval.string.string = ☆ yyval.string.length = 1; ;
break;}
case 68:
-#line 583 "parser.y"
+#line 584 "parser.y"
{ yyval.string = yyvsp[0].string; ;
break;}
case 69:
-#line 587 "parser.y"
+#line 588 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->tag = yyvsp[-1].element;
;
break;}
case 70:
-#line 591 "parser.y"
+#line 592 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if ( yyval.selector )
@@ -1517,7 +1518,7 @@
;
break;}
case 71:
-#line 596 "parser.y"
+#line 597 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if (yyval.selector)
@@ -1525,7 +1526,7 @@
;
break;}
case 72:
-#line 601 "parser.y"
+#line 602 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->tag = yyvsp[-1].element;
@@ -1535,7 +1536,7 @@
;
break;}
case 73:
-#line 608 "parser.y"
+#line 609 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if (yyval.selector) {
@@ -1547,7 +1548,7 @@
;
break;}
case 74:
-#line 617 "parser.y"
+#line 618 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if (yyval.selector) {
@@ -1559,7 +1560,7 @@
;
break;}
case 75:
-#line 629 "parser.y"
+#line 630 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
@@ -1578,19 +1579,19 @@
;
break;}
case 76:
-#line 645 "parser.y"
+#line 646 "parser.y"
{
yyval.element = makeId(static_cast<CSSParser*>(parser)->defaultNamespace, anyLocalName);
;
break;}
case 77:
-#line 651 "parser.y"
+#line 652 "parser.y"
{
yyval.selector = yyvsp[0].selector;
;
break;}
case 78:
-#line 654 "parser.y"
+#line 655 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
if (yyval.selector) {
@@ -1603,14 +1604,14 @@
;
break;}
case 79:
-#line 664 "parser.y"
+#line 665 "parser.y"
{
delete yyvsp[-1].selector;
yyval.selector = 0;
;
break;}
case 80:
-#line 671 "parser.y"
+#line 672 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Id;
@@ -1622,7 +1623,7 @@
;
break;}
case 84:
-#line 686 "parser.y"
+#line 687 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Class;
@@ -1634,7 +1635,7 @@
;
break;}
case 85:
-#line 698 "parser.y"
+#line 699 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
@@ -1654,7 +1655,7 @@
;
break;}
case 86:
-#line 718 "parser.y"
+#line 719 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-1].attribute;
@@ -1662,16 +1663,16 @@
;
break;}
case 87:
-#line 723 "parser.y"
+#line 724 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-5].attribute;
- yyval.selector->match = (CSSSelector::Match)yyvsp[-4].val;
+ yyval.selector->match = (CSSSelector::Match)yyvsp[-4].i;
yyval.selector->value = atomicString(yyvsp[-2].string);
;
break;}
case 88:
-#line 729 "parser.y"
+#line 730 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-1].attribute;
@@ -1682,11 +1683,11 @@
;
break;}
case 89:
-#line 737 "parser.y"
+#line 738 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-5].attribute;
- yyval.selector->match = (CSSSelector::Match)yyvsp[-4].val;
+ yyval.selector->match = (CSSSelector::Match)yyvsp[-4].i;
yyval.selector->value = atomicString(yyvsp[-2].string);
CSSParser *p = static_cast<CSSParser *>(parser);
if (p->styleElement && p->styleElement->isCSSStyleSheet())
@@ -1694,43 +1695,43 @@
;
break;}
case 90:
-#line 749 "parser.y"
+#line 750 "parser.y"
{
- yyval.val = CSSSelector::Exact;
+ yyval.i = CSSSelector::Exact;
;
break;}
case 91:
-#line 752 "parser.y"
+#line 753 "parser.y"
{
- yyval.val = CSSSelector::List;
+ yyval.i = CSSSelector::List;
;
break;}
case 92:
-#line 755 "parser.y"
+#line 756 "parser.y"
{
- yyval.val = CSSSelector::Hyphen;
+ yyval.i = CSSSelector::Hyphen;
;
break;}
case 93:
-#line 758 "parser.y"
+#line 759 "parser.y"
{
- yyval.val = CSSSelector::Begin;
+ yyval.i = CSSSelector::Begin;
;
break;}
case 94:
-#line 761 "parser.y"
+#line 762 "parser.y"
{
- yyval.val = CSSSelector::End;
+ yyval.i = CSSSelector::End;
;
break;}
case 95:
-#line 764 "parser.y"
+#line 765 "parser.y"
{
- yyval.val = CSSSelector::Contain;
+ yyval.i = CSSSelector::Contain;
;
break;}
case 98:
-#line 775 "parser.y"
+#line 776 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
@@ -1746,7 +1747,7 @@
;
break;}
case 99:
-#line 789 "parser.y"
+#line 790 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
@@ -1755,7 +1756,7 @@
;
break;}
case 100:
-#line 795 "parser.y"
+#line 796 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
@@ -1765,13 +1766,13 @@
;
break;}
case 101:
-#line 805 "parser.y"
+#line 806 "parser.y"
{
yyval.ok = yyvsp[0].ok;
;
break;}
case 102:
-#line 808 "parser.y"
+#line 809 "parser.y"
{
yyval.ok = yyvsp[-1].ok;
if ( yyvsp[0].ok )
@@ -1779,13 +1780,13 @@
;
break;}
case 103:
-#line 813 "parser.y"
+#line 814 "parser.y"
{
yyval.ok = yyvsp[0].ok;
;
break;}
case 104:
-#line 816 "parser.y"
+#line 817 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1794,7 +1795,7 @@
;
break;}
case 105:
-#line 822 "parser.y"
+#line 823 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1803,19 +1804,19 @@
;
break;}
case 106:
-#line 831 "parser.y"
+#line 832 "parser.y"
{
yyval.ok = yyvsp[-2].ok;
;
break;}
case 107:
-#line 834 "parser.y"
+#line 835 "parser.y"
{
yyval.ok = false;
;
break;}
case 108:
-#line 837 "parser.y"
+#line 838 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1824,7 +1825,7 @@
;
break;}
case 109:
-#line 843 "parser.y"
+#line 844 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1833,7 +1834,7 @@
;
break;}
case 110:
-#line 849 "parser.y"
+#line 850 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
if ( yyvsp[-2].ok )
@@ -1841,7 +1842,7 @@
;
break;}
case 111:
-#line 854 "parser.y"
+#line 855 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
#ifdef CSS_DEBUG
@@ -1850,7 +1851,7 @@
;
break;}
case 112:
-#line 860 "parser.y"
+#line 861 "parser.y"
{
yyval.ok = yyvsp[-5].ok;
#ifdef CSS_DEBUG
@@ -1859,7 +1860,7 @@
;
break;}
case 113:
-#line 869 "parser.y"
+#line 870 "parser.y"
{
yyval.ok = false;
CSSParser *p = static_cast<CSSParser *>(parser);
@@ -1884,13 +1885,13 @@
;
break;}
case 114:
-#line 892 "parser.y"
+#line 893 "parser.y"
{
yyval.ok = false;
;
break;}
case 115:
-#line 896 "parser.y"
+#line 897 "parser.y"
{
/* The default movable type template has letter-spacing: .none; Handle this by looking for
error tokens at the start of an expr, recover the expr and then treat as an error, cleaning
@@ -1900,43 +1901,43 @@
;
break;}
case 116:
-#line 904 "parser.y"
+#line 905 "parser.y"
{
/* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */
yyval.ok = false;
;
break;}
case 117:
-#line 909 "parser.y"
+#line 910 "parser.y"
{
/* div { font-family: } Just reduce away this property with no value. */
yyval.ok = false;
;
break;}
case 118:
-#line 916 "parser.y"
+#line 917 "parser.y"
{
QString str = qString(yyvsp[-1].string);
yyval.prop_id = getPropertyID( str.lower().latin1(), str.length() );
;
break;}
case 119:
-#line 923 "parser.y"
+#line 924 "parser.y"
{ yyval.b = true; ;
break;}
case 120:
-#line 924 "parser.y"
+#line 925 "parser.y"
{ yyval.b = false; ;
break;}
case 121:
-#line 928 "parser.y"
+#line 929 "parser.y"
{
yyval.valueList = new ValueList;
yyval.valueList->addValue( yyvsp[0].value );
;
break;}
case 122:
-#line 932 "parser.y"
+#line 933 "parser.y"
{
yyval.valueList = yyvsp[-2].valueList;
if ( yyval.valueList ) {
@@ -1952,44 +1953,44 @@
;
break;}
case 123:
-#line 945 "parser.y"
+#line 946 "parser.y"
{
delete yyvsp[-1].valueList;
yyval.valueList = 0;
;
break;}
case 124:
-#line 952 "parser.y"
+#line 953 "parser.y"
{
yyval.tok = '/';
;
break;}
case 125:
-#line 955 "parser.y"
+#line 956 "parser.y"
{
yyval.tok = ',';
;
break;}
case 126:
-#line 958 "parser.y"
+#line 959 "parser.y"
{
yyval.tok = 0;
;
break;}
case 127:
-#line 964 "parser.y"
+#line 965 "parser.y"
{ yyval.value = yyvsp[0].value; ;
break;}
case 128:
-#line 965 "parser.y"
-{ yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].val; ;
+#line 966 "parser.y"
+{ yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].i; ;
break;}
case 129:
-#line 966 "parser.y"
+#line 967 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_STRING; ;
break;}
case 130:
-#line 967 "parser.y"
+#line 968 "parser.y"
{
QString str = qString( yyvsp[-1].string );
yyval.value.id = getValueID( str.lower().latin1(), str.length() );
@@ -1998,109 +1999,109 @@
;
break;}
case 131:
-#line 974 "parser.y"
+#line 975 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
break;}
case 132:
-#line 975 "parser.y"
+#line 976 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
break;}
case 133:
-#line 976 "parser.y"
+#line 977 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_URI; ;
break;}
case 134:
-#line 977 "parser.y"
+#line 978 "parser.y"
{ yyval.value.id = 0; yyval.value.iValue = 0; yyval.value.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ ;
break;}
case 135:
-#line 978 "parser.y"
+#line 979 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
break;}
case 136:
-#line 979 "parser.y"
+#line 980 "parser.y"
{ yyval.value.id = 0; yyval.value.string = ParseString(); yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
break;}
case 137:
-#line 981 "parser.y"
+#line 982 "parser.y"
{
yyval.value = yyvsp[0].value;
;
break;}
case 138:
-#line 987 "parser.y"
+#line 988 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
break;}
case 139:
-#line 988 "parser.y"
+#line 989 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
break;}
case 140:
-#line 989 "parser.y"
+#line 990 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
break;}
case 141:
-#line 990 "parser.y"
+#line 991 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
break;}
case 142:
-#line 991 "parser.y"
+#line 992 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
break;}
case 143:
-#line 992 "parser.y"
+#line 993 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
break;}
case 144:
-#line 993 "parser.y"
+#line 994 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
break;}
case 145:
-#line 994 "parser.y"
+#line 995 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
break;}
case 146:
-#line 995 "parser.y"
+#line 996 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
break;}
case 147:
-#line 996 "parser.y"
+#line 997 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
break;}
case 148:
-#line 997 "parser.y"
+#line 998 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
break;}
case 149:
-#line 998 "parser.y"
+#line 999 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
break;}
case 150:
-#line 999 "parser.y"
+#line 1000 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
break;}
case 151:
-#line 1000 "parser.y"
+#line 1001 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
break;}
case 152:
-#line 1001 "parser.y"
+#line 1002 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
break;}
case 153:
-#line 1002 "parser.y"
+#line 1003 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
break;}
case 154:
-#line 1003 "parser.y"
+#line 1004 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
break;}
case 155:
-#line 1004 "parser.y"
+#line 1005 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
break;}
case 156:
-#line 1009 "parser.y"
+#line 1010 "parser.y"
{
Function *f = new Function;
f->name = yyvsp[-4].string;
@@ -2111,7 +2112,7 @@
;
break;}
case 157:
-#line 1017 "parser.y"
+#line 1018 "parser.y"
{
Function *f = new Function;
f->name = yyvsp[-2].string;
@@ -2122,11 +2123,11 @@
;
break;}
case 158:
-#line 1032 "parser.y"
+#line 1033 "parser.y"
{ yyval.string = yyvsp[-1].string; ;
break;}
case 159:
-#line 1039 "parser.y"
+#line 1040 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2135,7 +2136,7 @@
;
break;}
case 160:
-#line 1045 "parser.y"
+#line 1046 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2144,7 +2145,7 @@
;
break;}
case 161:
-#line 1054 "parser.y"
+#line 1055 "parser.y"
{
delete yyvsp[0].rule;
yyval.rule = 0;
@@ -2154,7 +2155,7 @@
;
break;}
case 162:
-#line 1064 "parser.y"
+#line 1065 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2384,6 +2385,6 @@
}
return 1;
}
-#line 1099 "parser.y"
+#line 1100 "parser.y"
1.5.16.1 +1 -0 WebCore/khtml/css/Attic/parser.h
Index: parser.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/Attic/parser.h,v
retrieving revision 1.5
retrieving revision 1.5.16.1
diff -u -r1.5 -r1.5.16.1
--- parser.h 27 May 2004 23:05:15 -0000 1.5
+++ parser.h 22 Jul 2005 01:18:27 -0000 1.5.16.1
@@ -12,6 +12,7 @@
int element;
CSSSelector::Relation relation;
bool b;
+ int i;
char tok;
Value value;
ValueList *valueList;
1.33.10.1 +3 -2 WebCore/khtml/css/parser.y
Index: parser.y
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/parser.y,v
retrieving revision 1.33
retrieving revision 1.33.10.1
diff -u -r1.33 -r1.33.10.1
--- parser.y 16 Nov 2004 00:47:54 -0000 1.33
+++ parser.y 22 Jul 2005 01:18:28 -0000 1.33.10.1
@@ -97,6 +97,7 @@
int element;
CSSSelector::Relation relation;
bool b;
+ int i;
char tok;
Value value;
ValueList *valueList;
@@ -219,8 +220,8 @@
%type <b> prio
-%type <val> match
-%type <val> unary_operator
+%type <i> match
+%type <i> unary_operator
%type <tok> operator
%type <valueList> expr
No revision
No revision
1.18.18.1 +6 -0 WebCore/khtml/dom/dom2_events.cpp
Index: dom2_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_events.cpp,v
retrieving revision 1.18
retrieving revision 1.18.18.1
diff -u -r1.18 -r1.18.18.1
--- dom2_events.cpp 16 Feb 2004 18:18:17 -0000 1.18
+++ dom2_events.cpp 22 Jul 2005 01:18:28 -0000 1.18.18.1
@@ -630,6 +630,12 @@
// -----------------------------------------------------------------------------
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_STANDARD;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_LEFT;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_RIGHT;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_NUMPAD;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_UNKNOWN;
+
KeyboardEvent::KeyboardEvent()
{
}
1.16.8.1 +5 -5 WebCore/khtml/dom/dom_string.cpp
Index: dom_string.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_string.cpp,v
retrieving revision 1.16
retrieving revision 1.16.8.1
diff -u -r1.16 -r1.16.8.1
--- dom_string.cpp 4 Mar 2005 22:24:18 -0000 1.16
+++ dom_string.cpp 22 Jul 2005 01:18:28 -0000 1.16.8.1
@@ -236,7 +236,7 @@
// ------------------------------------------------------------------------
-bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
+bool strcasecmp( const DOMString &as, const DOMString &bs )
{
if ( as.length() != bs.length() ) return true;
@@ -252,7 +252,7 @@
return false;
}
-bool DOM::strcasecmp( const DOMString &as, const char* bs )
+bool strcasecmp( const DOMString &as, const char* bs )
{
const QChar *a = as.unicode();
int l = as.length();
@@ -286,7 +286,7 @@
//-----------------------------------------------------------------------------
-bool DOM::operator==( const DOMString &a, const DOMString &b )
+bool operator==( const DOMString &a, const DOMString &b )
{
if (a.impl == b.impl)
return true;
@@ -300,7 +300,7 @@
return false;
}
-bool DOM::operator==( const DOMString &a, const QString &b )
+bool operator==( const DOMString &a, const QString &b )
{
unsigned int l = a.length();
@@ -311,7 +311,7 @@
return false;
}
-bool DOM::operator==( const DOMString &a, const char *b )
+bool operator==( const DOMString &a, const char *b )
{
DOMStringImpl *aimpl = a.impl;
No revision
No revision
1.26.8.3 +6 -4 WebCore/khtml/ecma/kjs_binding.cpp
Index: kjs_binding.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_binding.cpp,v
retrieving revision 1.26.8.2
retrieving revision 1.26.8.3
diff -u -r1.26.8.2 -r1.26.8.3
--- kjs_binding.cpp 31 May 2005 23:48:22 -0000 1.26.8.2
+++ kjs_binding.cpp 22 Jul 2005 01:18:29 -0000 1.26.8.3
@@ -33,7 +33,7 @@
using DOM::DOMString;
-using namespace KJS;
+namespace KJS {
/* TODO:
* The catch all (...) clauses below shouldn't be necessary.
@@ -382,7 +382,7 @@
return QString((QChar*) data(), size());
}
-DOM::Node KJS::toNode(const Value& val)
+DOM::Node toNode(const Value& val)
{
Object obj = Object::dynamicCast(val);
if (obj.isNull() || !obj.inherits(&DOMNode::info))
@@ -392,7 +392,7 @@
return dobj->toNode();
}
-Value KJS::getStringOrNull(DOMString s)
+Value getStringOrNull(DOMString s)
{
if (s.isNull())
return Null();
@@ -400,7 +400,7 @@
return String(s);
}
-QVariant KJS::ValueToVariant(ExecState* exec, const Value &val) {
+QVariant ValueToVariant(ExecState* exec, const Value &val) {
QVariant res;
switch (val.type()) {
case BooleanType:
@@ -418,3 +418,5 @@
}
return res;
}
+
+}
1.19.16.2 +7 -3 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.19.16.1
retrieving revision 1.19.16.2
diff -u -r1.19.16.1 -r1.19.16.2
--- kjs_css.cpp 24 May 2005 17:06:40 -0000 1.19.16.1
+++ kjs_css.cpp 22 Jul 2005 01:18:29 -0000 1.19.16.2
@@ -862,11 +862,15 @@
return Value();
}
-Value KJS::getCSSRuleConstructor(ExecState *exec)
+namespace KJS {
+
+Value getCSSRuleConstructor(ExecState *exec)
{
return cacheGlobalObject<CSSRuleConstructor>( exec, "[[cssRule.constructor]]" );
}
+}
+
// -------------------------------------------------------------------------
const ClassInfo DOMCSSValue::info = { "CSSValue", 0, &DOMCSSValueTable, 0 };
@@ -950,7 +954,7 @@
return Value();
}
-Value KJS::getCSSValueConstructor(ExecState *exec)
+Value getCSSValueConstructor(ExecState *exec)
{
return cacheGlobalObject<CSSValueConstructor>( exec, "[[cssValue.constructor]]" );
}
@@ -1065,7 +1069,7 @@
return Number(token);
}
-Value KJS::getCSSPrimitiveValueConstructor(ExecState *exec)
+Value getCSSPrimitiveValueConstructor(ExecState *exec)
{
return cacheGlobalObject<CSSPrimitiveValueConstructor>( exec, "[[cssPrimitiveValue.constructor]]" );
}
1.66.6.8 +1 -3 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.66.6.7
retrieving revision 1.66.6.8
diff -u -r1.66.6.7 -r1.66.6.8
--- kjs_dom.cpp 1 Jul 2005 22:36:03 -0000 1.66.6.7
+++ kjs_dom.cpp 22 Jul 2005 01:18:29 -0000 1.66.6.8
@@ -2010,9 +2010,7 @@
switch(id) {
case DOMText::SplitText:
return getDOMNode(exec,text.splitText(args[0].toInt32(exec)));
- break;
- default:
- return Undefined();
}
+ return Undefined();
}
1.42.8.4 +7 -4 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.42.8.3
retrieving revision 1.42.8.4
diff -u -r1.42.8.3 -r1.42.8.4
--- kjs_events.cpp 24 May 2005 17:06:41 -0000 1.42.8.3
+++ kjs_events.cpp 22 Jul 2005 01:18:29 -0000 1.42.8.4
@@ -346,11 +346,15 @@
return Number(token);
}
-Value KJS::getEventConstructor(ExecState *exec)
+namespace KJS {
+
+Value getEventConstructor(ExecState *exec)
{
return cacheGlobalObject<EventConstructor>(exec, "[[event.constructor]]");
}
+}
+
// -------------------------------------------------------------------------
const ClassInfo DOMEvent::info = { "Event", 0, &DOMEventTable, 0 };
@@ -564,7 +568,7 @@
return Number(token);
}
-Value KJS::getEventExceptionConstructor(ExecState *exec)
+Value getEventExceptionConstructor(ExecState *exec)
{
return cacheGlobalObject<EventExceptionConstructor>(exec, "[[eventException.constructor]]");
}
@@ -907,7 +911,7 @@
return Number(token);
}
-Value KJS::getMutationEventConstructor(ExecState *exec)
+Value getMutationEventConstructor(ExecState *exec)
{
return cacheGlobalObject<MutationEventConstructor>(exec, "[[mutationEvent.constructor]]");
}
@@ -1251,4 +1255,3 @@
}
return Undefined();
}
-
1.108.6.3 +2 -2 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.108.6.2
retrieving revision 1.108.6.3
diff -u -r1.108.6.2 -r1.108.6.3
--- kjs_html.cpp 12 Jul 2005 00:45:43 -0000 1.108.6.2
+++ kjs_html.cpp 22 Jul 2005 01:18:29 -0000 1.108.6.3
@@ -4128,8 +4128,8 @@
return err;
}
- float w;
- float h;
+ float w = 0; // quiet incorrect gcc 4.0 warning
+ float h = 0; // quiet incorrect gcc 4.0 warning
QPixmap pixmap;
CGContextRef sourceContext = 0;
1.18.8.1 +10 -13 WebCore/khtml/ecma/kjs_proxy.cpp
Index: kjs_proxy.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_proxy.cpp,v
retrieving revision 1.18
retrieving revision 1.18.8.1
diff -u -r1.18 -r1.18.8.1
--- kjs_proxy.cpp 1 Mar 2005 22:42:40 -0000 1.18
+++ kjs_proxy.cpp 22 Jul 2005 01:18:30 -0000 1.18.8.1
@@ -124,24 +124,21 @@
// let's try to convert the return value
if (success && !comp.value().isNull())
return ValueToVariant( m_script->globalExec(), comp.value());
- else
- {
- if ( comp.complType() == Throw )
- {
- KJS::Interpreter::lock();
- UString errorMessage = comp.value().toString(m_script->globalExec());
- int lineNumber = comp.value().toObject(m_script->globalExec()).get(m_script->globalExec(), "line").toInt32(m_script->globalExec());
- UString sourceURL = comp.value().toObject(m_script->globalExec()).get(m_script->globalExec(), "sourceURL").toString(m_script->globalExec());
- KJS::Interpreter::unlock();
+
+ if ( comp.complType() == Throw ) {
+ KJS::Interpreter::lock();
+ UString errorMessage = comp.value().toString(m_script->globalExec());
+ int lineNumber = comp.value().toObject(m_script->globalExec()).get(m_script->globalExec(), "line").toInt32(m_script->globalExec());
+ UString sourceURL = comp.value().toObject(m_script->globalExec()).get(m_script->globalExec(), "sourceURL").toString(m_script->globalExec());
+ KJS::Interpreter::unlock();
#if APPLE_CHANGES
- KWQ(m_part)->addMessageToConsole(errorMessage.qstring(), lineNumber, sourceURL.qstring());
+ KWQ(m_part)->addMessageToConsole(errorMessage.qstring(), lineNumber, sourceURL.qstring());
#else
- kdWarning(6070) << "Script threw exception: " << errorMessage.qstring() << endl;
+ kdWarning(6070) << "Script threw exception: " << errorMessage.qstring() << endl;
#endif
- }
- return QVariant();
}
+ return QVariant();
}
void KJSProxyImpl::clear() {
1.8.18.2 +5 -1 WebCore/khtml/ecma/kjs_traversal.cpp
Index: kjs_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.cpp,v
retrieving revision 1.8.18.1
retrieving revision 1.8.18.2
diff -u -r1.8.18.1 -r1.8.18.2
--- kjs_traversal.cpp 24 May 2005 17:06:41 -0000 1.8.18.1
+++ kjs_traversal.cpp 22 Jul 2005 01:18:30 -0000 1.8.18.2
@@ -149,11 +149,15 @@
return Number(token);
}
-Value KJS::getNodeFilterConstructor(ExecState *exec)
+namespace KJS {
+
+Value getNodeFilterConstructor(ExecState *exec)
{
return cacheGlobalObject<NodeFilterConstructor>(exec, "[[nodeFilter.constructor]]");
}
+}
+
// -------------------------------------------------------------------------
const ClassInfo DOMNodeFilter::info = { "NodeFilter", 0, 0, 0 };
No revision
No revision
1.79.8.1 +9 -9 WebCore/khtml/editing/selection.cpp
Index: selection.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/selection.cpp,v
retrieving revision 1.79
retrieving revision 1.79.8.1
diff -u -r1.79 -r1.79.8.1
--- selection.cpp 14 Feb 2005 18:19:17 -0000 1.79
+++ selection.cpp 22 Jul 2005 01:18:31 -0000 1.79.8.1
@@ -1029,24 +1029,24 @@
Position pos = m_start;
Position upstream = pos.upstream();
Position downstream = pos.downstream();
- fprintf(stderr, "upstream: %s %p:%d\n", upstream.node()->nodeName().string().latin1(), upstream.node(), upstream.offset());
- fprintf(stderr, "pos: %s %p:%d\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
- fprintf(stderr, "downstream: %s %p:%d\n", downstream.node()->nodeName().string().latin1(), downstream.node(), downstream.offset());
+ fprintf(stderr, "upstream: %s %p:%ld\n", upstream.node()->nodeName().string().latin1(), upstream.node(), upstream.offset());
+ fprintf(stderr, "pos: %s %p:%ld\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "downstream: %s %p:%ld\n", downstream.node()->nodeName().string().latin1(), downstream.node(), downstream.offset());
}
else {
Position pos = m_start;
Position upstream = pos.upstream();
Position downstream = pos.downstream();
- fprintf(stderr, "upstream: %s %p:%d\n", upstream.node()->nodeName().string().latin1(), upstream.node(), upstream.offset());
- fprintf(stderr, "start: %s %p:%d\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
- fprintf(stderr, "downstream: %s %p:%d\n", downstream.node()->nodeName().string().latin1(), downstream.node(), downstream.offset());
+ fprintf(stderr, "upstream: %s %p:%ld\n", upstream.node()->nodeName().string().latin1(), upstream.node(), upstream.offset());
+ fprintf(stderr, "start: %s %p:%ld\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "downstream: %s %p:%ld\n", downstream.node()->nodeName().string().latin1(), downstream.node(), downstream.offset());
fprintf(stderr, "-----------------------------------\n");
pos = m_end;
upstream = pos.upstream();
downstream = pos.downstream();
- fprintf(stderr, "upstream: %s %p:%d\n", upstream.node()->nodeName().string().latin1(), upstream.node(), upstream.offset());
- fprintf(stderr, "end: %s %p:%d\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
- fprintf(stderr, "downstream: %s %p:%d\n", downstream.node()->nodeName().string().latin1(), downstream.node(), downstream.offset());
+ fprintf(stderr, "upstream: %s %p:%ld\n", upstream.node()->nodeName().string().latin1(), upstream.node(), upstream.offset());
+ fprintf(stderr, "end: %s %p:%ld\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "downstream: %s %p:%ld\n", downstream.node()->nodeName().string().latin1(), downstream.node(), downstream.offset());
fprintf(stderr, "-----------------------------------\n");
}
1.35.8.1 +1 -1 WebCore/khtml/editing/selection.h
Index: selection.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/selection.h,v
retrieving revision 1.35
retrieving revision 1.35.8.1
diff -u -r1.35 -r1.35.8.1
--- selection.h 10 Feb 2005 00:30:05 -0000 1.35
+++ selection.h 22 Jul 2005 01:18:31 -0000 1.35.8.1
@@ -114,7 +114,7 @@
void debugPosition() const;
void debugRenderer(khtml::RenderObject *r, bool selected) const;
- friend class KHTMLPart;
+ friend class ::KHTMLPart;
#ifndef NDEBUG
void formatForDebugger(char *buffer, unsigned length) const;
1.39.8.1 +1 -1 WebCore/khtml/editing/visible_position.cpp
Index: visible_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_position.cpp,v
retrieving revision 1.39
retrieving revision 1.39.8.1
diff -u -r1.39 -r1.39.8.1
--- visible_position.cpp 19 Mar 2005 22:36:50 -0000 1.39
+++ visible_position.cpp 22 Jul 2005 01:18:32 -0000 1.39.8.1
@@ -444,7 +444,7 @@
if (isNull())
fprintf(stderr, "Position [%s]: null\n", msg);
else
- fprintf(stderr, "Position [%s]: %s [%p] at %d\n", msg, m_deepPosition.node()->nodeName().string().latin1(), m_deepPosition.node(), m_deepPosition.offset());
+ fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, m_deepPosition.node()->nodeName().string().latin1(), m_deepPosition.node(), m_deepPosition.offset());
}
#ifndef NDEBUG
No revision
No revision
1.67.8.2 +1 -0 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.67.8.1
retrieving revision 1.67.8.2
diff -u -r1.67.8.1 -r1.67.8.2
--- loader.cpp 31 May 2005 16:57:08 -0000 1.67.8.1
+++ loader.cpp 22 Jul 2005 01:18:32 -0000 1.67.8.2
@@ -2550,6 +2550,7 @@
// --------------------------------------
+CachedObjectClient::~CachedObjectClient() { }
void CachedObjectClient::setPixmap(const QPixmap &, const QRect&, CachedImage *) {}
void CachedObjectClient::setStyleSheet(const DOM::DOMString &/*url*/, const DOM::DOMString &/*sheet*/) {}
#ifndef KHTML_NO_XBL
1.5.18.1 +2 -0 WebCore/khtml/misc/loader_client.h
Index: loader_client.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader_client.h,v
retrieving revision 1.5
retrieving revision 1.5.18.1
diff -u -r1.5 -r1.5.18.1
--- loader_client.h 23 Jan 2004 01:53:12 -0000 1.5
+++ loader_client.h 22 Jul 2005 01:18:32 -0000 1.5.18.1
@@ -25,6 +25,8 @@
class CachedObjectClient
{
public:
+ virtual ~CachedObjectClient();
+
// clipped pixmap (if it is not yet completely loaded,
// size of the complete (finished loading) pixmap
// rectangle of the part that has been loaded very recently
No revision
No revision
1.179.8.2 +2 -1 WebCore/khtml/rendering/render_block.cpp
Index: render_block.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_block.cpp,v
retrieving revision 1.179.8.1
retrieving revision 1.179.8.2
diff -u -r1.179.8.1 -r1.179.8.2
--- render_block.cpp 12 Jul 2005 21:06:03 -0000 1.179.8.1
+++ render_block.cpp 22 Jul 2005 01:18:33 -0000 1.179.8.2
@@ -1535,7 +1535,8 @@
if (curr->isRelPositioned() && curr->layer()) {
// If the relposition offset is anything other than 0, then treat this just like an absolute positioned element.
// Just disregard it completely.
- int x, y;
+ int x = 0;
+ int y = 0;
curr->layer()->relativePositionOffset(x, y);
if (x || y)
continue;
No revision
No revision
1.140.8.4 +1 -0 WebCore/khtml/xml/dom_nodeimpl.cpp
Index: dom_nodeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
retrieving revision 1.140.8.3
retrieving revision 1.140.8.4
diff -u -r1.140.8.3 -r1.140.8.4
--- dom_nodeimpl.cpp 12 Jul 2005 21:16:36 -0000 1.140.8.3
+++ dom_nodeimpl.cpp 22 Jul 2005 01:18:34 -0000 1.140.8.4
@@ -1967,6 +1967,7 @@
{
exceptioncode = 0;
DocumentImpl *ownerDocThis = getDocument();
+ // FIXME: Doh! This next line isn't getting newChild, so it's never going to work!
DocumentImpl *ownerDocNew = getDocument();
if(ownerDocThis != ownerDocNew) {
kdDebug(6010)<< "not same document, newChild = " << newChild << "document = " << getDocument() << endl;
1.65.8.1 +1 -1 WebCore/khtml/xml/dom_position.cpp
Index: dom_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_position.cpp,v
retrieving revision 1.65
retrieving revision 1.65.8.1
diff -u -r1.65 -r1.65.8.1
--- dom_position.cpp 19 Mar 2005 22:36:50 -0000 1.65
+++ dom_position.cpp 22 Jul 2005 01:18:34 -0000 1.65.8.1
@@ -665,7 +665,7 @@
if (isNull())
fprintf(stderr, "Position [%s]: null\n", msg);
else
- fprintf(stderr, "Position [%s]: %s [%p] at %d\n", msg, node()->nodeName().string().latin1(), node(), offset());
+ fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, node()->nodeName().string().latin1(), node(), offset());
}
#ifndef NDEBUG
No revision
No revision
1.20.8.1 +9 -0 WebCore/kwq/DOM-CSS.mm
Index: DOM-CSS.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM-CSS.mm,v
retrieving revision 1.20
retrieving revision 1.20.8.1
diff -u -r1.20 -r1.20.8.1
--- DOM-CSS.mm 20 Jan 2005 18:05:19 -0000 1.20
+++ DOM-CSS.mm 22 Jul 2005 01:18:34 -0000 1.20.8.1
@@ -83,6 +83,10 @@
+ (DOMCSSValue *)_valueWithImpl:(CSSValueImpl *)impl;
@end
+ at interface DOMCSSPrimitiveValue (WebCoreInternal)
++ (DOMCSSPrimitiveValue *)_valueWithImpl:(CSSValueImpl *)impl;
+ at end
+
@interface DOMRGBColor (WebCoreInternal)
+ (DOMRGBColor *)_RGBColorWithRGB:(QRgb)value;
@end
@@ -978,6 +982,11 @@
@implementation DOMCSSPrimitiveValue
++ (DOMCSSPrimitiveValue *)_valueWithImpl:(CSSValueImpl *)impl
+{
+ return (DOMCSSPrimitiveValue *)([DOMCSSValue _valueWithImpl: impl]);
+}
+
- (CSSPrimitiveValueImpl *)_primitiveValueImpl
{
return static_cast<CSSPrimitiveValueImpl *>(DOM_cast<CSSValueImpl *>(_internal));
1.3.16.1 +1 -1 WebCore/kwq/DOMEvents.h
Index: DOMEvents.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMEvents.h,v
retrieving revision 1.3
retrieving revision 1.3.16.1
diff -u -r1.3 -r1.3.16.1
--- DOMEvents.h 14 May 2004 17:27:43 -0000 1.3
+++ DOMEvents.h 22 Jul 2005 01:18:34 -0000 1.3.16.1
@@ -37,7 +37,7 @@
- (void)handleEvent:(DOMEvent *)event;
@end
- at protocol DOMEventTarget <NSObject>
+ at protocol DOMEventTarget <NSObject, NSCopying>
- (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
- (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
- (BOOL)dispatchEvent:(DOMEvent *)event;
1.3.16.1 +2 -1 WebCore/kwq/DOMEvents.mm
Index: DOMEvents.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMEvents.mm,v
retrieving revision 1.3
retrieving revision 1.3.16.1
diff -u -r1.3 -r1.3.16.1
--- DOMEvents.mm 23 May 2004 22:45:28 -0000 1.3
+++ DOMEvents.mm 22 Jul 2005 01:18:35 -0000 1.3.16.1
@@ -198,10 +198,11 @@
- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg
{
+ DOMNode *relatedTarget = relatedTargetArg;
[self _mouseEventImpl]->initMouseEvent(typeArg, canBubbleArg, cancelableArg,
[viewArg _abstractViewImpl], detailArg, screenXArg, screenYArg, clientX, clientY,
shiftKeyArg, ctrlKeyArg, altKeyArg, metaKeyArg, buttonArg,
- [static_cast<DOMNode *>(relatedTargetArg) _nodeImpl]);
+ [relatedTarget _nodeImpl]);
}
@end
1.17.8.1 +1 -1 WebCore/kwq/DOMInternal.h
Index: DOMInternal.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMInternal.h,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- DOMInternal.h 27 Jan 2005 19:24:09 -0000 1.17
+++ DOMInternal.h 22 Jul 2005 01:18:35 -0000 1.17.8.1
@@ -110,7 +110,7 @@
void addDOMWrapperImpl(id wrapper, DOMObjectInternal *impl);
template <class Source> inline id getDOMWrapper(Source impl) { return getDOMWrapperImpl(DOM_cast<DOMObjectInternal *>(impl)); }
-template <class Source> inline void addDOMWrapper(id wrapper, Source impl) { addDOMWrapperImpl(wrapper, DOM_cast<DOMObjectInternal *>(impl)); }
+template <class Source> inline void addDOMWrapper(NSObject * wrapper, Source impl) { addDOMWrapperImpl(wrapper, DOM_cast<DOMObjectInternal *>(impl)); }
void removeDOMWrapper(DOMObjectInternal *impl);
void raiseDOMException(int code);
1.1.8.1 +13 -5 WebCore/kwq/DOMUtility.mm
Index: DOMUtility.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMUtility.mm,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -r1.1 -r1.1.8.1
--- DOMUtility.mm 12 Feb 2005 00:58:12 -0000 1.1
+++ DOMUtility.mm 22 Jul 2005 01:18:35 -0000 1.1.8.1
@@ -33,14 +33,21 @@
// This file makes use of the ObjC DOM API, and the C++ DOM API, so we need to be careful about what
// headers are included to avoid naming conflicts.
-void *KJS::ScriptInterpreter::createObjcInstanceForValue (ExecState *exec, const Object &value, const KJS::Bindings::RootObject *origin, const KJS::Bindings::RootObject *current)
+inline id createObjCDOMNode(DOM::NodeImpl *node)
{
- if (value.inherits(&KJS::DOMNode::info)) {
- KJS::DOMNode *imp = static_cast<KJS::DOMNode *>(value.imp());
+ return [DOMNode _nodeWithImpl:node];
+}
+
+namespace KJS {
+
+void *ScriptInterpreter::createObjcInstanceForValue (ExecState *exec, const Object &value, const Bindings::RootObject *origin, const Bindings::RootObject *current)
+{
+ if (value.inherits(&DOMNode::info)) {
+ DOMNode *imp = static_cast<DOMNode *>(value.imp());
DOM::Node node = imp->toNode();
- id newObjcNode = [DOMNode _nodeWithImpl:node.handle()];
- KJS::ObjectImp *scriptImp = static_cast<KJS::ObjectImp *>(KJS::getDOMNode (exec, node).imp());
+ id newObjcNode = createObjCDOMNode(node.handle());
+ ObjectImp *scriptImp = static_cast<ObjectImp *>(getDOMNode(exec, node).imp());
[newObjcNode _initializeWithObjectImp:scriptImp originExecutionContext:origin executionContext:current];
@@ -49,3 +56,4 @@
return 0;
}
+}
1.40.8.1 +1 -1 WebCore/kwq/KWQButton.mm
Index: KWQButton.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQButton.mm,v
retrieving revision 1.40
retrieving revision 1.40.8.1
diff -u -r1.40 -r1.40.8.1
--- KWQButton.mm 19 Mar 2005 00:34:07 -0000 1.40
+++ KWQButton.mm 22 Jul 2005 01:18:35 -0000 1.40.8.1
@@ -364,7 +364,7 @@
{
KWQ_BLOCK_EXCEPTIONS;
- KWQButton *button = getView();
+ KWQButton *button = static_cast<KWQButton *>(getView());
KWQButtonCell *cell = [button cell];
NSWritingDirection d = direction == QPainter::RTL ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
if ([cell baseWritingDirection] != d) {
1.13.12.2 +2 -1 WebCore/kwq/KWQClipboard.mm
Index: KWQClipboard.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQClipboard.mm,v
retrieving revision 1.13.12.1
retrieving revision 1.13.12.2
diff -u -r1.13.12.1 -r1.13.12.2
--- KWQClipboard.mm 24 May 2005 00:52:42 -0000 1.13.12.1
+++ KWQClipboard.mm 22 Jul 2005 01:18:35 -0000 1.13.12.2
@@ -29,6 +29,7 @@
#import "KWQKHTMLPart.h"
#import "KWQStringList.h"
#import "WebCoreGraphicsBridge.h"
+#import "WebCoreImageRenderer.h"
#import <AppKit/AppKit.h>
@@ -342,7 +343,7 @@
}
}
} else {
- result = m_dragImage.image();
+ result = (NSImage *)(m_dragImage.image());
if (loc) {
*loc = NSPoint(m_dragLoc);
loc->y = [result size].height - loc->y;
1.59.10.1 +2 -2 WebCore/kwq/KWQComboBox.mm
Index: KWQComboBox.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQComboBox.mm,v
retrieving revision 1.59
retrieving revision 1.59.10.1
diff -u -r1.59 -r1.59.10.1
--- KWQComboBox.mm 30 Nov 2004 21:08:49 -0000 1.59
+++ KWQComboBox.mm 22 Jul 2005 01:18:35 -0000 1.59.10.1
@@ -339,7 +339,7 @@
{
KWQ_BLOCK_EXCEPTIONS;
- KWQPopUpButton *button = getView();
+ KWQPopUpButton *button = static_cast<KWQPopUpButton *>(getView());
KWQPopUpButtonCell *cell = [button cell];
NSWritingDirection d = direction == QPainter::RTL ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
if ([cell baseWritingDirection] != d) {
@@ -355,7 +355,7 @@
if (!_menuPopulated) {
KWQ_BLOCK_EXCEPTIONS;
- KWQPopUpButton *button = getView();
+ KWQPopUpButton *button = static_cast<KWQPopUpButton *>(getView());
[button setPopulatingMenu:YES];
[button removeAllItems];
QValueListConstIterator<KWQListBoxItem> i = const_cast<const QValueList<KWQListBoxItem> &>(_items).begin();
1.12.16.1 +2 -1 WebCore/kwq/KWQCursor.h
Index: KWQCursor.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQCursor.h,v
retrieving revision 1.12
retrieving revision 1.12.16.1
diff -u -r1.12 -r1.12.16.1
--- KWQCursor.h 23 May 2004 22:45:28 -0000 1.12
+++ KWQCursor.h 22 Jul 2005 01:18:35 -0000 1.12.16.1
@@ -39,9 +39,10 @@
public:
QCursor();
QCursor(const QPixmap &);
- QCursor(NSCursor *);
QCursor(const QCursor &);
~QCursor();
+
+ static QCursor makeWithNSCursor(NSCursor *);
QCursor &operator=(const QCursor &);
1.21.16.1 +7 -5 WebCore/kwq/KWQCursor.mm
Index: KWQCursor.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQCursor.mm,v
retrieving revision 1.21
retrieving revision 1.21.16.1
diff -u -r1.21 -r1.21.16.1
--- KWQCursor.mm 15 Jun 2004 05:33:44 -0000 1.21
+++ KWQCursor.mm 22 Jul 2005 01:18:35 -0000 1.21.16.1
@@ -34,11 +34,6 @@
{
}
-QCursor::QCursor(NSCursor *cur)
- : cursor(KWQRetain(cur))
-{
-}
-
QCursor::QCursor(const QPixmap &pixmap)
: cursor(nil)
{
@@ -55,6 +50,13 @@
{
KWQRelease(cursor);
}
+
+QCursor QCursor::makeWithNSCursor(NSCursor * c)
+{
+ QCursor q;
+ q.cursor = KWQRetain(c);
+ return q;
+}
QCursor &QCursor::operator=(const QCursor &other)
{
1.26.8.1 +1 -0 WebCore/kwq/KWQFileButton.mm
Index: KWQFileButton.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQFileButton.mm,v
retrieving revision 1.26
retrieving revision 1.26.8.1
diff -u -r1.26 -r1.26.8.1
--- KWQFileButton.mm 19 Mar 2005 00:34:07 -0000 1.26
+++ KWQFileButton.mm 22 Jul 2005 01:18:35 -0000 1.26.8.1
@@ -34,6 +34,7 @@
@interface KWQFileButtonAdapter : NSObject <WebCoreFileButtonDelegate>
{
+ at public
KWQFileButton *button;
}
1.16.28.1 +14 -14 WebCore/kwq/KWQKCursor.mm
Index: KWQKCursor.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKCursor.mm,v
retrieving revision 1.16
retrieving revision 1.16.28.1
diff -u -r1.16 -r1.16.28.1
--- KWQKCursor.mm 27 Oct 2003 20:51:25 -0000 1.16
+++ KWQKCursor.mm 22 Jul 2005 01:18:35 -0000 1.16.28.1
@@ -73,22 +73,22 @@
void KCursor::setAutoHideCursor(QWidget *w, bool enable) {}
QCursor KCursor::arrowCursor() { return QCursor(); }
-QCursor KCursor::crossCursor() { return QCursor([NSCursor crosshairCursor]); }
-QCursor KCursor::handCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"linkCursor" hotSpot:NSMakePoint(6.0, 1.0)]); }
-QCursor KCursor::sizeAllCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"moveCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
+QCursor KCursor::crossCursor() { return QCursor::makeWithNSCursor([NSCursor crosshairCursor]); }
+QCursor KCursor::handCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"linkCursor" hotSpot:NSMakePoint(6.0, 1.0)]); }
+QCursor KCursor::sizeAllCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"moveCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
QCursor KCursor::sizeHorCursor() { return QCursor(); }
QCursor KCursor::sizeVerCursor() { return QCursor(); }
QCursor KCursor::sizeBDiagCursor() { return QCursor(); }
QCursor KCursor::sizeFDiagCursor() { return QCursor(); }
-QCursor KCursor::ibeamCursor() { return QCursor([NSCursor IBeamCursor]); }
-QCursor KCursor::waitCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"waitCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
-QCursor KCursor::whatsThisCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"helpCursor" hotSpot:NSMakePoint(8.0, 8.0)]); }
+QCursor KCursor::ibeamCursor() { return QCursor::makeWithNSCursor([NSCursor IBeamCursor]); }
+QCursor KCursor::waitCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"waitCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
+QCursor KCursor::whatsThisCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"helpCursor" hotSpot:NSMakePoint(8.0, 8.0)]); }
-QCursor KCursor::eastResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"eastResizeCursor" hotSpot:NSMakePoint(14.0, 7.0)]); }
-QCursor KCursor::northResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"northResizeCursor" hotSpot:NSMakePoint(7.0, 1.0)]); }
-QCursor KCursor::northEastResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"northEastResizeCursor" hotSpot:NSMakePoint(14.0, 1.0)]); }
-QCursor KCursor::northWestResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"northWestResizeCursor" hotSpot:NSMakePoint(0.0, 0.0)]); }
-QCursor KCursor::southResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"southResizeCursor" hotSpot:NSMakePoint(7.0, 14.0)]); }
-QCursor KCursor::southEastResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"southEastResizeCursor" hotSpot:NSMakePoint(14.0, 14.0)]); }
-QCursor KCursor::southWestResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"southWestResizeCursor" hotSpot:NSMakePoint(1.0, 14.0)]); }
-QCursor KCursor::westResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"westResizeCursor" hotSpot:NSMakePoint(1.0, 7.0)]); }
+QCursor KCursor::eastResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"eastResizeCursor" hotSpot:NSMakePoint(14.0, 7.0)]); }
+QCursor KCursor::northResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"northResizeCursor" hotSpot:NSMakePoint(7.0, 1.0)]); }
+QCursor KCursor::northEastResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"northEastResizeCursor" hotSpot:NSMakePoint(14.0, 1.0)]); }
+QCursor KCursor::northWestResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"northWestResizeCursor" hotSpot:NSMakePoint(0.0, 0.0)]); }
+QCursor KCursor::southResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"southResizeCursor" hotSpot:NSMakePoint(7.0, 14.0)]); }
+QCursor KCursor::southEastResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"southEastResizeCursor" hotSpot:NSMakePoint(14.0, 14.0)]); }
+QCursor KCursor::southWestResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"southWestResizeCursor" hotSpot:NSMakePoint(1.0, 14.0)]); }
+QCursor KCursor::westResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"westResizeCursor" hotSpot:NSMakePoint(1.0, 7.0)]); }
1.628.6.2 +12 -10 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.628.6.1
retrieving revision 1.628.6.2
diff -u -r1.628.6.1 -r1.628.6.2
--- KWQKHTMLPart.mm 27 Apr 2005 00:58:15 -0000 1.628.6.1
+++ KWQKHTMLPart.mm 22 Jul 2005 01:18:35 -0000 1.628.6.2
@@ -44,6 +44,7 @@
#import "WebCoreBridge.h"
#import "WebCoreGraphicsBridge.h"
+#import "WebCoreImageRenderer.h"
#import "WebCoreViewFactory.h"
#import "WebDashboardRegion.h"
@@ -428,7 +429,7 @@
unsigned int numLabels = [labels count];
unsigned int i;
for (i = 0; i < numLabels; i++) {
- QString label = QString::fromNSString([labels objectAtIndex:i]);
+ QString label = QString::fromNSString((NSString *)[labels objectAtIndex:i]);
bool startsWithWordChar = false;
bool endsWithWordChar = false;
@@ -594,9 +595,8 @@
if (bestPos != -1) {
return name.mid(bestPos, bestLength).getNSString();
- } else {
- return nil;
}
+ return nil;
}
// Search from the end of the currently selected location if we are first responder, or from
@@ -2095,7 +2095,7 @@
superview = [superview superview];
ASSERT(superview);
if ([superview isKindOfClass:[NSControl class]]) {
- NSControl *control = superview;
+ NSControl *control = static_cast<NSControl *>(superview);
if ([control currentEditor] == view) {
view = superview;
}
@@ -2851,7 +2851,7 @@
}
if (!wrapper) {
RenderImage *renderer = static_cast<RenderImage *>(e->renderer());
- NSImage *image = renderer->pixmap().image();
+ NSImage * image = (NSImage *)(renderer->pixmap().image());
NSData *tiffData = [image TIFFRepresentationUsingCompression:NSTIFFCompressionLZW factor:0.0];
wrapper = [[NSFileWrapper alloc] initRegularFileWithContents:tiffData];
[wrapper setPreferredFilename:@"image.tiff"];
@@ -3401,11 +3401,11 @@
return nil;
}
- NSRect bounds = [view bounds];
- NSImage *resultImage = [[[NSImage alloc] initWithSize:rect.size] autorelease];
-
KWQ_BLOCK_EXCEPTIONS;
+ NSRect bounds = [view bounds];
+ NSImage *resultImage = [[[NSImage alloc] initWithSize:rect.size] autorelease];
+
if (rect.size.width != 0 && rect.size.height != 0) {
[resultImage setFlipped:YES];
[resultImage lockFocus];
@@ -3432,10 +3432,12 @@
[resultImage unlockFocus];
[resultImage setFlipped:NO];
}
-
+
+ return resultImage;
+
KWQ_UNBLOCK_EXCEPTIONS;
- return resultImage;
+ return nil;
}
NSImage *KWQKHTMLPart::selectionImage() const
1.27.8.1 +1 -1 WebCore/kwq/KWQKJavaAppletWidget.mm
Index: KWQKJavaAppletWidget.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKJavaAppletWidget.mm,v
retrieving revision 1.27
retrieving revision 1.27.8.1
diff -u -r1.27 -r1.27.8.1
--- KWQKJavaAppletWidget.mm 6 Feb 2005 20:19:56 -0000 1.27
+++ KWQKJavaAppletWidget.mm 22 Jul 2005 01:18:35 -0000 1.27.8.1
@@ -26,7 +26,7 @@
#import "KWQKJavaAppletWidget.h"
#import "dom_docimpl.h"
-#import "KHTMLView.h"
+#import "khtmlview.h"
#import "KWQExceptions.h"
#import "KWQKJavaAppletContext.h"
#import "WebCoreBridge.h"
1.46.10.1 +2 -2 WebCore/kwq/KWQKJobClasses.mm
Index: KWQKJobClasses.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKJobClasses.mm,v
retrieving revision 1.46
retrieving revision 1.46.10.1
diff -u -r1.46 -r1.46.10.1
--- KWQKJobClasses.mm 9 Dec 2004 18:57:20 -0000 1.46
+++ KWQKJobClasses.mm 22 Jul 2005 01:18:36 -0000 1.46.10.1
@@ -234,7 +234,7 @@
void TransferJob::emitResult(NSData *allData)
{
- m_deliverAllData ? m_result.call(this, allData) : m_result.call(this);
+ m_deliverAllData ? m_result.callWithData(this, allData) : m_result.call(this);
}
void TransferJob::emitReceivedResponse(NSURLResponse *response)
@@ -244,7 +244,7 @@
d->response = response;
KWQRetain(d->response);
- m_receivedResponse.call(this, response);
+ m_receivedResponse.callWithResponse(this, response);
}
} // namespace KIO
1.65.8.1 +1 -1 WebCore/kwq/KWQLineEdit.mm
Index: KWQLineEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLineEdit.mm,v
retrieving revision 1.65
retrieving revision 1.65.8.1
diff -u -r1.65 -r1.65.8.1
--- KWQLineEdit.mm 28 Jan 2005 01:16:20 -0000 1.65
+++ KWQLineEdit.mm 22 Jul 2005 01:18:36 -0000 1.65.8.1
@@ -62,7 +62,7 @@
ASSERT(view);
[view initWithQLineEdit:this];
m_controller = [view controller];
- setView(view);
+ setView((NSView *)view);
[view release];
[view setSelectable:YES]; // must do this explicitly so setEditable:NO does not make it NO
KWQ_UNBLOCK_EXCEPTIONS;
1.51.8.1 +8 -8 WebCore/kwq/KWQListBox.mm
Index: KWQListBox.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQListBox.mm,v
retrieving revision 1.51
retrieving revision 1.51.8.1
diff -u -r1.51 -r1.51.8.1
--- KWQListBox.mm 3 Mar 2005 00:58:35 -0000 1.51
+++ KWQListBox.mm 22 Jul 2005 01:18:36 -0000 1.51.8.1
@@ -156,7 +156,7 @@
QListBox::~QListBox()
{
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
KWQ_BLOCK_EXCEPTIONS;
KWQTableView *tableView = [scrollView documentView];
@@ -172,7 +172,7 @@
void QListBox::setSelectionMode(SelectionMode mode)
{
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
KWQ_BLOCK_EXCEPTIONS;
NSTableView *tableView = [scrollView documentView];
@@ -190,7 +190,7 @@
{
KWQ_BLOCK_EXCEPTIONS;
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
NSTableView *tableView = [scrollView documentView];
[tableView reloadData];
@@ -203,7 +203,7 @@
KWQ_BLOCK_EXCEPTIONS;
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
NSTableView *tableView = [scrollView documentView];
_changingSelection = true;
if (selectIt) {
@@ -224,7 +224,7 @@
KWQ_BLOCK_EXCEPTIONS;
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
NSTableView *tableView = [scrollView documentView];
return [tableView isRowSelected:index];
@@ -244,7 +244,7 @@
_enabled = enabled;
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
NSTableView *tableView = [scrollView documentView];
[tableView reloadData];
}
@@ -261,7 +261,7 @@
KWQ_BLOCK_EXCEPTIONS;
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
KWQTableView *tableView = [scrollView documentView];
if (!_widthGood) {
@@ -323,7 +323,7 @@
{
KWQ_BLOCK_EXCEPTIONS;
- NSScrollView *scrollView = getView();
+ NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
KWQTableView *tableView = [scrollView documentView];
NSWritingDirection direction = d == QPainter::RTL ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
if ([tableView baseWritingDirection] != direction) {
1.44.8.1 +1 -0 WebCore/kwq/KWQObject.mm
Index: KWQObject.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQObject.mm,v
retrieving revision 1.44
retrieving revision 1.44.8.1
diff -u -r1.44 -r1.44.8.1
--- KWQObject.mm 14 Dec 2004 00:10:18 -0000 1.44
+++ KWQObject.mm 22 Jul 2005 01:18:36 -0000 1.44.8.1
@@ -42,6 +42,7 @@
@interface KWQObjectTimerTarget : NSObject
{
+ at public
QObject *target;
int timerId;
NSTimeInterval remainingTime;
1.80.8.1 +2 -4 WebCore/kwq/KWQScrollView.mm
Index: KWQScrollView.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQScrollView.mm,v
retrieving revision 1.80
retrieving revision 1.80.8.1
diff -u -r1.80 -r1.80.8.1
--- KWQScrollView.mm 14 Dec 2004 00:10:18 -0000 1.80
+++ KWQScrollView.mm 22 Jul 2005 01:18:36 -0000 1.80.8.1
@@ -131,8 +131,7 @@
KWQ_BLOCK_EXCEPTIONS;
if ([view _KWQ_isScrollView]) {
- NSScrollView *sview = view;
- return (int)[sview documentVisibleRect].origin.x;
+ return (int)[(NSScrollView *)view documentVisibleRect].origin.x;
} else {
return (int)[view visibleRect].origin.x;
}
@@ -147,8 +146,7 @@
KWQ_BLOCK_EXCEPTIONS;
if ([view _KWQ_isScrollView]) {
- NSScrollView *sview = view;
- return (int)[sview documentVisibleRect].origin.y;
+ return (int)[(NSScrollView *)view documentVisibleRect].origin.y;
} else {
return (int)[view visibleRect].origin.y;
}
1.15.10.1 +2 -2 WebCore/kwq/KWQSignal.h
Index: KWQSignal.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSignal.h,v
retrieving revision 1.15
retrieving revision 1.15.10.1
diff -u -r1.15 -r1.15.10.1
--- KWQSignal.h 4 Dec 2004 18:37:31 -0000 1.15
+++ KWQSignal.h 22 Jul 2005 01:18:36 -0000 1.15.10.1
@@ -45,8 +45,8 @@
void call(khtml::DocLoader *, khtml::CachedObject *) const;
void call(KIO::Job *, const char *data, int size) const;
void call(KIO::Job *, const KURL &) const;
- void call(KIO::Job *, NSData *) const;
- void call(KIO::Job *, NSURLResponse *) const;
+ void callWithData(KIO::Job *, NSData *) const;
+ void callWithResponse(KIO::Job *, NSURLResponse *) const;
private:
// forbid copying and assignment
1.18.10.1 +4 -4 WebCore/kwq/KWQSignal.mm
Index: KWQSignal.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSignal.mm,v
retrieving revision 1.18
retrieving revision 1.18.10.1
diff -u -r1.18 -r1.18.10.1
--- KWQSignal.mm 4 Dec 2004 18:37:31 -0000 1.18
+++ KWQSignal.mm 22 Jul 2005 01:18:36 -0000 1.18.10.1
@@ -173,26 +173,26 @@
}
}
-void KWQSignal::call(Job *j, NSData *d) const
+void KWQSignal::callWithData(Job *j, NSData *d) const
{
if (!_object->_signalsBlocked) {
KWQObjectSenderScope senderScope(_object);
QValueList<KWQSlot> copiedSlots(_slots);
QValueListConstIterator<KWQSlot> end = copiedSlots.end();
for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
- (*it).call(j, d);
+ (*it).callWithData(j, d);
}
}
}
-void KWQSignal::call(Job *j, NSURLResponse *r) const
+void KWQSignal::callWithResponse(Job *j, NSURLResponse *r) const
{
if (!_object->_signalsBlocked) {
KWQObjectSenderScope senderScope(_object);
QValueList<KWQSlot> copiedSlots(_slots);
QValueListConstIterator<KWQSlot> end = copiedSlots.end();
for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
- (*it).call(j, r);
+ (*it).callWithResponse(j, r);
}
}
}
1.13.10.1 +2 -2 WebCore/kwq/KWQSlot.h
Index: KWQSlot.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSlot.h,v
retrieving revision 1.13
retrieving revision 1.13.10.1
diff -u -r1.13 -r1.13.10.1
--- KWQSlot.h 4 Dec 2004 18:37:31 -0000 1.13
+++ KWQSlot.h 22 Jul 2005 01:18:36 -0000 1.13.10.1
@@ -67,8 +67,8 @@
void call(khtml::DocLoader *, khtml::CachedObject *) const;
void call(KIO::Job *, const char *, int) const;
void call(KIO::Job *, const KURL &) const;
- void call(KIO::Job *, NSData *) const;
- void call(KIO::Job *, NSURLResponse *) const;
+ void callWithData(KIO::Job *, NSData *) const;
+ void callWithResponse(KIO::Job *, NSURLResponse *) const;
friend bool operator==(const KWQSlot &, const KWQSlot &);
1.27.8.1 +2 -2 WebCore/kwq/KWQSlot.mm
Index: KWQSlot.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSlot.mm,v
retrieving revision 1.27
retrieving revision 1.27.8.1
diff -u -r1.27 -r1.27.8.1
--- KWQSlot.mm 14 Dec 2004 00:10:18 -0000 1.27
+++ KWQSlot.mm 22 Jul 2005 01:18:36 -0000 1.27.8.1
@@ -317,7 +317,7 @@
call();
}
-void KWQSlot::call(KIO::Job *job, NSData *allData) const
+void KWQSlot::callWithData(KIO::Job *job, NSData *allData) const
{
if (m_object.isNull()) {
return;
@@ -332,7 +332,7 @@
call(job);
}
-void KWQSlot::call(KIO::Job *job, NSURLResponse *response) const
+void KWQSlot::callWithResponse(KIO::Job *job, NSURLResponse *response) const
{
if (m_object.isNull()) {
return;
1.72.8.2 +5 -5 WebCore/kwq/KWQTextArea.mm
Index: KWQTextArea.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextArea.mm,v
retrieving revision 1.72.8.1
retrieving revision 1.72.8.2
diff -u -r1.72.8.1 -r1.72.8.2
--- KWQTextArea.mm 12 Jul 2005 20:26:07 -0000 1.72.8.1
+++ KWQTextArea.mm 22 Jul 2005 01:18:36 -0000 1.72.8.2
@@ -348,12 +348,12 @@
}
if (paragraphSoFar < paragraph) {
- return NSMakeRange(NSNotFound, 0);
- } else if (searchRange.location == NSNotFound || newlineRange.location == NSNotFound) {
- return searchRange;
- } else {
- return NSMakeRange(searchRange.location, newlineRange.location - searchRange.location);
+ return NSMakeRange(NSNotFound, 0);
+ }
+ if (searchRange.location == NSNotFound || newlineRange.location == NSNotFound) {
+ return searchRange;
}
+ return NSMakeRange(searchRange.location, newlineRange.location - searchRange.location);
}
- (void)setCursorPositionToIndex:(int)index inParagraph:(int)paragraph
1.44.8.1 +4 -4 WebCore/kwq/KWQTextEdit.mm
Index: KWQTextEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.mm,v
retrieving revision 1.44
retrieving revision 1.44.8.1
diff -u -r1.44 -r1.44.8.1
--- KWQTextEdit.mm 21 Feb 2005 21:55:42 -0000 1.44
+++ KWQTextEdit.mm 22 Jul 2005 01:18:36 -0000 1.44.8.1
@@ -213,7 +213,7 @@
{
KWQ_BLOCK_EXCEPTIONS;
- KWQTextArea *textArea = getView();
+ KWQTextArea *textArea = static_cast<KWQTextArea *>(getView());
[textArea setAlignment:KWQNSTextAlignmentForAlignmentFlags(alignment)];
KWQ_UNBLOCK_EXCEPTIONS;
@@ -223,7 +223,7 @@
{
KWQ_BLOCK_EXCEPTIONS;
- KWQTextArea *textArea = getView();
+ KWQTextArea *textArea = static_cast<KWQTextArea *>(getView());
[textArea setBaseWritingDirection:(direction == QPainter::RTL ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight)];
KWQ_UNBLOCK_EXCEPTIONS;
@@ -231,7 +231,7 @@
QSize QTextEdit::sizeWithColumnsAndRows(int numColumns, int numRows) const
{
- KWQTextArea *textArea = getView();
+ KWQTextArea *textArea = static_cast<KWQTextArea *>(getView());
NSSize size = {0,0};
KWQ_BLOCK_EXCEPTIONS;
@@ -256,7 +256,7 @@
{
QWidget::setPalette(palette);
- KWQTextArea *textArea = getView();
+ KWQTextArea *textArea = static_cast<KWQTextArea *>(getView());
KWQ_BLOCK_EXCEPTIONS;
1.106.8.1 +2 -2 WebCore/kwq/KWQWidget.mm
Index: KWQWidget.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQWidget.mm,v
retrieving revision 1.106
retrieving revision 1.106.8.1
diff -u -r1.106 -r1.106.8.1
--- KWQWidget.mm 17 Mar 2005 02:46:53 -0000 1.106
+++ KWQWidget.mm 22 Jul 2005 01:18:36 -0000 1.106.8.1
@@ -211,7 +211,7 @@
NSView *view = [getView() _webcore_effectiveFirstResponder];
- NSView *firstResponder = [KWQKHTMLPart::bridgeForWidget(this) firstResponder];
+ id firstResponder = [KWQKHTMLPart::bridgeForWidget(this) firstResponder];
if (!firstResponder) {
return false;
@@ -378,7 +378,7 @@
id view = data->view;
while (view) {
if ([view respondsToSelector:@selector(documentCursor)]) {
- cursor = QCursor([view documentCursor]);
+ cursor = QCursor::makeWithNSCursor([view documentCursor]);
break;
}
view = [view superview];
1.382.2.5 +2 -2 WebCore/kwq/WebCoreBridge.mm
Index: WebCoreBridge.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
retrieving revision 1.382.2.4
retrieving revision 1.382.2.5
diff -u -r1.382.2.4 -r1.382.2.5
--- WebCoreBridge.mm 14 Jul 2005 21:48:38 -0000 1.382.2.4
+++ WebCoreBridge.mm 22 Jul 2005 01:18:36 -0000 1.382.2.5
@@ -201,7 +201,7 @@
if (!bridge)
return NO;
- KHTMLPart *part = bridge->_part;
+ KHTMLPart *part = [bridge part];
if (!part)
return NO;
@@ -1083,7 +1083,7 @@
if (node->renderer() && node->renderer()->isImage()) {
RenderImage *r = static_cast<RenderImage *>(node->renderer());
- NSImage *image = r->pixmap().image();
+ NSImage * image = (NSImage *)(r->pixmap().image());
// Only return image information if there is an image.
if (image && !r->isDisplayingError()) {
[element setObject:r->pixmap().image() forKey:WebCoreElementImageKey];
No revision
No revision
1.3118.4.23 +65 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3118.4.22
retrieving revision 1.3118.4.23
diff -u -r1.3118.4.22 -r1.3118.4.23
--- ChangeLog 15 Jul 2005 17:28:30 -0000 1.3118.4.22
+++ ChangeLog 22 Jul 2005 01:18:41 -0000 1.3118.4.23
@@ -1,3 +1,68 @@
+2005-07-21 Adele Peterson <adele at apple.com>
+
+ Merge from TOT to Safari-2-0-branch to build with gcc 4.0
+ <rdar://problem/4164127>
+
+ 2005-07-08 Justin Garcia <justin.garcia at apple.com>
+
+ Reviewed by John
+
+ Changes to compile with gcc 4.0 build 5204
+
+ The construct "variable = if ? then : else" is more strict about the types of 'then' and 'else'
+
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem copyWithZone:]):
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ (-[NSPasteboard _web_writeImage:URL:title:archive:types:]):
+ * Misc.subproj/WebNSURLExtras.m:
+ (-[NSURL _web_URLWithLowercasedScheme]):
+ (-[NSString _web_mapHostNameWithRange:encode:makeString:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge MIMETypeForPath:]):
+ * WebCoreSupport.subproj/WebImageRendererFactory.m:
+ (-[WebImageRendererFactory imageRendererWithBytes:length:MIMEType:]):
+ * WebCoreSupport.subproj/WebTextRenderer.m:
+ (-[WebTextRenderer initWithFont:usingPrinterFont:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame _webDataRequestForData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView _styleFromFontAttributes:]):
+ * WebView.subproj/WebView.m:
+ (-[WebView _writeImageElement:withPasteboardTypes:toPasteboard:]):
+ (-[WebView mainFrameTitle]):
+
+ 2005-04-28 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed problems preventing us from compiling with gcc 4.0
+
+ * WebKit.pbproj/project.pbxproj: Removed -fobjc-exceptions because I can't figure out an easy
+ way to pass it only when compiling Objective-C/C++. Removed -Wmissing-prototypes from
+ WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.
+
+ * History.subproj/WebHistoryItem.m: (-[WebHistoryItem pageCache]): Changed return type
+ to match the declaration.
+ * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge _retrieveKeyboardUIModeFromPreferences:]):
+ Fixed a BOOL that should have been a Boolean.
+ * WebCoreSupport.subproj/WebTextRenderer.m: Removed redundant copy of ROUND_TO_INT, also in
+ a WebCore header.
+ (-[WebTextRenderer _computeWidthForSpace]): Had to add cast because of difference in type of
+ ROUND_TO_INT vs. CEIL_TO_INT.
+ (pathFromFont): Added a cast to convert UInt8 * to char *.
+ * WebView.subproj/WebFrameView.m:
+ (-[WebFrameView _setDocumentView:]): Fixed parameter type to match the declaration.
+ (-[WebFrameView documentView]): Fixed return type to match the declaration.
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView _startDraggingImage:at:operation:event:sourceIsDHTML:DHTMLWroteData:]):
+ Initialized a variable to quiet an incorrect gcc 4.0 uninitialized variable warning.
+ (-[WebHTMLView deleteToMark:]): Switched from @try style to NS_DURING style of exception handler
+ because we can't pass -fobjc-exceptions just to Objective-C at the moment (see above).
+ (-[WebHTMLView selectToMark:]): Ditto.
+ (-[WebHTMLView swapWithMark:]): Ditto.
+
+
=== WebKit-412.7 ===
2005-07-15 Adele Peterson <adele at apple.com>
No revision
No revision
1.3.16.1 +1 -1 WebKit/DOM.subproj/Attic/DOMEvents.h
Index: DOMEvents.h
===================================================================
RCS file: /cvs/root/WebKit/DOM.subproj/Attic/DOMEvents.h,v
retrieving revision 1.3
retrieving revision 1.3.16.1
diff -u -r1.3 -r1.3.16.1
--- DOMEvents.h 14 May 2004 17:29:55 -0000 1.3
+++ DOMEvents.h 22 Jul 2005 01:18:45 -0000 1.3.16.1
@@ -37,7 +37,7 @@
- (void)handleEvent:(DOMEvent *)event;
@end
- at protocol DOMEventTarget <NSObject>
+ at protocol DOMEventTarget <NSObject, NSCopying>
- (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
- (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
- (BOOL)dispatchEvent:(DOMEvent *)event;
No revision
No revision
1.84.10.1 +2 -2 WebKit/History.subproj/WebHistoryItem.m
Index: WebHistoryItem.m
===================================================================
RCS file: /cvs/root/WebKit/History.subproj/WebHistoryItem.m,v
retrieving revision 1.84
retrieving revision 1.84.10.1
diff -u -r1.84 -r1.84.10.1
--- WebHistoryItem.m 25 Oct 2004 17:52:07 -0000 1.84
+++ WebHistoryItem.m 22 Jul 2005 01:18:45 -0000 1.84.10.1
@@ -122,7 +122,7 @@
- (id)copyWithZone:(NSZone *)zone
{
- WebHistoryItem *copy = NSCopyObject(self, 0, zone);
+ WebHistoryItem *copy = (WebHistoryItem *)NSCopyObject(self, 0, zone);
copy->_private = [[WebHistoryItemPrivate alloc] init];
copy->_private->URLString = [_private->URLString copy];
[copy _retainIconInDatabase:YES];
@@ -727,7 +727,7 @@
}
}
-- pageCache
+- (NSMutableDictionary *)pageCache
{
return _private->pageCache;
}
No revision
No revision
1.39.8.1 +1 -1 WebKit/Misc.subproj/WebNSPasteboardExtras.m
Index: WebNSPasteboardExtras.m
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebNSPasteboardExtras.m,v
retrieving revision 1.39
retrieving revision 1.39.8.1
diff -u -r1.39 -r1.39.8.1
--- WebNSPasteboardExtras.m 8 Mar 2005 19:05:50 -0000 1.39
+++ WebNSPasteboardExtras.m 22 Jul 2005 01:18:45 -0000 1.39.8.1
@@ -210,7 +210,7 @@
// This image data is either the only subresource of an archive (HTML image case)
// or the main resource (standalone image case).
NSArray *subresources = [archive subresources];
- WebResource *resource = [subresources count] > 0 ? [subresources objectAtIndex:0] : [archive mainResource];
+ WebResource *resource = [subresources count] > 0 ? (WebResource *)[subresources objectAtIndex:0] : [archive mainResource];
ASSERT(resource != nil);
ASSERT([[[WebImageRendererFactory sharedFactory] supportedMIMETypes] containsObject:[resource MIMEType]]);
1.31.8.1 +3 -3 WebKit/Misc.subproj/WebNSURLExtras.m
Index: WebNSURLExtras.m
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebNSURLExtras.m,v
retrieving revision 1.31
retrieving revision 1.31.8.1
diff -u -r1.31 -r1.31.8.1
--- WebNSURLExtras.m 9 Mar 2005 19:00:31 -0000 1.31
+++ WebNSURLExtras.m 22 Jul 2005 01:18:46 -0000 1.31.8.1
@@ -573,8 +573,8 @@
}
NSURL *result = changed
- ? WebCFAutorelease(CFURLCreateAbsoluteURLWithBytes(NULL, buffer, bytesFilled, kCFStringEncodingUTF8, nil, YES))
- : self;
+ ? (NSURL *)WebCFAutorelease(CFURLCreateAbsoluteURLWithBytes(NULL, buffer, bytesFilled, kCFStringEncodingUTF8, nil, YES))
+ : (NSURL *)self;
if (buffer != static_buffer) {
free(buffer);
@@ -902,7 +902,7 @@
if (!encode && !allCharactersInIDNScriptWhiteList(destinationBuffer, numCharactersConverted)) {
return nil;
}
- return makeString ? [NSString stringWithCharacters:destinationBuffer length:numCharactersConverted] : self;
+ return makeString ? (NSString *)[NSString stringWithCharacters:destinationBuffer length:numCharactersConverted] : (NSString *)self;
}
- (BOOL)_web_hostNameNeedsDecodingWithRange:(NSRange)range
No revision
No revision
1.340.8.4 +2 -2 WebKit/WebCoreSupport.subproj/WebBridge.m
Index: WebBridge.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebBridge.m,v
retrieving revision 1.340.8.3
retrieving revision 1.340.8.4
diff -u -r1.340.8.3 -r1.340.8.4
--- WebBridge.m 2 Jul 2005 01:32:44 -0000 1.340.8.3
+++ WebBridge.m 22 Jul 2005 01:18:46 -0000 1.340.8.4
@@ -1087,7 +1087,7 @@
ASSERT(path);
NSString *extension = [path pathExtension];
NSString *type = [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
- return [type length] == 0 ? @"application/octet-stream" : type;
+ return [type length] == 0 ? (NSString *)@"application/octet-stream" : type;
}
- (void)allowDHTMLDrag:(BOOL *)flagDHTML UADrag:(BOOL *)flagUA
@@ -1262,7 +1262,7 @@
{
CFPreferencesAppSynchronize(UniversalAccessDomain);
- BOOL keyExistsAndHasValidFormat;
+ Boolean keyExistsAndHasValidFormat;
int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, UniversalAccessDomain, &keyExistsAndHasValidFormat);
// The keyboard access mode is reported by two bits:
1.26.8.1 +1 -1 WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
Index: WebImageRendererFactory.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m,v
retrieving revision 1.26
retrieving revision 1.26.8.1
diff -u -r1.26 -r1.26.8.1
--- WebImageRendererFactory.m 13 Jan 2005 19:41:52 -0000 1.26
+++ WebImageRendererFactory.m 22 Jul 2005 01:18:46 -0000 1.26.8.1
@@ -109,7 +109,7 @@
- (id <WebCoreImageRenderer>)imageRendererWithBytes:(const void *)bytes length:(unsigned)length MIMEType:(NSString *)MIMEType
{
NSData *data = [[NSData alloc] initWithBytes:(void *)bytes length:length];
- WebImageRenderer *imageRenderer = [self imageRendererWithData:data MIMEType:MIMEType];
+ WebImageRenderer *imageRenderer = (WebImageRenderer *)[self imageRendererWithData:data MIMEType:MIMEType];
[data autorelease];
return imageRenderer;
}
1.165.8.1 +3 -5 WebKit/WebCoreSupport.subproj/WebTextRenderer.m
Index: WebTextRenderer.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebTextRenderer.m,v
retrieving revision 1.165
retrieving revision 1.165.8.1
diff -u -r1.165 -r1.165.8.1
--- WebTextRenderer.m 20 Mar 2005 04:58:41 -0000 1.165
+++ WebTextRenderer.m 22 Jul 2005 01:18:46 -0000 1.165.8.1
@@ -49,8 +49,6 @@
#define NO_BREAK_SPACE 0x00A0
#define ZERO_WIDTH_SPACE 0x200B
-#define ROUND_TO_INT(x) (int)((x)+.5)
-
// Lose precision beyond 1000ths place. This is to work around an apparent
// bug in CoreGraphics where there seem to be small errors to some metrics.
#define CEIL_TO_INT(x) ((int)(x + 0.999)) /* ((int)(x + 1.0 - FLT_EPSILON)) */
@@ -372,7 +370,7 @@
NSFont *af = [[NSFontManager sharedFontManager] convertFont:font toFamily:fallbackFontFamily];
font = [(p ? [af printerFont] : [af screenFont]) retain];
NSString *filePath = pathFromFont(initialFont);
- filePath = filePath ? filePath : @"not known";
+ filePath = filePath ? filePath : (NSString *)@"not known";
if (![self _setupFont]){
if ([fallbackFontFamily isEqual:@"Times New Roman"]) {
// OK, couldn't setup Times New Roman as an alternate to Times, fallback
@@ -876,7 +874,7 @@
spaceWidth = width;
treatAsFixedPitch = [[WebTextRendererFactory sharedFactory] isFontFixedPitch:font];
- adjustedSpaceWidth = treatAsFixedPitch ? CEIL_TO_INT(width) : ROUND_TO_INT(width);
+ adjustedSpaceWidth = treatAsFixedPitch ? CEIL_TO_INT(width) : (int)ROUND_TO_INT(width);
return YES;
}
@@ -925,7 +923,7 @@
if (err == noErr){
status = FSRefMakePath(&fileRef,_filePathBuffer, PATH_MAX);
if (status == noErr){
- filePath = [NSString stringWithUTF8String:&_filePathBuffer[0]];
+ filePath = [NSString stringWithUTF8String:(const char *)&_filePathBuffer[0]];
}
}
}
No revision
No revision
1.706.2.7 +2 -2 WebKit/WebKit.pbproj/Attic/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebKit/WebKit.pbproj/Attic/project.pbxproj,v
retrieving revision 1.706.2.6
retrieving revision 1.706.2.7
diff -u -r1.706.2.6 -r1.706.2.7
--- project.pbxproj 15 Jul 2005 17:28:34 -0000 1.706.2.6
+++ project.pbxproj 22 Jul 2005 01:18:47 -0000 1.706.2.7
@@ -158,7 +158,7 @@
LOCAL_SEG1_ADDR = 0x7000000;
MACOSX_DEPLOYMENT_TARGET = 10.3;
OPTIMIZATION_CFLAGS = "-Os";
- OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DFRAMEWORK_NAME=WebKit -fobjc-exceptions";
+ OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DFRAMEWORK_NAME=WebKit";
OTHER_LDFLAGS = "$(COMMON_LDFLAGS) -sub_umbrella WebCore -sub_umbrella JavaScriptCore";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebKitPrefix.h;
@@ -167,7 +167,7 @@
TIGER_FRAMEWORKS_LDFLAGS = "-framework \"`if [ -f /usr/local/SecurityPieces/Frameworks/security_cdsa_utils.framework/security_cdsa_utils ]; then echo \\\"security_cdsa_utils\\\"; else echo \\\"System\\\"; fi`\"";
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wbad-function-cast -Wmissing-declarations -Wnested-externs";
- WARNING_CPLUSPLUSFLAGS = "-Werror -Wall -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+ WARNING_CPLUSPLUSFLAGS = "-Werror -Wall -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
};
dependencies = (
No revision
No revision
1.223.8.5 +1 -1 WebKit/WebView.subproj/WebFrame.m
Index: WebFrame.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
retrieving revision 1.223.8.4
retrieving revision 1.223.8.5
diff -u -r1.223.8.4 -r1.223.8.5
--- WebFrame.m 15 Jul 2005 00:36:22 -0000 1.223.8.4
+++ WebFrame.m 22 Jul 2005 01:18:48 -0000 1.223.8.5
@@ -283,7 +283,7 @@
[request _webDataRequestSetEncoding:encodingName];
[request _webDataRequestSetBaseURL:URL];
[request _webDataRequestSetUnreachableURL:unreachableURL];
- [request _webDataRequestSetMIMEType:MIMEType?MIMEType:@"text/html"];
+ [request _webDataRequestSetMIMEType: MIMEType ? MIMEType : (NSString *)@"text/html"];
return request;
}
1.179.6.2 +2 -2 WebKit/WebView.subproj/WebFrameView.m
Index: WebFrameView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrameView.m,v
retrieving revision 1.179.6.1
retrieving revision 1.179.6.2
diff -u -r1.179.6.1 -r1.179.6.2
--- WebFrameView.m 24 May 2005 01:38:12 -0000 1.179.6.1
+++ WebFrameView.m 22 Jul 2005 01:18:49 -0000 1.179.6.2
@@ -164,7 +164,7 @@
return _private->marginHeight;
}
-- (void)_setDocumentView:(NSView *)view
+- (void)_setDocumentView:(NSView <WebDocumentView> *)view
{
WebDynamicScrollBarsView *sv = (WebDynamicScrollBarsView *)[self _scrollView];
@@ -353,7 +353,7 @@
return [(WebDynamicScrollBarsView *)[self _scrollView] allowsScrolling];
}
-- documentView
+- (NSView <WebDocumentView> *)documentView
{
return [[self _scrollView] documentView];
}
1.437.8.1 +11 -11 WebKit/WebView.subproj/WebHTMLView.m
Index: WebHTMLView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
retrieving revision 1.437
retrieving revision 1.437.8.1
diff -u -r1.437 -r1.437.8.1
--- WebHTMLView.m 24 Mar 2005 03:03:02 -0000 1.437
+++ WebHTMLView.m 22 Jul 2005 01:18:49 -0000 1.437.8.1
@@ -1198,7 +1198,7 @@
NSPoint mouseDraggedPoint = [self convertPoint:[mouseDraggedEvent locationInWindow] fromView:nil];
_private->webCoreDragOp = op; // will be DragNone if WebCore doesn't care
NSImage *dragImage = nil;
- NSPoint dragLoc;
+ NSPoint dragLoc = { 0, 0 }; // quiet gcc 4.0 warning
// We allow WebCore to override the drag image, even if its a link, image or text we're dragging.
// This is in the spirit of the IE API, which allows overriding of pasteboard data and DragOp.
@@ -3722,7 +3722,7 @@
}
color = [dictionary objectForKey:NSForegroundColorAttributeName];
- [style setColor:color ? [self _colorAsString:color] : @"black"];
+ [style setColor:color ? [self _colorAsString:color] : (NSString *)@"black"];
NSShadow *shadow = [dictionary objectForKey:NSShadowAttributeName];
[style setTextShadow:[self _shadowAsString:shadow]];
@@ -4536,11 +4536,11 @@
} else {
DOMRange *selection = [self _selectedRange];
DOMRange *r;
- @try {
+ NS_DURING
r = unionDOMRanges(mark, selection);
- } @catch (NSException *exception) {
+ NS_HANDLER
r = selection;
- }
+ NS_ENDHANDLER
[self _deleteRange:r killRing:YES prepend:YES smartDeleteOK:NO deletionAction:deleteSelectionAction];
}
[self setMark:sender];
@@ -4555,11 +4555,11 @@
return;
}
DOMRange *selection = [self _selectedRange];
- @try {
+ NS_DURING
[bridge setSelectedDOMRange:unionDOMRanges(mark, selection) affinity:NSSelectionAffinityDownstream closeTyping:YES];
- } @catch (NSException *exception) {
+ NS_HANDLER
NSBeep();
- }
+ NS_ENDHANDLER
}
- (void)swapWithMark:(id)sender
@@ -4571,12 +4571,12 @@
return;
}
DOMRange *selection = [self _selectedRange];
- @try {
+ NS_DURING
[bridge setSelectedDOMRange:mark affinity:NSSelectionAffinityDownstream closeTyping:YES];
- } @catch (NSException *exception) {
+ NS_HANDLER
NSBeep();
return;
- }
+ NS_ENDHANDLER
[bridge setMarkDOMRange:selection];
}
1.274.8.2 +2 -2 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.274.8.1
retrieving revision 1.274.8.2
diff -u -r1.274.8.1 -r1.274.8.2
--- WebView.m 1 Jun 2005 22:47:27 -0000 1.274.8.1
+++ WebView.m 22 Jul 2005 01:18:49 -0000 1.274.8.2
@@ -1234,7 +1234,7 @@
{
NSURL *linkURL = [element objectForKey:WebElementLinkURLKey];
[pasteboard _web_writeImage:[element objectForKey:WebElementImageKey]
- URL:linkURL ? linkURL : [element objectForKey:WebElementImageURLKey]
+ URL:linkURL ? linkURL : (NSURL *)[element objectForKey:WebElementImageURLKey]
title:[element objectForKey:WebElementImageAltStringKey]
archive:[[element objectForKey:WebElementDOMNodeKey] webArchive]
types:types];
@@ -2448,7 +2448,7 @@
- (NSString *)mainFrameTitle
{
NSString *mainFrameTitle = [[[self mainFrame] dataSource] pageTitle];
- return (mainFrameTitle != nil) ? mainFrameTitle : @"";
+ return (mainFrameTitle != nil) ? mainFrameTitle : (NSString *)@"";
}
- (NSImage *)mainFrameIcon
More information about the webkit-changes
mailing list