| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 147 |
| 148 #if defined(OS_LINUX) | 148 #if defined(OS_LINUX) |
| 149 #include <gdk/gdk.h> | 149 #include <gdk/gdk.h> |
| 150 #endif | 150 #endif |
| 151 | 151 |
| 152 #if USE(JSC) | 152 #if USE(JSC) |
| 153 #include "bridge/c/c_instance.h" | 153 #include "bridge/c/c_instance.h" |
| 154 #include "bridge/runtime_object.h" | 154 #include "bridge/runtime_object.h" |
| 155 #endif | 155 #endif |
| 156 | 156 |
| 157 using base::Time; |
| 157 using WebCore::ChromeClientChromium; | 158 using WebCore::ChromeClientChromium; |
| 158 using WebCore::Color; | 159 using WebCore::Color; |
| 159 using WebCore::Document; | 160 using WebCore::Document; |
| 160 using WebCore::DocumentFragment; | 161 using WebCore::DocumentFragment; |
| 161 using WebCore::DocumentLoader; | 162 using WebCore::DocumentLoader; |
| 162 using WebCore::ExceptionCode; | 163 using WebCore::ExceptionCode; |
| 163 using WebCore::GraphicsContext; | 164 using WebCore::GraphicsContext; |
| 164 using WebCore::HTMLFrameOwnerElement; | 165 using WebCore::HTMLFrameOwnerElement; |
| 165 using WebCore::Frame; | 166 using WebCore::Frame; |
| 166 using WebCore::FrameLoader; | 167 using WebCore::FrameLoader; |
| (...skipping 1730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1897 if (loader) { | 1898 if (loader) { |
| 1898 return WebCore::FrameLoadTypeReloadAllowingStaleData == | 1899 return WebCore::FrameLoadTypeReloadAllowingStaleData == |
| 1899 loader->policyLoadType(); | 1900 loader->policyLoadType(); |
| 1900 } | 1901 } |
| 1901 return false; | 1902 return false; |
| 1902 } | 1903 } |
| 1903 | 1904 |
| 1904 int WebFrameImpl::PendingFrameUnloadEventCount() const { | 1905 int WebFrameImpl::PendingFrameUnloadEventCount() const { |
| 1905 return frame()->eventHandler()->pendingFrameUnloadEventCount(); | 1906 return frame()->eventHandler()->pendingFrameUnloadEventCount(); |
| 1906 } | 1907 } |
| OLD | NEW |