Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLBodyElement.cpp
diff --git a/src/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp b/src/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp

index 624dec6..7b25fad 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp
@@ -24,7 +24,7 @@
  #include "config.h"
  #include "core/html/HTMLBodyElement.h"
  
-#include "bindings/v8/ScriptEventListener.h"
+#include "bindings/core/v8/ScriptEventListener.h"
  #include "core/CSSValueKeywords.h"
  #include "core/HTMLNames.h"
  #include "core/css/CSSImageValue.h"
@@ -33,11 +33,12 @@
  #include "core/dom/Attribute.h"
  #include "core/frame/FrameView.h"
  #include "core/frame/LocalFrame.h"
+#include "core/frame/UseCounter.h"
  #include "core/html/HTMLFrameElementBase.h"
  #include "core/html/parser/HTMLParserIdioms.h"
  #include "core/rendering/RenderBox.h"
  
-namespace WebCore {
+namespace blink {
  
  using namespace HTMLNames;
  
@@ -81,8 +82,10 @@ void HTMLBodyElement::collectStyleForPresentationAttribute(const QualifiedName&
      } else if (name == textAttr) {
          addHTMLColorToStyle(style, CSSPropertyColor, value);
      } else if (name == bgpropertiesAttr) {
-        if (equalIgnoringCase(value, "fixed"))
-           addPropertyToPresentationAttributeStyle(style, CSSPropertyBackgroundAttachment, CSSValueFixed);
+        if (equalIgnoringCase(value, "fixed")) {
+            UseCounter::count(document(), UseCounter::BgPropertiesFixed);
+            addPropertyToPresentationAttributeStyle(style, CSSPropertyBackgroundAttachment, CSSValueFixed);
+        }
      } else
          HTMLElement::collectStyleForPresentationAttribute(name, value, style);
  }
@@ -194,7 +197,7 @@ bool HTMLBodyElement::supportsFocus() const
  {
      // This override is needed because the inherited method bails if the parent is editable.
      // The <body> should be focusable even if <html> is editable.
-    return rendererIsEditable() || HTMLElement::supportsFocus();
+    return hasEditableStyle() || HTMLElement::supportsFocus();
  }
  
  static int adjustForZoom(int value, Document* document)
@@ -330,4 +333,4 @@ int HTMLBodyElement::scrollWidth()
      return view ? adjustForZoom(view->contentsWidth(), &document) : 0;
  }
  
-} // namespace WebCore
+} // namespace blink