Merge 88174 - 2011-06-06 Shishir Agrawal <shishir@chromium.org>

Source/WebKit/chromium/src/WebViewImpl.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2570 matching lines @@
     return 0;
 }
 
 
 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState,
                                      bool isInitialState) {
 #if ENABLE(PAGE_VISIBILITY_API)
     if (!page())
         return;
 
-    ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState == WebPageVisibilityStateHidden);
+    ASSERT(visibilityState == WebPageVisibilityStateVisible
+           || visibilityState == WebPageVisibilityStateHidden
+           || visibilityState == WebPageVisibilityStatePrerender);
     m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>(visibilityState)), isInitialState);
 #endif
 }
 
 } // namespace WebKit