| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 using WebKit::WebRect; | 227 using WebKit::WebRect; |
| 228 using WebKit::WebScriptSource; | 228 using WebKit::WebScriptSource; |
| 229 using WebKit::WebSecurityOrigin; | 229 using WebKit::WebSecurityOrigin; |
| 230 using WebKit::WebSize; | 230 using WebKit::WebSize; |
| 231 using WebKit::WebString; | 231 using WebKit::WebString; |
| 232 using WebKit::WebURL; | 232 using WebKit::WebURL; |
| 233 using WebKit::WebURLError; | 233 using WebKit::WebURLError; |
| 234 using WebKit::WebURLRequest; | 234 using WebKit::WebURLRequest; |
| 235 using WebKit::WebURLResponse; | 235 using WebKit::WebURLResponse; |
| 236 using WebKit::WebVector; | 236 using WebKit::WebVector; |
| 237 using WebKit::WebView; |
| 237 | 238 |
| 238 // Key for a StatsCounter tracking how many WebFrames are active. | 239 // Key for a StatsCounter tracking how many WebFrames are active. |
| 239 static const char* const kWebFrameActiveCount = "WebFrameActiveCount"; | 240 static const char* const kWebFrameActiveCount = "WebFrameActiveCount"; |
| 240 | 241 |
| 241 static const char* const kOSDType = "application/opensearchdescription+xml"; | 242 static const char* const kOSDType = "application/opensearchdescription+xml"; |
| 242 static const char* const kOSDRel = "search"; | 243 static const char* const kOSDRel = "search"; |
| 243 | 244 |
| 244 // The separator between frames when the frames are converted to plain text. | 245 // The separator between frames when the frames are converted to plain text. |
| 245 static const wchar_t kFrameSeparator[] = L"\n\n"; | 246 static const wchar_t kFrameSeparator[] = L"\n\n"; |
| 246 static const size_t kFrameSeparatorLen = arraysize(kFrameSeparator) - 1; | 247 static const size_t kFrameSeparatorLen = arraysize(kFrameSeparator) - 1; |
| (...skipping 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1904 | 1905 |
| 1905 SecurityOrigin* security_origin = frame_->document()->securityOrigin(); | 1906 SecurityOrigin* security_origin = frame_->document()->securityOrigin(); |
| 1906 | 1907 |
| 1907 if (!frame_->redirectScheduler()->locationChangePending()) { | 1908 if (!frame_->redirectScheduler()->locationChangePending()) { |
| 1908 frame_->loader()->stopAllLoaders(); | 1909 frame_->loader()->stopAllLoaders(); |
| 1909 frame_->loader()->begin(frame_->loader()->url(), true, security_origin); | 1910 frame_->loader()->begin(frame_->loader()->url(), true, security_origin); |
| 1910 frame_->loader()->write(script_result); | 1911 frame_->loader()->write(script_result); |
| 1911 frame_->loader()->end(); | 1912 frame_->loader()->end(); |
| 1912 } | 1913 } |
| 1913 } | 1914 } |
| OLD | NEW |