Update to Chromium revision 231322.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1494 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

patch/patches/devtools_target.patch

@@ -1,35 +1,33 @@
 Index: browser/devtools/devtools_http_handler_impl.cc
 ===================================================================
---- browser/devtools/devtools_http_handler_impl.cc	(revision 228917)
+--- browser/devtools/devtools_http_handler_impl.cc	(revision 231322)
 +++ browser/devtools/devtools_http_handler_impl.cc	(working copy)
-@@ -542,9 +542,17 @@
+@@ -550,9 +550,16 @@
  
  DevToolsTarget* DevToolsHttpHandlerImpl::GetTarget(const std::string& id) {
    TargetMap::const_iterator it = target_map_.find(id);
 -  if (it == target_map_.end())
--    return NULL;
--  return it->second;
 +  if (it != target_map_.end())
 +    return it->second;
 +
 +  scoped_ptr<DevToolsTarget> target(delegate_->CreateTargetForId(id));
-+  if (target) {
-+    DCHECK_EQ(id, target->GetId());
-+    target_map_[id] = target.release();
-+    return target_map_[id];
-+  }
++  if (!target)
+     return NULL;
+-  return it->second;
 +
-+  return NULL;
++  DCHECK_EQ(id, target->GetId());
++  target_map_[id] = target.release();
++  return target_map_[id];
  }
  
  void DevToolsHttpHandlerImpl::OnThumbnailRequestUI(
 Index: public/browser/devtools_http_handler_delegate.h
 ===================================================================
---- public/browser/devtools_http_handler_delegate.h	(revision 228917)
+--- public/browser/devtools_http_handler_delegate.h	(revision 231322)
 +++ public/browser/devtools_http_handler_delegate.h	(working copy)
 @@ -39,6 +39,13 @@
    // Creates new inspectable target.
-   virtual scoped_ptr<DevToolsTarget> CreateNewTarget() = 0;
+   virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) = 0;
  
 +  // Creates an inspectable target for the specified |id|. Called in cases where
 +  // the target has not been enumerated (for example, direct URL access where

patch/patches/gyp_331.patch

@@ -1,8 +1,8 @@
 Index: gyp/generator/ninja.py
 ===================================================================
---- gyp/generator/ninja.py	(revision 1735)
+--- gyp/generator/ninja.py	(revision 1769)
 +++ gyp/generator/ninja.py	(working copy)
-@@ -722,7 +722,16 @@
+@@ -723,7 +723,16 @@
        for path in copy['files']:
          # Normalize the path so trailing slashes don't confuse us.
          path = os.path.normpath(path)

patch/patches/spi_webcore_364.patch

@@ -1,8 +1,8 @@
 Index: frame/FrameView.cpp
 ===================================================================
---- frame/FrameView.cpp	(revision 159695)
+--- frame/FrameView.cpp	(revision 160715)
 +++ frame/FrameView.cpp	(working copy)
-@@ -198,8 +198,10 @@
+@@ -200,8 +200,10 @@
      if (!isMainFrame())
          return;
  
@@ -15,23 +15,20 @@ Index: frame/FrameView.cpp
  PassRefPtr<FrameView> FrameView::create(Frame* frame)
 Index: platform/mac/NSScrollerImpDetails.mm
 ===================================================================
---- platform/mac/NSScrollerImpDetails.mm	(revision 159695)
+--- platform/mac/NSScrollerImpDetails.mm	(revision 160715)
 +++ platform/mac/NSScrollerImpDetails.mm	(working copy)
-@@ -33,6 +33,7 @@
+@@ -73,10 +73,14 @@
  
  bool isScrollbarOverlayAPIAvailable()
  {
 +#if 0
-     static bool apiAvailable;
-     static bool shouldInitialize = true;
-     if (shouldInitialize) {
-@@ -43,6 +44,9 @@
-                        && [scrollerImpPairClass instancesRespondToSelector:@selector(scrollerStyle)];
-     }
+     static bool apiAvailable =
+         [NSClassFromString(@"NSScrollerImp") respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)]
+         && [NSClassFromString(@"NSScrollerImpPair") instancesRespondToSelector:@selector(scrollerStyle)];
      return apiAvailable;
 +#else
 +    return false;
 +#endif
  }
  
- NSScrollerStyle recommendedScrollerStyle() {
+ NSScrollerStyle recommendedScrollerStyle()

patch/patches/webkit_933.patch

@@ -1,8 +1,8 @@
 Index: WebNode.cpp
 ===================================================================
---- WebNode.cpp	(revision 158192)
+--- WebNode.cpp	(revision 160715)
 +++ WebNode.cpp	(working copy)
-@@ -175,7 +175,7 @@
+@@ -169,7 +169,7 @@
  void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)
  {
      // Please do not add more eventTypes to this list without an API review.

patch/patches/webkit_popups.patch

@@ -1,8 +1,8 @@
 Index: public/web/WebView.h
 ===================================================================
---- public/web/WebView.h	(revision 159695)
+--- public/web/WebView.h	(revision 160715)
 +++ public/web/WebView.h	(working copy)
-@@ -447,6 +447,7 @@
+@@ -441,6 +441,7 @@
  
      // Sets whether select popup menus should be rendered by the browser.
      BLINK_EXPORT static void setUseExternalPopupMenus(bool);
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
      // Visited link state --------------------------------------------------
 Index: Source/web/ChromeClientImpl.cpp
 ===================================================================
---- Source/web/ChromeClientImpl.cpp	(revision 159695)
+--- Source/web/ChromeClientImpl.cpp	(revision 160715)
 +++ Source/web/ChromeClientImpl.cpp	(working copy)
-@@ -875,7 +875,7 @@
+@@ -871,7 +871,7 @@
  
  PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
  {
@@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp
      return adoptRef(new PopupMenuChromium(frame, client));
 Index: Source/web/WebViewImpl.cpp
 ===================================================================
---- Source/web/WebViewImpl.cpp	(revision 159695)
+--- Source/web/WebViewImpl.cpp	(revision 160715)
 +++ Source/web/WebViewImpl.cpp	(working copy)
-@@ -411,6 +411,7 @@
+@@ -402,6 +402,7 @@
      , m_fakePageScaleAnimationPageScaleFactor(0)
      , m_fakePageScaleAnimationUseAnchor(false)
      , m_contextMenuAllowed(false)
@@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp
      , m_doingDragAndDrop(false)
      , m_ignoreInputEvents(false)
      , m_compositorDeviceScaleFactorOverride(0)
-@@ -3751,9 +3752,14 @@
+@@ -3643,9 +3644,14 @@
      updateLayerTreeViewport();
  }
  
@@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp
  void WebViewImpl::startDragging(Frame* frame,
 Index: Source/web/WebViewImpl.h
 ===================================================================
---- Source/web/WebViewImpl.h	(revision 159695)
+--- Source/web/WebViewImpl.h	(revision 160715)
 +++ Source/web/WebViewImpl.h	(working copy)
-@@ -424,7 +424,8 @@
+@@ -409,7 +409,8 @@
  
      // Returns true if popup menus should be rendered by the browser, false if
      // they should be rendered by WebKit (which is the default).
@@ -65,7 +65,7 @@ Index: Source/web/WebViewImpl.h
  
      bool contextMenuAllowed() const
      {
-@@ -727,6 +728,8 @@
+@@ -702,6 +703,8 @@
  
      bool m_contextMenuAllowed;