From 68513a70bcd92384395513322f1b801e7bf9c729 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 29 Sep 2010 17:32:26 +0100 Subject: Merge WebKit at r67908: Initial merge by Git Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972 --- WebKit/mac/DOM/WebDOMOperations.mm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'WebKit/mac/DOM') diff --git a/WebKit/mac/DOM/WebDOMOperations.mm b/WebKit/mac/DOM/WebDOMOperations.mm index d21f2b0..3d69836 100644 --- a/WebKit/mac/DOM/WebDOMOperations.mm +++ b/WebKit/mac/DOM/WebDOMOperations.mm @@ -121,8 +121,7 @@ using namespace JSC; - (WebFrame *)webFrame { - Document* document = core(self); - Frame* frame = document->frame(); + Frame* frame = core(self)->frame(); if (!frame) return nil; return kit(frame); @@ -130,7 +129,6 @@ using namespace JSC; - (NSURL *)URLWithAttributeString:(NSString *)string { - // FIXME: Is deprecatedParseURL appropriate here? return core(self)->completeURL(deprecatedParseURL(string)); } -- cgit v1.1