Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 28ff2b4a4fa2608c9994235c5343cffa58da7c93..3b58d8ee2e1a56307bd1cbf7a98de4e9f7a66d5d 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -247,7 +247,7 @@ void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) { |
// Returns the original request url. If there is no redirect, the original |
// url is the same as ds->request()->url(). If the WebDataSource belongs to a |
// frame was loaded by loadData, the original url will be ds->unreachableURL() |
-static GURL GetOriginalRequestURL(WebDataSource* ds) { |
+GURL GetOriginalRequestURL(WebDataSource* ds) { |
// WebDataSource has unreachable URL means that the frame is loaded through |
// blink::WebFrame::loadData(), and the base URL will be in the redirect |
// chain. However, we never visited the baseURL. So in this case, we should |
@@ -263,7 +263,7 @@ static GURL GetOriginalRequestURL(WebDataSource* ds) { |
return ds->originalRequest().url(); |
} |
-NOINLINE static void CrashIntentionally() { |
+NOINLINE void CrashIntentionally() { |
// NOTE(shess): Crash directly rather than using NOTREACHED() so |
// that the signature is easier to triage in crash reports. |
volatile int* zero = NULL; |
@@ -271,7 +271,7 @@ NOINLINE static void CrashIntentionally() { |
} |
#if defined(ADDRESS_SANITIZER) || defined(SYZYASAN) |
-NOINLINE static void MaybeTriggerAsanError(const GURL& url) { |
+NOINLINE void MaybeTriggerAsanError(const GURL& url) { |
// NOTE(rogerm): We intentionally perform an invalid heap access here in |
// order to trigger an Address Sanitizer (ASAN) error report. |
const char kCrashDomain[] = "crash"; |
@@ -306,7 +306,7 @@ NOINLINE static void MaybeTriggerAsanError(const GURL& url) { |
} |
#endif // ADDRESS_SANITIZER || SYZYASAN |
-static void MaybeHandleDebugURL(const GURL& url) { |
+void MaybeHandleDebugURL(const GURL& url) { |
if (!url.SchemeIs(kChromeUIScheme)) |
return; |
if (url == GURL(kChromeUICrashURL)) { |
@@ -333,15 +333,15 @@ static void MaybeHandleDebugURL(const GURL& url) { |
} |
// Returns false unless this is a top-level navigation. |
-static bool IsTopLevelNavigation(WebFrame* frame) { |
+bool IsTopLevelNavigation(WebFrame* frame) { |
return frame->parent() == NULL; |
} |
// Returns false unless this is a top-level navigation that crosses origins. |
-static bool IsNonLocalTopLevelNavigation(const GURL& url, |
- WebFrame* frame, |
- WebNavigationType type, |
- bool is_form_post) { |
+bool IsNonLocalTopLevelNavigation(const GURL& url, |
+ WebFrame* frame, |
+ WebNavigationType type, |
+ bool is_form_post) { |
if (!IsTopLevelNavigation(frame)) |
return false; |
@@ -473,10 +473,11 @@ CommonNavigationParams MakeCommonNavigationParams( |
return params; |
} |
+using CreateRenderFrameImpl = RenderFrameImpl* (*)(RenderViewImpl*, int32); |
mlamouri (slow - plz ping)
2014/12/10 09:50:03
nit: I would pick a clearer name like CreateRender
dshwang
2014/12/10 10:08:31
I rename it to CreateRenderFrameImplFunction.
Jame
|
+CreateRenderFrameImpl g_create_render_frame_impl = nullptr; |
+ |
} // namespace |
-static RenderFrameImpl* (*g_create_render_frame_impl)(RenderViewImpl*, int32) = |
- NULL; |
// static |
RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view, |