[EFL] Unreviewed build fix after r154142 and r154144.
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Aug 2013 01:43:00 +0000 (01:43 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Aug 2013 01:43:00 +0000 (01:43 +0000)
Source/WebCore:

* platform/efl/ErrorsEfl.cpp: Follow the changes of r154142.
(WebCore::printError):
(WebCore::printerNotFoundError):
(WebCore::invalidPageRangeToPrint):

Source/WebKit/efl:

* ewk/ewk_frame.cpp: Follow the changes of r154142.
(ewk_frame_uri_set):
(ewk_frame_certificate_status_get):

Source/WebKit2:

* UIProcess/WebContext.cpp:
(WebKit::WebContext::useTestingNetworkSession):
Fixed build break when NETWORK_PROCESS is disabled after r154144.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154155 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/efl/ErrorsEfl.cpp
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/ewk/ewk_frame.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebContext.cpp

index 5f05d89..b215b9f 100644 (file)
@@ -1,3 +1,12 @@
+2013-08-15  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Unreviewed build fix after r154142 and r154144.
+
+        * platform/efl/ErrorsEfl.cpp: Follow the changes of r154142.
+        (WebCore::printError):
+        (WebCore::printerNotFoundError):
+        (WebCore::invalidPageRangeToPrint):
+
 2013-08-15  Hans Muller  <hmuller@adobe.com>
 
         [CSS Shapes] Add support for shape-outside image values
index bbc108c..2648f1c 100644 (file)
@@ -88,21 +88,21 @@ ResourceError downloadDestinationError(const ResourceResponse& response, const S
 
 ResourceError printError(const PrintContext* printContext, const String& errorMessage)
 {
-    DocumentLoader* documentLoader = printContext->frame()->loader()->documentLoader();
+    DocumentLoader* documentLoader = printContext->frame()->loader().documentLoader();
 
     return ResourceError(errorDomainPrint, PrintErrorGeneral, documentLoader ? documentLoader->url() : KURL(), errorMessage);
 }
 
 ResourceError printerNotFoundError(const PrintContext* printContext)
 {
-    DocumentLoader* documentLoader = printContext->frame()->loader()->documentLoader();
+    DocumentLoader* documentLoader = printContext->frame()->loader().documentLoader();
 
     return ResourceError(errorDomainPrint, PrintErrorPrinterNotFound, documentLoader ? documentLoader->url() : KURL(), ASCIILiteral("Printer not found"));
 }
 
 ResourceError invalidPageRangeToPrint(const PrintContext* printContext)
 {
-    DocumentLoader* documentLoader = printContext->frame()->loader()->documentLoader();
+    DocumentLoader* documentLoader = printContext->frame()->loader().documentLoader();
 
     return ResourceError(errorDomainPrint, PrintErrorInvalidPageRange, documentLoader ? documentLoader->url() : KURL(), ASCIILiteral("Invalid page range"));
 }
index ed10c4e..f2dd540 100644 (file)
@@ -1,3 +1,11 @@
+2013-08-15  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Unreviewed build fix after r154142 and r154144.
+
+        * ewk/ewk_frame.cpp: Follow the changes of r154142.
+        (ewk_frame_uri_set):
+        (ewk_frame_certificate_status_get):
+
 2013-08-15  Anders Carlsson  <andersca@apple.com>
 
         <https://webkit.org/b/119859> Frame::loader() should return a reference
index bda6c6a..c32f809 100644 (file)
@@ -340,8 +340,8 @@ Eina_Bool ewk_frame_uri_set(Evas_Object* ewkFrame, const char* uri)
     EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, false);
     WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(uri));
     WebCore::ResourceRequest req(kurl);
-    WebCore::FrameLoader* loader = smartData->frame->loader();
-    loader->load(WebCore::FrameLoadRequest(smartData->frame, req));
+    smartData->frame->loader().load(WebCore::FrameLoadRequest(smartData->frame, req));
+
     return true;
 }
 
@@ -1705,14 +1705,14 @@ Ewk_Certificate_Status ewk_frame_certificate_status_get(Evas_Object* ewkFrame)
     EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, EWK_CERTIFICATE_STATUS_NO_CERTIFICATE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, EWK_CERTIFICATE_STATUS_NO_CERTIFICATE);
 
-    const WebCore::FrameLoader* frameLoader = smartData->frame->loader();
-    const WebCore::DocumentLoader* documentLoader = frameLoader->documentLoader();
+    const WebCore::FrameLoader& frameLoader = smartData->frame->loader();
+    const WebCore::DocumentLoader* documentLoader = frameLoader.documentLoader();
     const WebCore::KURL documentURL = documentLoader->requestURL();
 
     if (!documentURL.protocolIs("https"))
         return EWK_CERTIFICATE_STATUS_NO_CERTIFICATE;
 
-    if (frameLoader->subframeIsLoading())
+    if (frameLoader.subframeIsLoading())
         return EWK_CERTIFICATE_STATUS_NO_CERTIFICATE;
 
     SoupMessage* soupMessage = documentLoader->request().toSoupMessage();
index 083c3c9..8b7fcef 100644 (file)
@@ -1,3 +1,11 @@
+2013-08-15  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Unreviewed build fix after r154142 and r154144.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::useTestingNetworkSession):
+        Fixed build break when NETWORK_PROCESS is disabled after r154144.
+
 2013-08-15  Chris Fleizach  <cfleizach@apple.com>
 
         <https://webkit.org/b/119858> AX: Crash: com.apple.WebKit.WebContent at com.apple.WebKit2: WebKit::WebPage::accessibilityObjectForMainFramePlugin + 8
index 2b02ec6..a292841 100644 (file)
@@ -1077,9 +1077,12 @@ void WebContext::useTestingNetworkSession()
     ASSERT(m_processes.isEmpty());
 #if ENABLE(NETWORK_PROCESS)
     ASSERT(!m_networkProcess);
+
+    if (m_networkProcess)
+        return;
 #endif
 
-    if (!m_processes.isEmpty() || m_networkProcess)
+    if (!m_processes.isEmpty())
         return;
 
     m_shouldUseTestingNetworkSession = true;