[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:40:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d7e602082dd4b5e28ce5c3a8524341ec869dd503
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 19 16:42:10 2004 +0000
Tests:
Reviewed by Hyatt
* Blot/BlotDocument.m:
(-[BlotDocument windowControllerDidLoadNib:]): Add call to setEditable:YES on web view.
(-[BlotDocument webView:didFinishLoadForFrame:]): Remove hack to insert contenteditable
attribute on body elements after loading a document.
WebCore:
Reviewed by Hyatt
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::isContentEditable): Ask if the part is contenteditable.
True value is treated as an "override" and will short-circuit, returning true.
* khtml/khtml_part.cpp:
(KHTMLPart::isContentEditable): Call over bridge. Has the effect of checking the
isEditable method on the WebView which contains this part.
* khtml/khtml_part.h: Declare isContentEditable.
* kwq/KWQKHTMLPart.h: Declare isContentEditable.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::isContentEditable): Call over bridge, as described above.
* kwq/WebCoreBridge.h: Declare isEditable.
WebKit:
Reviewed by Hyatt
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge isEditable]): Return the isEditable value for the
WebView which contains this bridge's frame.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6640 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2111ffc..b072ef3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2004-05-19 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Hyatt
+
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::isContentEditable): Ask if the part is contenteditable.
+ True value is treated as an "override" and will short-circuit, returning true.
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::isContentEditable): Call over bridge. Has the effect of checking the
+ isEditable method on the WebView which contains this part.
+ * khtml/khtml_part.h: Declare isContentEditable.
+ * kwq/KWQKHTMLPart.h: Declare isContentEditable.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::isContentEditable): Call over bridge, as described above.
+ * kwq/WebCoreBridge.h: Declare isEditable.
+
2004-05-19 Darin Adler <darin at apple.com>
- fixed headers with licenses mangled by Xcode auto-indenting
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 4b2beb0..370a682 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -868,6 +868,9 @@ bool HTMLElementImpl::isFocusable() const
bool HTMLElementImpl::isContentEditable() const
{
+ if (getDocument()->part() && getDocument()->part()->isContentEditable())
+ return true;
+
getDocument()->updateRendering();
if (!renderer()) {
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index e95438a..f4dc98f 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4889,6 +4889,15 @@ void KHTMLPart::selectAll()
setSelection(selection);
}
+bool KHTMLPart::isContentEditable() const
+{
+#if APPLE_CHANGES
+ return KWQ(this)->isContentEditable();
+#else
+ return false;
+#endif
+}
+
EditCommand KHTMLPart::lastEditCommand()
{
return d->m_lastEditCommand;
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index a68481b..155b6b5 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -629,6 +629,11 @@ public:
void selectAll();
/**
+ * Returns the contentEditable "override" value for the part
+ */
+ bool isContentEditable() const;
+
+ /**
* Returns the most recent edit command applied.
*/
khtml::EditCommand lastEditCommand();
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 51ee916..be94f97 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -283,6 +283,7 @@ public:
void issuePasteCommand();
void postDidChangeSelectionNotification();
void postDidChangeNotification();
+ bool isContentEditable() const;
WebScriptObject *windowScriptObject();
void bindObject(void *object, QString name);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index defd9ca..ae6a60b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2976,3 +2976,8 @@ void KWQKHTMLPart::postDidChangeNotification()
{
[_bridge postDidChangeNotification];
}
+
+bool KWQKHTMLPart::isContentEditable() const
+{
+ return [_bridge isEditable];
+}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index d2e7ce5..0d5450e 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -445,10 +445,9 @@ typedef enum {
- (void)issuePasteCommand;
- (void)postDidChangeSelectionNotification;
- (void)postDidChangeNotification;
-
- (void)editingKeyDown:(NSEvent *)event;
-
- (void)setIsSelected:(BOOL)isSelected forView:(NSView *)view;
+- (BOOL)isEditable;
- (NSString *)overrideMediaType;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 353b5c1..874a2cc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-19 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Hyatt
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge isEditable]): Return the isEditable value for the
+ WebView which contains this bridge's frame.
+
2004-05-19 Darin Adler <darin at apple.com>
- fixed headers with licenses mangled by Xcode auto-indenting
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index a38ed35..842cc2d 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -1279,6 +1279,11 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
return [[_frame webView] mediaStyle];
}
+- (BOOL)isEditable
+{
+ return [[_frame webView] isEditable];
+}
+
- (void)windowObjectCleared
{
WebView *wv = [_frame webView];
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index c14f79f..8fe9772 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -2230,7 +2230,7 @@ static NSFont *_fontFromStyle(DOMCSSStyleDeclaration *style)
// FIXME: calling [DOMCSSStyleDeclaration fontSize] doesn't work yet, returns nil.
// FIXME: is there SPI/API for converting a fontSize string into a numeric value?
// FIXME: calling [DOMCSSStyleDeclaration font] doesn't work yet, fails WebCore assertion
- ERROR("unimplemented");
+ //ERROR("unimplemented");
return nil;
}
@@ -2369,7 +2369,7 @@ static NSFont *_fontFromStyle(DOMCSSStyleDeclaration *style)
- (DOMCSSStyleDeclaration *)typingStyle
{
- ERROR("unimplemented");
+ //ERROR("unimplemented");
return nil;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list