Title: [154233] trunk/Source/WebKit/win
Revision
154233
Author
[email protected]
Date
2013-08-17 09:12:33 -0700 (Sat, 17 Aug 2013)

Log Message

Windows build fix after r154219.

* WebFrame.cpp:
(WebFrame::dispatchDidClearWindowObjectInWorld):

Modified Paths

Diff

Modified: trunk/Source/WebKit/win/ChangeLog (154232 => 154233)


--- trunk/Source/WebKit/win/ChangeLog	2013-08-17 15:43:24 UTC (rev 154232)
+++ trunk/Source/WebKit/win/ChangeLog	2013-08-17 16:12:33 UTC (rev 154233)
@@ -1,3 +1,10 @@
+2013-08-17  Andreas Kling  <[email protected]>
+
+        Windows build fix after r154219.
+
+        * WebFrame.cpp:
+        (WebFrame::dispatchDidClearWindowObjectInWorld):
+
 2013-08-17  Darin Adler  <[email protected]>
 
         <https://webkit.org/b/119941> Make Page::dragController return a reference

Modified: trunk/Source/WebKit/win/WebFrame.cpp (154232 => 154233)


--- trunk/Source/WebKit/win/WebFrame.cpp	2013-08-17 15:43:24 UTC (rev 154232)
+++ trunk/Source/WebKit/win/WebFrame.cpp	2013-08-17 16:12:33 UTC (rev 154233)
@@ -1882,8 +1882,7 @@
     Frame* coreFrame = core(this);
     ASSERT(coreFrame);
 
-    Settings* settings = coreFrame->settings();
-    if (!settings || !settings->isScriptEnabled())
+    if (!coreFrame->settings().isScriptEnabled())
         return;
 
     COMPtr<IWebFrameLoadDelegate> frameLoadDelegate;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to