diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/chromium/src/WebDocument.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/chromium/src/WebDocument.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebDocument.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Source/WebKit/chromium/src/WebDocument.cpp b/Source/WebKit/chromium/src/WebDocument.cpp index 3486613be..c7a3a834a 100644 --- a/Source/WebKit/chromium/src/WebDocument.cpp +++ b/Source/WebKit/chromium/src/WebDocument.cpp @@ -56,8 +56,7 @@ #include "WebFrameImpl.h" #include "WebNodeCollection.h" #include "WebNodeList.h" -#include "platform/WebURL.h" - +#include <public/WebURL.h> #include <wtf/PassRefPtr.h> using namespace WebCore; @@ -81,6 +80,11 @@ WebString WebDocument::encoding() const return constUnwrap<Document>()->encoding(); } +WebString WebDocument::contentLanguage() const +{ + return constUnwrap<Document>()->contentLanguage(); +} + WebURL WebDocument::openSearchDescriptionURL() const { return const_cast<Document*>(constUnwrap<Document>())->openSearchDescriptionURL(); @@ -256,16 +260,15 @@ WebAccessibilityObject WebDocument::accessibilityObjectFromID(int axID) const WebVector<WebDraggableRegion> WebDocument::draggableRegions() const { WebVector<WebDraggableRegion> draggableRegions; -#if ENABLE(WIDGET_REGION) +#if ENABLE(DRAGGABLE_REGION) const Document* document = constUnwrap<Document>(); - if (document->hasDashboardRegions()) { - const Vector<DashboardRegionValue>& regions = document->dashboardRegions(); + if (document->hasAnnotatedRegions()) { + const Vector<AnnotatedRegionValue>& regions = document->annotatedRegions(); draggableRegions = WebVector<WebDraggableRegion>(regions.size()); for (size_t i = 0; i < regions.size(); i++) { - const DashboardRegionValue& value = regions[i]; - draggableRegions[i].label = value.label; + const AnnotatedRegionValue& value = regions[i]; + draggableRegions[i].draggable = value.draggable; draggableRegions[i].bounds = WebCore::IntRect(value.bounds); - draggableRegions[i].clip = WebCore::IntRect(value.clip); } } #endif |