diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/glue/dom_operations.cc | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/dom_operations.cc')
| -rw-r--r-- | webkit/glue/dom_operations.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc index 923bf37..15f95d9 100644 --- a/webkit/glue/dom_operations.cc +++ b/webkit/glue/dom_operations.cc @@ -87,8 +87,7 @@ void GetSavableResourceLinkForElement(WebCore::Element* element, if (!value) return; // Get absolute URL. - GURL u(webkit_glue::KURLToGURL(current_doc->completeURL((*value). - deprecatedString()))); + GURL u(webkit_glue::KURLToGURL(current_doc->completeURL((*value).string()))); // ignore invalid URL if (!u.is_valid()) return; @@ -104,8 +103,7 @@ void GetSavableResourceLinkForElement(WebCore::Element* element, // Insert referrer for above new resource link. if (current_doc->frame()) { GURL u(webkit_glue::KURLToGURL( - current_doc->frame()->loader()->outgoingReferrer(). - deprecatedString())); + WebCore::KURL(current_doc->frame()->loader()->outgoingReferrer()))); result->referrers_list->push_back(u); } else { // Insert blank referrer. @@ -505,7 +503,7 @@ const WebCore::AtomicString* GetSubResourceLinkFromElement( // If value has content and not start with "javascript:" then return it, // otherwise return NULL. if (value && !value->isEmpty() && - !value->domString().startsWith("javascript:", false)) + !value->startsWith("javascript:", false)) return value; return NULL; |