Implement more of Flush properly. This adds support for waiting on the messag...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 3248 matching lines @@
     if (mime_type == "application/x-nacl-srpc") {
       in_process_plugin = true;
       use_pepper_host = true;
     }
   }
 
   if (in_process_plugin) {
     if (use_pepper_host) {
       WebPluginDelegatePepper* pepper_plugin =
            WebPluginDelegatePepper::Create(file_path, mime_type, AsWeakPtr());
-      current_pepper_plugins_.insert(pepper_plugin);
+      current_oldstyle_pepper_plugins_.insert(pepper_plugin);
       return pepper_plugin;
     } else {
 #if defined(OS_WIN)  // In-proc plugins aren't supported on Linux or Mac.
       return WebPluginDelegateImpl::Create(
           file_path, mime_type, gfx::NativeViewFromId(host_window_));
 #else
       NOTIMPLEMENTED();
       return NULL;
 #endif
     }
@@ skipping 492 matching lines @@
   WebFrame* web_frame = GetChildFrame(frame_xpath);
   if (!web_frame)
     return;
 
   web_frame->insertStyleText(WebString::fromUTF8(css), WebString::fromUTF8(id));
 }
 
 void RenderView::OnPepperPluginDestroy(
     WebPluginDelegatePepper* pepper_plugin) {
   std::set<WebPluginDelegatePepper*>::iterator found_pepper =
-      current_pepper_plugins_.find(pepper_plugin);
-  if (found_pepper == current_pepper_plugins_.end()) {
+      current_oldstyle_pepper_plugins_.find(pepper_plugin);
+  if (found_pepper == current_oldstyle_pepper_plugins_.end()) {
     NOTREACHED();
     return;
   }
-  current_pepper_plugins_.erase(found_pepper);
+  current_oldstyle_pepper_plugins_.erase(found_pepper);
 
   // The plugin could have been destroyed while it was waiting for a file
   // choose callback, so check all pending completion callbacks and NULL them.
   for (std::deque< linked_ptr<PendingFileChooser> >::iterator i =
            file_chooser_completions_.begin();
        i != file_chooser_completions_.end(); /* nothing */) {
     if ((*i)->completion == pepper_plugin) {
       // We NULL the first one instead of deleting it because the plugin might
       // be the one waiting for a file choose callback. If the callback later
       // comes, we don't want to send the result to the next callback in line.
@@ skipping 475 matching lines @@
           disable_scrollbars_size_limit_.width() <= new_size.width() ||
           disable_scrollbars_size_limit_.height() <= new_size.height());
       webview()->mainFrame()->setCanHaveScrollbars(allow_scrollbars);
     }
   }
 
   RenderWidget::OnResize(new_size, resizer_rect);
 }
 
 void RenderView::DidInitiatePaint() {
-  // Notify any pepper plugins that we started painting. The plugin "should"
-  // never notified that we started painting, this is used for internal
-  // bookkeeping only, so we know that the set can not change under us.
+  // Notify the pepper plugins that we started painting.
+  pepper_delegate_.ViewInitiatedPaint();
+
+  // Notify any "old-style" pepper plugins that we started painting. This is
+  // used for internal bookkeeping only, so we know that the set can not change
+  // under us.
   for (std::set<WebPluginDelegatePepper*>::iterator i =
-           current_pepper_plugins_.begin();
-       i != current_pepper_plugins_.end(); ++i)
+           current_oldstyle_pepper_plugins_.begin();
+       i != current_oldstyle_pepper_plugins_.end(); ++i)
     (*i)->RenderViewInitiatedPaint();
 }
 
 void RenderView::DidFlushPaint() {
   // Notify any pepper plugins that we painted. This will call into the plugin,
   // and we it may ask to close itself as a result. This will, in turn, modify
   // our set, possibly invalidating the iterator. So we iterate on a copy that
   // won't change out from under us.
-  std::set<WebPluginDelegatePepper*> plugins = current_pepper_plugins_;
+  pepper_delegate_.ViewFlushedPaint();
+
+  // Notify any old-style pepper plugins that we painted. This will call into
+  // the plugin, and we it may ask to close itself as a result. This will, in
+  // turn, modify our set, possibly invalidating the iterator. So we iterate on
+  // a copy that won't change out from under us.
+  // This should be deleted when we don't support old Pepper anymore.
+  std::set<WebPluginDelegatePepper*> plugins = current_oldstyle_pepper_plugins_;
   for (std::set<WebPluginDelegatePepper*>::iterator i = plugins.begin();
        i != plugins.end(); ++i) {
     // The copy above makes sure our iterator is never invalid if some plugins
     // are destroyed. But some plugin may decide to close all of its views in
     // response to a paint in one of them, so we need to make sure each one is
     // still "current" before using it.
-    if (current_pepper_plugins_.find(*i) != current_pepper_plugins_.end())
+    if (current_oldstyle_pepper_plugins_.find(*i) !=
+        current_oldstyle_pepper_plugins_.end())
       (*i)->RenderViewFlushedPaint();
   }
 
   WebFrame* main_frame = webview()->mainFrame();
 
   // If we have a provisional frame we are between the start and commit stages
   // of loading and we don't want to save stats.
   if (!main_frame->provisionalDataSource()) {
     WebDataSource* ds = main_frame->dataSource();
     NavigationState* navigation_state = NavigationState::FromDataSource(ds);
     DCHECK(navigation_state);
 
     Time now = Time::Now();
     if (navigation_state->first_paint_time().is_null()) {
       navigation_state->set_first_paint_time(now);
     }
     if (navigation_state->first_paint_after_load_time().is_null() &&
         !navigation_state->finish_load_time().is_null()) {
       navigation_state->set_first_paint_after_load_time(now);
     }
   }
 }
 
-
 void RenderView::OnClearFocusedNode() {
   if (webview())
     webview()->clearFocusedNode();
 }
 
 void RenderView::OnSetBackground(const SkBitmap& background) {
   if (webview())
     webview()->setIsTransparent(!background.empty());
 
   SetBackground(background);
@@ skipping 806 matching lines @@
   webkit_glue::FormData form;
   const WebInputElement element = node.toConst<WebInputElement>();
   if (!form_manager_.FindFormWithFormControlElement(
           element, FormManager::REQUIRE_NONE, &form))
     return;
 
   autofill_action_ = action;
   Send(new ViewHostMsg_FillAutoFillFormData(
       routing_id_, autofill_query_id_, form, value, label));
 }