Title: [183813] trunk/Source/WebKit2
- Revision
- 183813
- Author
- [email protected]
- Date
- 2015-05-05 09:34:35 -0700 (Tue, 05 May 2015)
Log Message
Make all FrameLoadState data members private.
https://bugs.webkit.org/show_bug.cgi?id=144562
Patch by Sungmann Cho <[email protected]> on 2015-05-05
Reviewed by Darin Adler.
Previously, all of the data members in FrameLoadState were public and accessed directly
from outside the class. But these should all be private as noted in FrameLoadState.h
for better encapsulation.
No new tests, no behavior change.
* UIProcess/API/C/WKFrame.cpp:
(WKFrameGetFrameLoadState):
* UIProcess/FrameLoadState.h:
(WebKit::FrameLoadState::state):
(WebKit::FrameLoadState::url):
(WebKit::FrameLoadState::provisionalURL):
(WebKit::FrameLoadState::unreachableURL):
* UIProcess/WebFrameProxy.h:
(WebKit::WebFrameProxy::url):
(WebKit::WebFrameProxy::provisionalURL):
(WebKit::WebFrameProxy::unreachableURL):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (183812 => 183813)
--- trunk/Source/WebKit2/ChangeLog 2015-05-05 16:34:21 UTC (rev 183812)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-05 16:34:35 UTC (rev 183813)
@@ -1,3 +1,28 @@
+2015-05-05 Sungmann Cho <[email protected]>
+
+ Make all FrameLoadState data members private.
+ https://bugs.webkit.org/show_bug.cgi?id=144562
+
+ Reviewed by Darin Adler.
+
+ Previously, all of the data members in FrameLoadState were public and accessed directly
+ from outside the class. But these should all be private as noted in FrameLoadState.h
+ for better encapsulation.
+
+ No new tests, no behavior change.
+
+ * UIProcess/API/C/WKFrame.cpp:
+ (WKFrameGetFrameLoadState):
+ * UIProcess/FrameLoadState.h:
+ (WebKit::FrameLoadState::state):
+ (WebKit::FrameLoadState::url):
+ (WebKit::FrameLoadState::provisionalURL):
+ (WebKit::FrameLoadState::unreachableURL):
+ * UIProcess/WebFrameProxy.h:
+ (WebKit::WebFrameProxy::url):
+ (WebKit::WebFrameProxy::provisionalURL):
+ (WebKit::WebFrameProxy::unreachableURL):
+
2015-05-05 Alexey Proskuryakov <[email protected]>
Crashes in SandboxExtension::consumePermanently when uploading
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp (183812 => 183813)
--- trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2015-05-05 16:34:21 UTC (rev 183812)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2015-05-05 16:34:35 UTC (rev 183813)
@@ -47,7 +47,7 @@
WKFrameLoadState WKFrameGetFrameLoadState(WKFrameRef frameRef)
{
WebFrameProxy* frame = toImpl(frameRef);
- switch (frame->frameLoadState().m_state) {
+ switch (frame->frameLoadState().state()) {
case FrameLoadState::State::Provisional:
return kWKFrameLoadStateProvisional;
case FrameLoadState::State::Committed:
Modified: trunk/Source/WebKit2/UIProcess/FrameLoadState.h (183812 => 183813)
--- trunk/Source/WebKit2/UIProcess/FrameLoadState.h 2015-05-05 16:34:21 UTC (rev 183812)
+++ trunk/Source/WebKit2/UIProcess/FrameLoadState.h 2015-05-05 16:34:35 UTC (rev 183813)
@@ -51,10 +51,14 @@
void didSameDocumentNotification(const String&);
+ State state() const { return m_state; }
+ const String& url() const { return m_url; }
+ const String& provisionalURL() const { return m_provisionalURL; }
+
void setUnreachableURL(const String&);
+ const String& unreachableURL() const { return m_unreachableURL; }
- // FIXME: These should all be private, and FrameLoadState should
- // provide state transition member functions.
+private:
State m_state;
String m_url;
String m_provisionalURL;
Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.h (183812 => 183813)
--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2015-05-05 16:34:21 UTC (rev 183812)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2015-05-05 16:34:35 UTC (rev 183813)
@@ -85,11 +85,11 @@
void loadURL(const String&);
void stopLoading() const;
- const String& url() const { return m_frameLoadState.m_url; }
- const String& provisionalURL() const { return m_frameLoadState.m_provisionalURL; }
+ const String& url() const { return m_frameLoadState.url(); }
+ const String& provisionalURL() const { return m_frameLoadState.provisionalURL(); }
void setUnreachableURL(const String&);
- const String& unreachableURL() const { return m_frameLoadState.m_unreachableURL; }
+ const String& unreachableURL() const { return m_frameLoadState.unreachableURL(); }
const String& mimeType() const { return m_MIMEType; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
