Diff
Modified: trunk/Source/Platform/ChangeLog (140905 => 140906)
--- trunk/Source/Platform/ChangeLog 2013-01-26 07:59:35 UTC (rev 140905)
+++ trunk/Source/Platform/ChangeLog 2013-01-26 08:13:41 UTC (rev 140906)
@@ -1,3 +1,13 @@
+2013-01-26 James Simonsen <[email protected]>
+
+ [chromium] Export ResourceRequest's priority through WebURLRequest
+ https://bugs.webkit.org/show_bug.cgi?id=107985
+
+ Reviewed by Adam Barth.
+
+ * chromium/public/WebURLRequest.h:
+ (WebURLRequest):
+
2013-01-25 Eberhard Graether <[email protected]>
Web Inspector: add checkbox for continuous painting to the inspector's settings
Modified: trunk/Source/Platform/chromium/public/WebURLRequest.h (140905 => 140906)
--- trunk/Source/Platform/chromium/public/WebURLRequest.h 2013-01-26 07:59:35 UTC (rev 140905)
+++ trunk/Source/Platform/chromium/public/WebURLRequest.h 2013-01-26 08:13:41 UTC (rev 140906)
@@ -56,6 +56,15 @@
ReturnCacheDataDontLoad, // results of a post - allow stale data and only use cache
};
+ enum Priority {
+ PriorityUnresolved = -1,
+ PriorityVeryLow,
+ PriorityLow,
+ PriorityMedium,
+ PriorityHigh,
+ PriorityVeryHigh,
+ };
+
enum TargetType {
TargetIsMainFrame = 0,
TargetIsSubframe = 1,
@@ -181,6 +190,8 @@
WEBKIT_EXPORT ExtraData* extraData() const;
WEBKIT_EXPORT void setExtraData(ExtraData*);
+ WEBKIT_EXPORT Priority priority() const;
+
#if WEBKIT_IMPLEMENTATION
WebCore::ResourceRequest& toMutableResourceRequest();
const WebCore::ResourceRequest& toResourceRequest() const;
Modified: trunk/Source/WebCore/ChangeLog (140905 => 140906)
--- trunk/Source/WebCore/ChangeLog 2013-01-26 07:59:35 UTC (rev 140905)
+++ trunk/Source/WebCore/ChangeLog 2013-01-26 08:13:41 UTC (rev 140906)
@@ -1,3 +1,16 @@
+2013-01-26 James Simonsen <[email protected]>
+
+ [chromium] Export ResourceRequest's priority through WebURLRequest
+ https://bugs.webkit.org/show_bug.cgi?id=107985
+
+ Reviewed by Adam Barth.
+
+ No new tests.
+
+ * platform/chromium/support/WebURLRequest.cpp:
+ (WebKit::WebURLRequest::priority):
+ (WebKit):
+
2013-01-25 Roger Fong <[email protected]>
Unreviewed Windows build fix. All it wanted was one more line.
Modified: trunk/Source/WebCore/platform/chromium/support/WebURLRequest.cpp (140905 => 140906)
--- trunk/Source/WebCore/platform/chromium/support/WebURLRequest.cpp 2013-01-26 07:59:35 UTC (rev 140905)
+++ trunk/Source/WebCore/platform/chromium/support/WebURLRequest.cpp 2013-01-26 08:13:41 UTC (rev 140906)
@@ -324,6 +324,12 @@
return *m_private->m_resourceRequest;
}
+WebURLRequest::Priority WebURLRequest::priority() const
+{
+ return static_cast<WebURLRequest::Priority>(
+ m_private->m_resourceRequest->priority());
+}
+
const ResourceRequest& WebURLRequest::toResourceRequest() const
{
ASSERT(m_private);
Modified: trunk/Source/WebKit/chromium/ChangeLog (140905 => 140906)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-26 07:59:35 UTC (rev 140905)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-26 08:13:41 UTC (rev 140906)
@@ -1,3 +1,12 @@
+2013-01-26 James Simonsen <[email protected]>
+
+ [chromium] Export ResourceRequest's priority through WebURLRequest
+ https://bugs.webkit.org/show_bug.cgi?id=107985
+
+ Reviewed by Adam Barth.
+
+ * src/AssertMatchingEnums.cpp:
+
2013-01-25 Alexandre Elias <[email protected]>
Call FrameView::contentsResized() when setting fixed layout size
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (140905 => 140906)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-26 07:59:35 UTC (rev 140905)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-26 08:13:41 UTC (rev 140906)
@@ -122,6 +122,7 @@
#include <public/WebRTCPeerConnectionHandlerClient.h>
#include <public/WebReferrerPolicy.h>
#include <public/WebScrollbar.h>
+#include <public/WebURLRequest.h>
#include <public/WebURLResponse.h>
#include <wtf/Assertions.h>
#include <wtf/text/StringImpl.h>
@@ -624,3 +625,10 @@
COMPILE_ASSERT_MATCHING_ENUM(WebFormElement::AutocompleteResultErrorCancel, HTMLFormElement::AutocompleteResultErrorCancel);
COMPILE_ASSERT_MATCHING_ENUM(WebFormElement::AutocompleteResultErrorInvalid, HTMLFormElement::AutocompleteResultErrorInvalid);
#endif
+
+COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityUnresolved, ResourceLoadPriorityUnresolved);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityVeryLow, ResourceLoadPriorityVeryLow);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityLow, ResourceLoadPriorityLow);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityMedium, ResourceLoadPriorityMedium);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityHigh, ResourceLoadPriorityHigh);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityVeryHigh, ResourceLoadPriorityVeryHigh);
