Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / content / shell / renderer / test_runner / accessibility_controller.cc
index 40f5d35..125f071 100644 (file)
@@ -26,11 +26,11 @@ class AccessibilityControllerBindings
  private:
   explicit AccessibilityControllerBindings(
       base::WeakPtr<AccessibilityController> controller);
-  virtual ~AccessibilityControllerBindings();
+  ~AccessibilityControllerBindings() override;
 
   // gin::Wrappable:
-  virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) OVERRIDE;
+  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
 
   void LogAccessibilityEvents();
   void SetNotificationListener(v8::Handle<v8::Function> callback);
@@ -243,7 +243,7 @@ AccessibilityController::AccessibleElementById(const std::string& id) {
   if (root_element_.isNull())
     root_element_ = web_view_->accessibilityObject();
 
-  if (!root_element_.updateBackingStoreAndCheckValidity())
+  if (!root_element_.updateLayoutAndCheckValidity())
     return v8::Handle<v8::Object>();
 
   return FindAccessibleElementByIdRecursive(