[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 13:19:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4a98cd26f1a7927fd829bc5ddd6ff106ca8836a3
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 11 01:07:23 2010 +0000
Windows Build Fix. Fix some fallout from r67238, currentForm is now off of
SelectionController instead of frame. Also fix a style issue.
* WebFrame.cpp:
(WebFrame::currentForm):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67260 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index ab4f7b3..a1af33d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-10 Brian Weinstein <bweinstein at apple.com>
+
+ Windows Build Fix. Fix some fallout from r67238, currentForm is now off of
+ SelectionController instead of frame. Also fix a style issue.
+
+ * WebFrame.cpp:
+ (WebFrame::currentForm):
+
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 014ea15..e4f0c46 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -507,9 +507,10 @@ HRESULT STDMETHODCALLTYPE WebFrame::currentForm(
*currentForm = 0;
- if (Frame* coreFrame = core(this))
- if (HTMLFormElement* formElement = coreFrame->currentForm())
+ if (Frame* coreFrame = core(this)) {
+ if (HTMLFormElement* formElement = coreFrame->selection()->currentForm())
*currentForm = DOMElement::createInstance(formElement);
+ }
return *currentForm ? S_OK : E_FAIL;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list