Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

Issue 9963061: Merge 112184 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/page/History.cpp ('k') | Source/WebKit/win/WebFrame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 (core(m_webFrame.get())->loader()->policyChecker()->*function)(PolicyUse ); 759 (core(m_webFrame.get())->loader()->policyChecker()->*function)(PolicyUse );
760 return; 760 return;
761 } 761 }
762 762
763 const StringPairVector& textFieldValues = formState->textFieldValues(); 763 const StringPairVector& textFieldValues = formState->textFieldValues();
764 size_t size = textFieldValues.size(); 764 size_t size = textFieldValues.size();
765 NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithCapac ity:size]; 765 NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithCapac ity:size];
766 for (size_t i = 0; i < size; ++i) 766 for (size_t i = 0; i < size; ++i)
767 [dictionary setObject:textFieldValues[i].second forKey:textFieldValues[i ].first]; 767 [dictionary setObject:textFieldValues[i].second forKey:textFieldValues[i ].first];
768 768
769 CallFormDelegate(getWebView(m_webFrame.get()), @selector(frame:sourceFrame:w illSubmitForm:withValues:submissionListener:), m_webFrame.get(), kit(formState-> sourceFrame()), kit(formState->form()), dictionary, setUpPolicyListener(function ).get()); 769 CallFormDelegate(getWebView(m_webFrame.get()), @selector(frame:sourceFrame:w illSubmitForm:withValues:submissionListener:), m_webFrame.get(), kit(formState-> sourceDocument()->frame()), kit(formState->form()), dictionary, setUpPolicyListe ner(function).get());
770 770
771 [dictionary release]; 771 [dictionary release];
772 } 772 }
773 773
774 void WebFrameLoaderClient::dispatchDidLoadMainResource(DocumentLoader* loader) 774 void WebFrameLoaderClient::dispatchDidLoadMainResource(DocumentLoader* loader)
775 { 775 {
776 } 776 }
777 777
778 void WebFrameLoaderClient::revertToProvisionalState(DocumentLoader* loader) 778 void WebFrameLoaderClient::revertToProvisionalState(DocumentLoader* loader)
779 { 779 {
(...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after
2045 { 2045 {
2046 [self receivedPolicyDecision:PolicyUse]; 2046 [self receivedPolicyDecision:PolicyUse];
2047 } 2047 }
2048 2048
2049 - (void)continue 2049 - (void)continue
2050 { 2050 {
2051 [self receivedPolicyDecision:PolicyUse]; 2051 [self receivedPolicyDecision:PolicyUse];
2052 } 2052 }
2053 2053
2054 @end 2054 @end
OLDNEW
« no previous file with comments | « Source/WebCore/page/History.cpp ('k') | Source/WebKit/win/WebFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698