REGRESSION (r182573): Action Menus no longer appear for WebKit2 views displaying...
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Apr 2015 21:32:56 +0000 (21:32 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Apr 2015 21:32:56 +0000 (21:32 +0000)
rdar://problem/20486551 and https://bugs.webkit.org/show_bug.cgi?id=143574

Reviewed by Brent Fulgham.

* Shared/WebHitTestResult.cpp:
(WebKit::WebHitTestResult::Data::Data): Clear up a name scoping issue.

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

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebHitTestResult.cpp

index 286d15d0a2c5d690973979bd0041d313622ba4d9..7cea79b75042c968d59dc7b497a23a9f6a802b08 100644 (file)
@@ -1,3 +1,13 @@
+2015-04-09  Brady Eidson  <beidson@apple.com>
+
+        REGRESSION (r182573): Action Menus no longer appear for WebKit2 views displaying an image
+        rdar://problem/20486551 and https://bugs.webkit.org/show_bug.cgi?id=143574
+
+        Reviewed by Brent Fulgham.
+
+        * Shared/WebHitTestResult.cpp:
+        (WebKit::WebHitTestResult::Data::Data): Clear up a name scoping issue.
+
 2015-04-09  Chris Dumez  <cdumez@apple.com>
 
         [WK2][iOS] editorState() should not cause a synchronous layout
index 91e0f7932d11a5343ac09929b11d16190569403c..df121f37000512c368ed713480601c37378cdc04 100644 (file)
@@ -84,11 +84,11 @@ WebHitTestResult::Data::Data(const WebCore::HitTestResult& hitTestResult, bool i
 
     if (Image* image = hitTestResult.image()) {
         RefPtr<SharedBuffer> buffer = image->data();
-        String imageExtension = image->filenameExtension();
-        if (!imageExtension.isEmpty() && buffer) {
+        String filenameExtension = image->filenameExtension();
+        if (!filenameExtension.isEmpty() && buffer) {
             imageSharedMemory = SharedMemory::create(buffer->size());
             memcpy(imageSharedMemory->data(), buffer->data(), buffer->size());
-            imageExtension = imageExtension;
+            imageExtension = filenameExtension;
             imageSize = buffer->size();
         }
     }