Index: third_party/WebKit/Source/web/ChromeClientImpl.cpp |
diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.cpp b/third_party/WebKit/Source/web/ChromeClientImpl.cpp |
index 1eab243d80d7018f274ad016f5cab1293fafeea3..5f4587367498f803ae4cd9676ccfb64ae3951637 100644 |
--- a/third_party/WebKit/Source/web/ChromeClientImpl.cpp |
+++ b/third_party/WebKit/Source/web/ChromeClientImpl.cpp |
@@ -856,14 +856,14 @@ bool ChromeClientImpl::shouldOpenModalDialogDuringPageDismissal(const DialogType |
const char* kDialogs[] = {"alert", "confirm", "prompt"}; |
int dialog = static_cast<int>(dialogType); |
ASSERT_WITH_SECURITY_IMPLICATION(0 <= dialog); |
- ASSERT_WITH_SECURITY_IMPLICATION(dialog < static_cast<int>(arraysize(kDialogs))); |
+ ASSERT_WITH_SECURITY_IMPLICATION(dialog < static_cast<int>(WTF_ARRAY_LENGTH(kDialogs))); |
const char* kDismissals[] = {"beforeunload", "pagehide", "unload"}; |
int dismissal = static_cast<int>(dismissalType) - 1; // Exclude NoDismissal. |
ASSERT_WITH_SECURITY_IMPLICATION(0 <= dismissal); |
- ASSERT_WITH_SECURITY_IMPLICATION(dismissal < static_cast<int>(arraysize(kDismissals))); |
+ ASSERT_WITH_SECURITY_IMPLICATION(dismissal < static_cast<int>(WTF_ARRAY_LENGTH(kDismissals))); |
- Platform::current()->histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) * arraysize(kDismissals)); |
+ Platform::current()->histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * WTF_ARRAY_LENGTH(kDialogs) + dialog, WTF_ARRAY_LENGTH(kDialogs) * WTF_ARRAY_LENGTH(kDismissals)); |
String message = String("Blocked ") + kDialogs[dialog] + "('" + dialogMessage + "') during " + kDismissals[dismissal] + "."; |
m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMessage::LevelError, message)); |