Another build fix attempt for Windows and EFL WebKit1.
authorbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 18 Jan 2014 20:32:14 +0000 (20:32 +0000)
committerbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 18 Jan 2014 20:32:14 +0000 (20:32 +0000)
Source/WebKit:

* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:

Source/WebKit/efl:

* ewk/ewk_paint_context.cpp:
(ewk_paint_context_paint_contents):
* ewk/ewk_view.cpp:
(_ewk_view_smart_repaints_process):

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

Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/ewk/ewk_paint_context.cpp
Source/WebKit/efl/ewk/ewk_view.cpp

index 72eca4e..3ac0844 100644 (file)
@@ -1,5 +1,11 @@
 2014-01-18  Brian Burg  <bburg@apple.com>
 
+        Another build fix attempt for Windows and EFL WebKit1.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
+2014-01-18  Brian Burg  <bburg@apple.com>
+
         Unreviewed build fix attempt for Windows.
 
         * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
index 74e2bfa..0126f71 100644 (file)
@@ -228,6 +228,7 @@ EXPORTS
         symbolWithPointer(?openInNewTab@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@@Z, ?openInNewTab@InspectorFrontendClientLocal@WebCore@@UEAAXAEBVString@WTF@@@Z)
         symbolWithPointer(?requestSetDockSide@InspectorFrontendClientLocal@WebCore@@UAEXW4DockSide@InspectorFrontendClient@2@@Z, ?requestSetDockSide@InspectorFrontendClientLocal@WebCore@@UEAAXW4DockSide@InspectorFrontendClient@2@@Z)
         symbolWithPointer(?sendMessageToBackend@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@@Z, ?sendMessageToBackend@InspectorFrontendClientLocal@WebCore@@UEAAXAEBVString@WTF@@@Z)
+        symbolWithPointer(?setInspectorFrontendClient@InspectorController@WebCore@@QAEXV?$unique_ptr@VInspectorFrontendClient@WebCore@@U?$default_delete@VInspectorFrontendClient@WebCore@@@std@@@std@@@Z)
         symbolWithPointer(?setProperty@Settings@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@0@Z, ?setProperty@Settings@InspectorFrontendClientLocal@WebCore@@UEAAXAEBVString@WTF@@0@Z)
         symbolWithPointer(?windowObjectCleared@InspectorFrontendClientLocal@WebCore@@UAEXXZ, ?windowObjectCleared@InspectorFrontendClientLocal@WebCore@@UEAAXXZ)
         symbolWithPointer(?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z, ?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QEAAXHH@Z)
index e85cc20..30a6b02 100644 (file)
@@ -1,5 +1,14 @@
 2014-01-18  Brian Burg  <bburg@apple.com>
 
+        Another build fix attempt for Windows and EFL WebKit1.
+
+        * ewk/ewk_paint_context.cpp:
+        (ewk_paint_context_paint_contents):
+        * ewk/ewk_view.cpp:
+        (_ewk_view_smart_repaints_process):
+
+2014-01-18  Brian Burg  <bburg@apple.com>
+
         Web Inspector: Page should use std::unique_ptr for InspectorController
         https://bugs.webkit.org/show_bug.cgi?id=127068
 
index 4152f96..c31265e 100644 (file)
@@ -194,9 +194,9 @@ void ewk_paint_context_paint_contents(Ewk_Paint_Context* context, WebCore::Frame
 #if ENABLE(INSPECTOR)
     WebCore::Page* page = view->frame().page();
     if (page) {
-        WebCore::InspectorController* controller = page->inspectorController();
-        if (controller->highlightedNode())
-            controller->drawHighlight(*context->graphicContext);
+        WebCore::InspectorController& controller = page->inspectorController();
+        if (controller.highlightedNode())
+            controller.drawHighlight(*context->graphicContext);
     }
 #endif
 }
index 839610d..99f8af8 100644 (file)
@@ -1213,9 +1213,9 @@ static Eina_Bool _ewk_view_smart_repaints_process(Ewk_View_Smart_Data* smartData
 #if ENABLE(INSPECTOR)
     WebCore::Page* page = EWKPrivate::corePage(smartData->self);
     if (page) {
-        WebCore::InspectorController* controller = page->inspectorController();
-        if (controller->highlightedNode())
-            controller->drawHighlight(*context->graphicContext);
+        WebCore::InspectorController& controller = page->inspectorController();
+        if (controller.highlightedNode())
+            controller.drawHighlight(*context->graphicContext);
     }
 #endif